[boinc] 02/05: Imported Upstream version 7.6.19+dfsg

Gianfranco Costamagna locutusofborg-guest at moszumanska.debian.org
Mon Dec 7 11:34:06 UTC 2015


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

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

commit 01a369ad66a69c4941a973206913e38d077be3ef
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Mon Dec 7 12:28:22 2015 +0100

    Imported Upstream version 7.6.19+dfsg
---
 android/BOINC/AndroidManifest.xml                  |    4 +-
 android/BOINC/res/drawable-ldpi/acctmgrb.png       |  Bin 3313 -> 0 bytes
 android/BOINC/res/drawable-ldpi/acctmgrw.png       |  Bin 619 -> 0 bytes
 android/BOINC/res/drawable-ldpi/attentionb.png     |  Bin 3707 -> 0 bytes
 android/BOINC/res/drawable-ldpi/boinc.png          |  Bin 3090 -> 0 bytes
 android/BOINC/res/drawable-ldpi/bugb.png           |  Bin 3903 -> 0 bytes
 android/BOINC/res/drawable-ldpi/bugw.png           |  Bin 3597 -> 0 bytes
 android/BOINC/res/drawable-ldpi/chartb.png         |  Bin 3767 -> 0 bytes
 android/BOINC/res/drawable-ldpi/checkb.png         |  Bin 3575 -> 0 bytes
 android/BOINC/res/drawable-ldpi/cogsb.png          |  Bin 3653 -> 0 bytes
 android/BOINC/res/drawable-ldpi/cogw.png           |  Bin 3380 -> 0 bytes
 .../BOINC/res/drawable-ldpi/connectchargerb.png    |  Bin 3525 -> 0 bytes
 android/BOINC/res/drawable-ldpi/copyw.png          |  Bin 3203 -> 0 bytes
 android/BOINC/res/drawable-ldpi/desktopb.png       |  Bin 3484 -> 0 bytes
 android/BOINC/res/drawable-ldpi/failedb.png        |  Bin 3324 -> 0 bytes
 android/BOINC/res/drawable-ldpi/helpb.png          |  Bin 3434 -> 0 bytes
 android/BOINC/res/drawable-ldpi/helpw.png          |  Bin 818 -> 0 bytes
 .../drawable-ldpi/ic_stat_notify_boinc_normal.png  |  Bin 3832 -> 0 bytes
 .../drawable-ldpi/ic_stat_notify_boinc_paused.png  |  Bin 3493 -> 0 bytes
 android/BOINC/res/drawable-ldpi/infob.png          |  Bin 3467 -> 0 bytes
 android/BOINC/res/drawable-ldpi/infow.png          |  Bin 3417 -> 0 bytes
 android/BOINC/res/drawable-ldpi/magnifierb.png     |  Bin 3505 -> 0 bytes
 android/BOINC/res/drawable-ldpi/mailb.png          |  Bin 3430 -> 0 bytes
 android/BOINC/res/drawable-ldpi/mailsmallw.png     |  Bin 3201 -> 0 bytes
 android/BOINC/res/drawable-ldpi/mailw.png          |  Bin 3297 -> 0 bytes
 android/BOINC/res/drawable-ldpi/nextb.png          |  Bin 3708 -> 0 bytes
 android/BOINC/res/drawable-ldpi/offb.png           |  Bin 3563 -> 0 bytes
 android/BOINC/res/drawable-ldpi/offw.png           |  Bin 3340 -> 0 bytes
 android/BOINC/res/drawable-ldpi/pausew.png         |  Bin 3049 -> 0 bytes
 android/BOINC/res/drawable-ldpi/playw.png          |  Bin 3173 -> 0 bytes
 android/BOINC/res/drawable-ldpi/plusw.png          |  Bin 665 -> 0 bytes
 android/BOINC/res/drawable-ldpi/previousb.png      |  Bin 3727 -> 0 bytes
 android/BOINC/res/drawable-ldpi/projects.png       |  Bin 681 -> 0 bytes
 android/BOINC/res/drawable-ldpi/projectsb.png      |  Bin 616 -> 0 bytes
 android/BOINC/res/drawable-ldpi/refreshw.png       |  Bin 3027 -> 0 bytes
 android/BOINC/res/drawable-ldpi/screenb.png        |  Bin 3165 -> 0 bytes
 android/BOINC/res/drawable-ldpi/speechbubbleb.png  |  Bin 3434 -> 0 bytes
 android/BOINC/res/drawable-ldpi/sqplusb.png        |  Bin 3160 -> 0 bytes
 android/BOINC/res/drawable-ldpi/status.png         |  Bin 407 -> 0 bytes
 android/BOINC/res/drawable-ldpi/statusb.png        |  Bin 391 -> 0 bytes
 android/BOINC/res/drawable-ldpi/tabsettings.png    |  Bin 602 -> 0 bytes
 android/BOINC/res/drawable-ldpi/tabsettingsb.png   |  Bin 568 -> 0 bytes
 android/BOINC/res/drawable-ldpi/tabtask.png        |  Bin 313 -> 0 bytes
 android/BOINC/res/drawable-ldpi/tabtaskb.png       |  Bin 299 -> 0 bytes
 android/BOINC/res/drawable-ldpi/wirelessb.png      |  Bin 3152 -> 0 bytes
 android/BOINC/res/drawable-mdpi/acctmgrb.png       |  Bin 3508 -> 0 bytes
 android/BOINC/res/drawable-mdpi/acctmgrw.png       |  Bin 727 -> 0 bytes
 android/BOINC/res/drawable-mdpi/attentionb.png     |  Bin 3785 -> 0 bytes
 android/BOINC/res/drawable-mdpi/boinc.png          |  Bin 5418 -> 0 bytes
 android/BOINC/res/drawable-mdpi/bugb.png           |  Bin 4091 -> 0 bytes
 android/BOINC/res/drawable-mdpi/bugw.png           |  Bin 3742 -> 0 bytes
 android/BOINC/res/drawable-mdpi/chartb.png         |  Bin 3933 -> 0 bytes
 android/BOINC/res/drawable-mdpi/checkb.png         |  Bin 3721 -> 0 bytes
 android/BOINC/res/drawable-mdpi/cogsb.png          |  Bin 3858 -> 0 bytes
 android/BOINC/res/drawable-mdpi/cogw.png           |  Bin 3652 -> 0 bytes
 .../BOINC/res/drawable-mdpi/connectchargerb.png    |  Bin 3754 -> 0 bytes
 android/BOINC/res/drawable-mdpi/copyw.png          |  Bin 3321 -> 0 bytes
 android/BOINC/res/drawable-mdpi/desktopb.png       |  Bin 3503 -> 0 bytes
 android/BOINC/res/drawable-mdpi/failedb.png        |  Bin 3496 -> 0 bytes
 android/BOINC/res/drawable-mdpi/helpb.png          |  Bin 3605 -> 0 bytes
 android/BOINC/res/drawable-mdpi/helpw.png          |  Bin 971 -> 0 bytes
 android/BOINC/res/drawable-mdpi/ic_drawer.png      |  Bin 2837 -> 0 bytes
 .../drawable-mdpi/ic_stat_notify_boinc_normal.png  |  Bin 6401 -> 0 bytes
 .../drawable-mdpi/ic_stat_notify_boinc_paused.png  |  Bin 5729 -> 0 bytes
 android/BOINC/res/drawable-mdpi/infob.png          |  Bin 3565 -> 0 bytes
 android/BOINC/res/drawable-mdpi/infow.png          |  Bin 3504 -> 0 bytes
 android/BOINC/res/drawable-mdpi/magnifierb.png     |  Bin 3649 -> 0 bytes
 android/BOINC/res/drawable-mdpi/mailb.png          |  Bin 3672 -> 0 bytes
 android/BOINC/res/drawable-mdpi/mailsmallw.png     |  Bin 3297 -> 0 bytes
 android/BOINC/res/drawable-mdpi/mailw.png          |  Bin 3415 -> 0 bytes
 android/BOINC/res/drawable-mdpi/nextb.png          |  Bin 3877 -> 0 bytes
 android/BOINC/res/drawable-mdpi/offb.png           |  Bin 3716 -> 0 bytes
 android/BOINC/res/drawable-mdpi/offw.png           |  Bin 3526 -> 0 bytes
 android/BOINC/res/drawable-mdpi/pausew.png         |  Bin 3110 -> 0 bytes
 android/BOINC/res/drawable-mdpi/playw.png          |  Bin 3255 -> 0 bytes
 android/BOINC/res/drawable-mdpi/plusw.png          |  Bin 832 -> 0 bytes
 android/BOINC/res/drawable-mdpi/previousb.png      |  Bin 3878 -> 0 bytes
 android/BOINC/res/drawable-mdpi/projects.png       |  Bin 897 -> 0 bytes
 android/BOINC/res/drawable-mdpi/projectsb.png      |  Bin 846 -> 0 bytes
 android/BOINC/res/drawable-mdpi/refreshw.png       |  Bin 3228 -> 0 bytes
 android/BOINC/res/drawable-mdpi/screenb.png        |  Bin 3179 -> 0 bytes
 android/BOINC/res/drawable-mdpi/speechbubbleb.png  |  Bin 3605 -> 0 bytes
 android/BOINC/res/drawable-mdpi/sqplusb.png        |  Bin 3191 -> 0 bytes
 android/BOINC/res/drawable-mdpi/status.png         |  Bin 502 -> 0 bytes
 android/BOINC/res/drawable-mdpi/statusb.png        |  Bin 472 -> 0 bytes
 android/BOINC/res/drawable-mdpi/tabsettings.png    |  Bin 706 -> 0 bytes
 android/BOINC/res/drawable-mdpi/tabsettingsb.png   |  Bin 677 -> 0 bytes
 android/BOINC/res/drawable-mdpi/tabtask.png        |  Bin 428 -> 0 bytes
 android/BOINC/res/drawable-mdpi/tabtaskb.png       |  Bin 412 -> 0 bytes
 android/BOINC/res/drawable-mdpi/wirelessb.png      |  Bin 3324 -> 0 bytes
 android/BOINC/res/drawable-xhdpi/boinc.png         |  Bin 38078 -> 0 bytes
 android/BOINC/res/drawable-xhdpi/ic_drawer.png     |  Bin 1056 -> 0 bytes
 android/BOINC/res/drawable/aborttask.png           |  Bin 1281 -> 0 bytes
 android/BOINC/res/drawable/acctmgrb48.png          |  Bin 3784 -> 0 bytes
 android/BOINC/res/drawable/batteryb48.png          |  Bin 3643 -> 0 bytes
 android/BOINC/res/drawable/boinc_logo_large.png    |  Bin 45314 -> 0 bytes
 android/BOINC/res/drawable/cogsb48.png             |  Bin 4418 -> 0 bytes
 android/BOINC/res/drawable/collapse.png            |  Bin 1897 -> 0 bytes
 android/BOINC/res/drawable/expand.png              |  Bin 1837 -> 0 bytes
 android/BOINC/res/drawable/infob48.png             |  Bin 3812 -> 0 bytes
 android/BOINC/res/drawable/notconnectedb48.png     |  Bin 4088 -> 0 bytes
 android/BOINC/res/drawable/pauseb48.png            |  Bin 3127 -> 0 bytes
 android/BOINC/res/drawable/pausetask.png           |  Bin 465 -> 0 bytes
 android/BOINC/res/drawable/playb48.png             |  Bin 3507 -> 0 bytes
 android/BOINC/res/drawable/projectsb48.png         |  Bin 1287 -> 0 bytes
 android/BOINC/res/drawable/reloadb48.png           |  Bin 4129 -> 0 bytes
 android/BOINC/res/drawable/resumetask.png          |  Bin 810 -> 0 bytes
 android/BOINC/res/drawable/screen48b.png           |  Bin 3244 -> 0 bytes
 android/BOINC/res/drawable/watchb48.png            |  Bin 3854 -> 0 bytes
 client/client_state.cpp                            |    4 +-
 client/gpu_nvidia.cpp                              |   46 +-
 client/hostinfo_unix.cpp                           |   60 +-
 client/log_flags.cpp                               |    8 +-
 client/result.cpp                                  |    4 +
 clientgui/sg_ProjectPanel.cpp                      |    7 +-
 clientgui/sg_TaskPanel.cpp                         |    7 +-
 clientscr/progress/simt                            |  Bin 86780 -> 0 bytes
 configure.ac                                       |    2 +-
 lib/cc_config.cpp                                  |    8 +-
 lib/cc_config.h                                    |    2 +-
 lib/coproc.cpp                                     |    6 +-
 lib/filesys.cpp                                    |    1 +
 lib/gui_rpc_client.h                               |    5 +-
 lib/gui_rpc_client_ops.cpp                         |    9 +-
 lib/str_util.cpp                                   |    4 +-
 locale/it_IT/BOINC-Manager.po                      |   36 +-
 locale/it_IT/BOINC-Project-Generic.po              |    2 +-
 locale/nl/BOINC-Project-Generic.po                 |    2 +-
 locale/sk/BOINC-Manager.po                         | 1052 +++---
 locale/sk/BOINC-Project-Generic.po                 |   14 +-
 locale/zh_TW/BOINC-Drupal.po                       | 1732 ++++++++++
 locale/zh_TW/BOINC-Manager.po                      | 2249 ++++++-------
 locale/zh_TW/BOINC-Project-Generic.po              | 3452 ++++++++++----------
 locale/zh_TW/BOINC-Web.po                          |  743 +++--
 mac3rdParty/buildMacTravis.sh                      |   74 +
 vda/vda.cpp                                        |    6 +-
 version.log                                        |    2 +-
 137 files changed, 5753 insertions(+), 3788 deletions(-)

diff --git a/android/BOINC/AndroidManifest.xml b/android/BOINC/AndroidManifest.xml
index a184f24..73141d2 100644
--- a/android/BOINC/AndroidManifest.xml
+++ b/android/BOINC/AndroidManifest.xml
@@ -20,8 +20,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="edu.berkeley.boinc"
     android:installLocation="internalOnly"
-    android:versionCode="131"
-    android:versionName="7.6.17" > <!-- installation on SD card would break boot receiver -->
+    android:versionCode="133"
+    android:versionName="7.6.19" > <!-- installation on SD card would break boot receiver -->
 
 
     <!-- Add Google Play store metadata informing the store we can run on tablets and other large screen devices -->
diff --git a/android/BOINC/res/drawable-ldpi/acctmgrb.png b/android/BOINC/res/drawable-ldpi/acctmgrb.png
deleted file mode 100644
index b82ace5..0000000
Binary files a/android/BOINC/res/drawable-ldpi/acctmgrb.png and /dev/null differ
diff --git a/android/BOINC/res/drawable-ldpi/acctmgrw.png b/android/BOINC/res/drawable-ldpi/acctmgrw.png
deleted file mode 100644
index becd38e..0000000
Binary files a/android/BOINC/res/drawable-ldpi/acctmgrw.png and /dev/null differ
diff --git a/android/BOINC/res/drawable-ldpi/attentionb.png b/android/BOINC/res/drawable-ldpi/attentionb.png
deleted file mode 100644
index aa7398c..0000000
Binary files a/android/BOINC/res/drawable-ldpi/attentionb.png and /dev/null differ
diff --git a/android/BOINC/res/drawable-ldpi/boinc.png b/android/BOINC/res/drawable-ldpi/boinc.png
deleted file mode 100644
index f16bf9f..0000000
Binary files a/android/BOINC/res/drawable-ldpi/boinc.png and /dev/null differ
diff --git a/android/BOINC/res/drawable-ldpi/bugb.png b/android/BOINC/res/drawable-ldpi/bugb.png
deleted file mode 100644
index 45ce255..0000000
Binary files a/android/BOINC/res/drawable-ldpi/bugb.png and /dev/null differ
diff --git a/android/BOINC/res/drawable-ldpi/bugw.png b/android/BOINC/res/drawable-ldpi/bugw.png
deleted file mode 100644
index edb8eaa..0000000
Binary files a/android/BOINC/res/drawable-ldpi/bugw.png and /dev/null differ
diff --git a/android/BOINC/res/drawable-ldpi/chartb.png b/android/BOINC/res/drawable-ldpi/chartb.png
deleted file mode 100644
index ca39518..0000000
Binary files a/android/BOINC/res/drawable-ldpi/chartb.png and /dev/null differ
diff --git a/android/BOINC/res/drawable-ldpi/checkb.png b/android/BOINC/res/drawable-ldpi/checkb.png
deleted file mode 100644
index 7da7a71..0000000
Binary files a/android/BOINC/res/drawable-ldpi/checkb.png and /dev/null differ
diff --git a/android/BOINC/res/drawable-ldpi/cogsb.png b/android/BOINC/res/drawable-ldpi/cogsb.png
deleted file mode 100644
index ba5919a..0000000
Binary files a/android/BOINC/res/drawable-ldpi/cogsb.png and /dev/null differ
diff --git a/android/BOINC/res/drawable-ldpi/cogw.png b/android/BOINC/res/drawable-ldpi/cogw.png
deleted file mode 100644
index 2e62f9a..0000000
Binary files a/android/BOINC/res/drawable-ldpi/cogw.png and /dev/null differ
diff --git a/android/BOINC/res/drawable-ldpi/connectchargerb.png b/android/BOINC/res/drawable-ldpi/connectchargerb.png
deleted file mode 100644
index be45aa9..0000000
Binary files a/android/BOINC/res/drawable-ldpi/connectchargerb.png and /dev/null differ
diff --git a/android/BOINC/res/drawable-ldpi/copyw.png b/android/BOINC/res/drawable-ldpi/copyw.png
deleted file mode 100644
index d26e777..0000000
Binary files a/android/BOINC/res/drawable-ldpi/copyw.png and /dev/null differ
diff --git a/android/BOINC/res/drawable-ldpi/desktopb.png b/android/BOINC/res/drawable-ldpi/desktopb.png
deleted file mode 100644
index 14d46b0..0000000
Binary files a/android/BOINC/res/drawable-ldpi/desktopb.png and /dev/null differ
diff --git a/android/BOINC/res/drawable-ldpi/failedb.png b/android/BOINC/res/drawable-ldpi/failedb.png
deleted file mode 100644
index b59c23c..0000000
Binary files a/android/BOINC/res/drawable-ldpi/failedb.png and /dev/null differ
diff --git a/android/BOINC/res/drawable-ldpi/helpb.png b/android/BOINC/res/drawable-ldpi/helpb.png
deleted file mode 100644
index 5546b35..0000000
Binary files a/android/BOINC/res/drawable-ldpi/helpb.png and /dev/null differ
diff --git a/android/BOINC/res/drawable-ldpi/helpw.png b/android/BOINC/res/drawable-ldpi/helpw.png
deleted file mode 100644
index 4ad9c00..0000000
Binary files a/android/BOINC/res/drawable-ldpi/helpw.png and /dev/null differ
diff --git a/android/BOINC/res/drawable-ldpi/ic_stat_notify_boinc_normal.png b/android/BOINC/res/drawable-ldpi/ic_stat_notify_boinc_normal.png
deleted file mode 100644
index 42dd3fc..0000000
Binary files a/android/BOINC/res/drawable-ldpi/ic_stat_notify_boinc_normal.png and /dev/null differ
diff --git a/android/BOINC/res/drawable-ldpi/ic_stat_notify_boinc_paused.png b/android/BOINC/res/drawable-ldpi/ic_stat_notify_boinc_paused.png
deleted file mode 100644
index b168b24..0000000
Binary files a/android/BOINC/res/drawable-ldpi/ic_stat_notify_boinc_paused.png and /dev/null differ
diff --git a/android/BOINC/res/drawable-ldpi/infob.png b/android/BOINC/res/drawable-ldpi/infob.png
deleted file mode 100644
index 845ac86..0000000
Binary files a/android/BOINC/res/drawable-ldpi/infob.png and /dev/null differ
diff --git a/android/BOINC/res/drawable-ldpi/infow.png b/android/BOINC/res/drawable-ldpi/infow.png
deleted file mode 100644
index c9205e3..0000000
Binary files a/android/BOINC/res/drawable-ldpi/infow.png and /dev/null differ
diff --git a/android/BOINC/res/drawable-ldpi/magnifierb.png b/android/BOINC/res/drawable-ldpi/magnifierb.png
deleted file mode 100644
index d6b5615..0000000
Binary files a/android/BOINC/res/drawable-ldpi/magnifierb.png and /dev/null differ
diff --git a/android/BOINC/res/drawable-ldpi/mailb.png b/android/BOINC/res/drawable-ldpi/mailb.png
deleted file mode 100644
index 51d6ca5..0000000
Binary files a/android/BOINC/res/drawable-ldpi/mailb.png and /dev/null differ
diff --git a/android/BOINC/res/drawable-ldpi/mailsmallw.png b/android/BOINC/res/drawable-ldpi/mailsmallw.png
deleted file mode 100644
index 871401c..0000000
Binary files a/android/BOINC/res/drawable-ldpi/mailsmallw.png and /dev/null differ
diff --git a/android/BOINC/res/drawable-ldpi/mailw.png b/android/BOINC/res/drawable-ldpi/mailw.png
deleted file mode 100644
index 47325ef..0000000
Binary files a/android/BOINC/res/drawable-ldpi/mailw.png and /dev/null differ
diff --git a/android/BOINC/res/drawable-ldpi/nextb.png b/android/BOINC/res/drawable-ldpi/nextb.png
deleted file mode 100644
index 2ca81ed..0000000
Binary files a/android/BOINC/res/drawable-ldpi/nextb.png and /dev/null differ
diff --git a/android/BOINC/res/drawable-ldpi/offb.png b/android/BOINC/res/drawable-ldpi/offb.png
deleted file mode 100644
index bd5997c..0000000
Binary files a/android/BOINC/res/drawable-ldpi/offb.png and /dev/null differ
diff --git a/android/BOINC/res/drawable-ldpi/offw.png b/android/BOINC/res/drawable-ldpi/offw.png
deleted file mode 100644
index 072d21c..0000000
Binary files a/android/BOINC/res/drawable-ldpi/offw.png and /dev/null differ
diff --git a/android/BOINC/res/drawable-ldpi/pausew.png b/android/BOINC/res/drawable-ldpi/pausew.png
deleted file mode 100644
index 70ffc52..0000000
Binary files a/android/BOINC/res/drawable-ldpi/pausew.png and /dev/null differ
diff --git a/android/BOINC/res/drawable-ldpi/playw.png b/android/BOINC/res/drawable-ldpi/playw.png
deleted file mode 100644
index 1e184c7..0000000
Binary files a/android/BOINC/res/drawable-ldpi/playw.png and /dev/null differ
diff --git a/android/BOINC/res/drawable-ldpi/plusw.png b/android/BOINC/res/drawable-ldpi/plusw.png
deleted file mode 100644
index 02d2f46..0000000
Binary files a/android/BOINC/res/drawable-ldpi/plusw.png and /dev/null differ
diff --git a/android/BOINC/res/drawable-ldpi/previousb.png b/android/BOINC/res/drawable-ldpi/previousb.png
deleted file mode 100644
index 0265897..0000000
Binary files a/android/BOINC/res/drawable-ldpi/previousb.png and /dev/null differ
diff --git a/android/BOINC/res/drawable-ldpi/projects.png b/android/BOINC/res/drawable-ldpi/projects.png
deleted file mode 100644
index 8012ff8..0000000
Binary files a/android/BOINC/res/drawable-ldpi/projects.png and /dev/null differ
diff --git a/android/BOINC/res/drawable-ldpi/projectsb.png b/android/BOINC/res/drawable-ldpi/projectsb.png
deleted file mode 100644
index 5b425a7..0000000
Binary files a/android/BOINC/res/drawable-ldpi/projectsb.png and /dev/null differ
diff --git a/android/BOINC/res/drawable-ldpi/refreshw.png b/android/BOINC/res/drawable-ldpi/refreshw.png
deleted file mode 100644
index fe0331f..0000000
Binary files a/android/BOINC/res/drawable-ldpi/refreshw.png and /dev/null differ
diff --git a/android/BOINC/res/drawable-ldpi/screenb.png b/android/BOINC/res/drawable-ldpi/screenb.png
deleted file mode 100644
index 76b7bb1..0000000
Binary files a/android/BOINC/res/drawable-ldpi/screenb.png and /dev/null differ
diff --git a/android/BOINC/res/drawable-ldpi/speechbubbleb.png b/android/BOINC/res/drawable-ldpi/speechbubbleb.png
deleted file mode 100644
index 5546b35..0000000
Binary files a/android/BOINC/res/drawable-ldpi/speechbubbleb.png and /dev/null differ
diff --git a/android/BOINC/res/drawable-ldpi/sqplusb.png b/android/BOINC/res/drawable-ldpi/sqplusb.png
deleted file mode 100644
index 2032a77..0000000
Binary files a/android/BOINC/res/drawable-ldpi/sqplusb.png and /dev/null differ
diff --git a/android/BOINC/res/drawable-ldpi/status.png b/android/BOINC/res/drawable-ldpi/status.png
deleted file mode 100644
index cf707f4..0000000
Binary files a/android/BOINC/res/drawable-ldpi/status.png and /dev/null differ
diff --git a/android/BOINC/res/drawable-ldpi/statusb.png b/android/BOINC/res/drawable-ldpi/statusb.png
deleted file mode 100644
index b5cadc9..0000000
Binary files a/android/BOINC/res/drawable-ldpi/statusb.png and /dev/null differ
diff --git a/android/BOINC/res/drawable-ldpi/tabsettings.png b/android/BOINC/res/drawable-ldpi/tabsettings.png
deleted file mode 100644
index df01095..0000000
Binary files a/android/BOINC/res/drawable-ldpi/tabsettings.png and /dev/null differ
diff --git a/android/BOINC/res/drawable-ldpi/tabsettingsb.png b/android/BOINC/res/drawable-ldpi/tabsettingsb.png
deleted file mode 100644
index 943a919..0000000
Binary files a/android/BOINC/res/drawable-ldpi/tabsettingsb.png and /dev/null differ
diff --git a/android/BOINC/res/drawable-ldpi/tabtask.png b/android/BOINC/res/drawable-ldpi/tabtask.png
deleted file mode 100644
index 91a0801..0000000
Binary files a/android/BOINC/res/drawable-ldpi/tabtask.png and /dev/null differ
diff --git a/android/BOINC/res/drawable-ldpi/tabtaskb.png b/android/BOINC/res/drawable-ldpi/tabtaskb.png
deleted file mode 100644
index 0a86f25..0000000
Binary files a/android/BOINC/res/drawable-ldpi/tabtaskb.png and /dev/null differ
diff --git a/android/BOINC/res/drawable-ldpi/wirelessb.png b/android/BOINC/res/drawable-ldpi/wirelessb.png
deleted file mode 100644
index c5d7f4d..0000000
Binary files a/android/BOINC/res/drawable-ldpi/wirelessb.png and /dev/null differ
diff --git a/android/BOINC/res/drawable-mdpi/acctmgrb.png b/android/BOINC/res/drawable-mdpi/acctmgrb.png
deleted file mode 100644
index 07d0d6d..0000000
Binary files a/android/BOINC/res/drawable-mdpi/acctmgrb.png and /dev/null differ
diff --git a/android/BOINC/res/drawable-mdpi/acctmgrw.png b/android/BOINC/res/drawable-mdpi/acctmgrw.png
deleted file mode 100644
index aa2060e..0000000
Binary files a/android/BOINC/res/drawable-mdpi/acctmgrw.png and /dev/null differ
diff --git a/android/BOINC/res/drawable-mdpi/attentionb.png b/android/BOINC/res/drawable-mdpi/attentionb.png
deleted file mode 100644
index 8b4b4c1..0000000
Binary files a/android/BOINC/res/drawable-mdpi/attentionb.png and /dev/null differ
diff --git a/android/BOINC/res/drawable-mdpi/boinc.png b/android/BOINC/res/drawable-mdpi/boinc.png
deleted file mode 100644
index fa0bba2..0000000
Binary files a/android/BOINC/res/drawable-mdpi/boinc.png and /dev/null differ
diff --git a/android/BOINC/res/drawable-mdpi/bugb.png b/android/BOINC/res/drawable-mdpi/bugb.png
deleted file mode 100644
index d799e41..0000000
Binary files a/android/BOINC/res/drawable-mdpi/bugb.png and /dev/null differ
diff --git a/android/BOINC/res/drawable-mdpi/bugw.png b/android/BOINC/res/drawable-mdpi/bugw.png
deleted file mode 100644
index 072f845..0000000
Binary files a/android/BOINC/res/drawable-mdpi/bugw.png and /dev/null differ
diff --git a/android/BOINC/res/drawable-mdpi/chartb.png b/android/BOINC/res/drawable-mdpi/chartb.png
deleted file mode 100644
index 5d0cafa..0000000
Binary files a/android/BOINC/res/drawable-mdpi/chartb.png and /dev/null differ
diff --git a/android/BOINC/res/drawable-mdpi/checkb.png b/android/BOINC/res/drawable-mdpi/checkb.png
deleted file mode 100644
index da6a30e..0000000
Binary files a/android/BOINC/res/drawable-mdpi/checkb.png and /dev/null differ
diff --git a/android/BOINC/res/drawable-mdpi/cogsb.png b/android/BOINC/res/drawable-mdpi/cogsb.png
deleted file mode 100644
index 7029496..0000000
Binary files a/android/BOINC/res/drawable-mdpi/cogsb.png and /dev/null differ
diff --git a/android/BOINC/res/drawable-mdpi/cogw.png b/android/BOINC/res/drawable-mdpi/cogw.png
deleted file mode 100644
index 510c2d6..0000000
Binary files a/android/BOINC/res/drawable-mdpi/cogw.png and /dev/null differ
diff --git a/android/BOINC/res/drawable-mdpi/connectchargerb.png b/android/BOINC/res/drawable-mdpi/connectchargerb.png
deleted file mode 100644
index 850681e..0000000
Binary files a/android/BOINC/res/drawable-mdpi/connectchargerb.png and /dev/null differ
diff --git a/android/BOINC/res/drawable-mdpi/copyw.png b/android/BOINC/res/drawable-mdpi/copyw.png
deleted file mode 100644
index c1ff849..0000000
Binary files a/android/BOINC/res/drawable-mdpi/copyw.png and /dev/null differ
diff --git a/android/BOINC/res/drawable-mdpi/desktopb.png b/android/BOINC/res/drawable-mdpi/desktopb.png
deleted file mode 100644
index e4d49f0..0000000
Binary files a/android/BOINC/res/drawable-mdpi/desktopb.png and /dev/null differ
diff --git a/android/BOINC/res/drawable-mdpi/failedb.png b/android/BOINC/res/drawable-mdpi/failedb.png
deleted file mode 100644
index 3c5123a..0000000
Binary files a/android/BOINC/res/drawable-mdpi/failedb.png and /dev/null differ
diff --git a/android/BOINC/res/drawable-mdpi/helpb.png b/android/BOINC/res/drawable-mdpi/helpb.png
deleted file mode 100644
index 7e4a485..0000000
Binary files a/android/BOINC/res/drawable-mdpi/helpb.png and /dev/null differ
diff --git a/android/BOINC/res/drawable-mdpi/helpw.png b/android/BOINC/res/drawable-mdpi/helpw.png
deleted file mode 100644
index 70ddf61..0000000
Binary files a/android/BOINC/res/drawable-mdpi/helpw.png and /dev/null differ
diff --git a/android/BOINC/res/drawable-mdpi/ic_drawer.png b/android/BOINC/res/drawable-mdpi/ic_drawer.png
deleted file mode 100644
index fb681ba..0000000
Binary files a/android/BOINC/res/drawable-mdpi/ic_drawer.png and /dev/null differ
diff --git a/android/BOINC/res/drawable-mdpi/ic_stat_notify_boinc_normal.png b/android/BOINC/res/drawable-mdpi/ic_stat_notify_boinc_normal.png
deleted file mode 100644
index 9acfe94..0000000
Binary files a/android/BOINC/res/drawable-mdpi/ic_stat_notify_boinc_normal.png and /dev/null differ
diff --git a/android/BOINC/res/drawable-mdpi/ic_stat_notify_boinc_paused.png b/android/BOINC/res/drawable-mdpi/ic_stat_notify_boinc_paused.png
deleted file mode 100644
index cf57611..0000000
Binary files a/android/BOINC/res/drawable-mdpi/ic_stat_notify_boinc_paused.png and /dev/null differ
diff --git a/android/BOINC/res/drawable-mdpi/infob.png b/android/BOINC/res/drawable-mdpi/infob.png
deleted file mode 100644
index 33140ef..0000000
Binary files a/android/BOINC/res/drawable-mdpi/infob.png and /dev/null differ
diff --git a/android/BOINC/res/drawable-mdpi/infow.png b/android/BOINC/res/drawable-mdpi/infow.png
deleted file mode 100644
index b1f78c1..0000000
Binary files a/android/BOINC/res/drawable-mdpi/infow.png and /dev/null differ
diff --git a/android/BOINC/res/drawable-mdpi/magnifierb.png b/android/BOINC/res/drawable-mdpi/magnifierb.png
deleted file mode 100644
index 463253e..0000000
Binary files a/android/BOINC/res/drawable-mdpi/magnifierb.png and /dev/null differ
diff --git a/android/BOINC/res/drawable-mdpi/mailb.png b/android/BOINC/res/drawable-mdpi/mailb.png
deleted file mode 100644
index 5a51fe8..0000000
Binary files a/android/BOINC/res/drawable-mdpi/mailb.png and /dev/null differ
diff --git a/android/BOINC/res/drawable-mdpi/mailsmallw.png b/android/BOINC/res/drawable-mdpi/mailsmallw.png
deleted file mode 100644
index 47325ef..0000000
Binary files a/android/BOINC/res/drawable-mdpi/mailsmallw.png and /dev/null differ
diff --git a/android/BOINC/res/drawable-mdpi/mailw.png b/android/BOINC/res/drawable-mdpi/mailw.png
deleted file mode 100644
index 865a773..0000000
Binary files a/android/BOINC/res/drawable-mdpi/mailw.png and /dev/null differ
diff --git a/android/BOINC/res/drawable-mdpi/nextb.png b/android/BOINC/res/drawable-mdpi/nextb.png
deleted file mode 100644
index 85d54b9..0000000
Binary files a/android/BOINC/res/drawable-mdpi/nextb.png and /dev/null differ
diff --git a/android/BOINC/res/drawable-mdpi/offb.png b/android/BOINC/res/drawable-mdpi/offb.png
deleted file mode 100644
index 75af5bd..0000000
Binary files a/android/BOINC/res/drawable-mdpi/offb.png and /dev/null differ
diff --git a/android/BOINC/res/drawable-mdpi/offw.png b/android/BOINC/res/drawable-mdpi/offw.png
deleted file mode 100644
index 38bfc9f..0000000
Binary files a/android/BOINC/res/drawable-mdpi/offw.png and /dev/null differ
diff --git a/android/BOINC/res/drawable-mdpi/pausew.png b/android/BOINC/res/drawable-mdpi/pausew.png
deleted file mode 100644
index faf9461..0000000
Binary files a/android/BOINC/res/drawable-mdpi/pausew.png and /dev/null differ
diff --git a/android/BOINC/res/drawable-mdpi/playw.png b/android/BOINC/res/drawable-mdpi/playw.png
deleted file mode 100644
index 285cabd..0000000
Binary files a/android/BOINC/res/drawable-mdpi/playw.png and /dev/null differ
diff --git a/android/BOINC/res/drawable-mdpi/plusw.png b/android/BOINC/res/drawable-mdpi/plusw.png
deleted file mode 100644
index dfbe2bc..0000000
Binary files a/android/BOINC/res/drawable-mdpi/plusw.png and /dev/null differ
diff --git a/android/BOINC/res/drawable-mdpi/previousb.png b/android/BOINC/res/drawable-mdpi/previousb.png
deleted file mode 100644
index ead160a..0000000
Binary files a/android/BOINC/res/drawable-mdpi/previousb.png and /dev/null differ
diff --git a/android/BOINC/res/drawable-mdpi/projects.png b/android/BOINC/res/drawable-mdpi/projects.png
deleted file mode 100644
index 13d4799..0000000
Binary files a/android/BOINC/res/drawable-mdpi/projects.png and /dev/null differ
diff --git a/android/BOINC/res/drawable-mdpi/projectsb.png b/android/BOINC/res/drawable-mdpi/projectsb.png
deleted file mode 100644
index 66aec1c..0000000
Binary files a/android/BOINC/res/drawable-mdpi/projectsb.png and /dev/null differ
diff --git a/android/BOINC/res/drawable-mdpi/refreshw.png b/android/BOINC/res/drawable-mdpi/refreshw.png
deleted file mode 100644
index e66a5e9..0000000
Binary files a/android/BOINC/res/drawable-mdpi/refreshw.png and /dev/null differ
diff --git a/android/BOINC/res/drawable-mdpi/screenb.png b/android/BOINC/res/drawable-mdpi/screenb.png
deleted file mode 100644
index 5b5b6c4..0000000
Binary files a/android/BOINC/res/drawable-mdpi/screenb.png and /dev/null differ
diff --git a/android/BOINC/res/drawable-mdpi/speechbubbleb.png b/android/BOINC/res/drawable-mdpi/speechbubbleb.png
deleted file mode 100644
index 7e4a485..0000000
Binary files a/android/BOINC/res/drawable-mdpi/speechbubbleb.png and /dev/null differ
diff --git a/android/BOINC/res/drawable-mdpi/sqplusb.png b/android/BOINC/res/drawable-mdpi/sqplusb.png
deleted file mode 100644
index 5f23c8d..0000000
Binary files a/android/BOINC/res/drawable-mdpi/sqplusb.png and /dev/null differ
diff --git a/android/BOINC/res/drawable-mdpi/status.png b/android/BOINC/res/drawable-mdpi/status.png
deleted file mode 100644
index 0ff0e9d..0000000
Binary files a/android/BOINC/res/drawable-mdpi/status.png and /dev/null differ
diff --git a/android/BOINC/res/drawable-mdpi/statusb.png b/android/BOINC/res/drawable-mdpi/statusb.png
deleted file mode 100644
index 94d3b6b..0000000
Binary files a/android/BOINC/res/drawable-mdpi/statusb.png and /dev/null differ
diff --git a/android/BOINC/res/drawable-mdpi/tabsettings.png b/android/BOINC/res/drawable-mdpi/tabsettings.png
deleted file mode 100644
index 33ba5e1..0000000
Binary files a/android/BOINC/res/drawable-mdpi/tabsettings.png and /dev/null differ
diff --git a/android/BOINC/res/drawable-mdpi/tabsettingsb.png b/android/BOINC/res/drawable-mdpi/tabsettingsb.png
deleted file mode 100644
index edf5720..0000000
Binary files a/android/BOINC/res/drawable-mdpi/tabsettingsb.png and /dev/null differ
diff --git a/android/BOINC/res/drawable-mdpi/tabtask.png b/android/BOINC/res/drawable-mdpi/tabtask.png
deleted file mode 100644
index ed293e8..0000000
Binary files a/android/BOINC/res/drawable-mdpi/tabtask.png and /dev/null differ
diff --git a/android/BOINC/res/drawable-mdpi/tabtaskb.png b/android/BOINC/res/drawable-mdpi/tabtaskb.png
deleted file mode 100644
index 34fe51c..0000000
Binary files a/android/BOINC/res/drawable-mdpi/tabtaskb.png and /dev/null differ
diff --git a/android/BOINC/res/drawable-mdpi/wirelessb.png b/android/BOINC/res/drawable-mdpi/wirelessb.png
deleted file mode 100644
index f62684a..0000000
Binary files a/android/BOINC/res/drawable-mdpi/wirelessb.png and /dev/null differ
diff --git a/android/BOINC/res/drawable-xhdpi/boinc.png b/android/BOINC/res/drawable-xhdpi/boinc.png
deleted file mode 100644
index fac7487..0000000
Binary files a/android/BOINC/res/drawable-xhdpi/boinc.png and /dev/null differ
diff --git a/android/BOINC/res/drawable-xhdpi/ic_drawer.png b/android/BOINC/res/drawable-xhdpi/ic_drawer.png
deleted file mode 100644
index b9bc3d7..0000000
Binary files a/android/BOINC/res/drawable-xhdpi/ic_drawer.png and /dev/null differ
diff --git a/android/BOINC/res/drawable/aborttask.png b/android/BOINC/res/drawable/aborttask.png
deleted file mode 100644
index 552a200..0000000
Binary files a/android/BOINC/res/drawable/aborttask.png and /dev/null differ
diff --git a/android/BOINC/res/drawable/acctmgrb48.png b/android/BOINC/res/drawable/acctmgrb48.png
deleted file mode 100644
index ddc05f1..0000000
Binary files a/android/BOINC/res/drawable/acctmgrb48.png and /dev/null differ
diff --git a/android/BOINC/res/drawable/batteryb48.png b/android/BOINC/res/drawable/batteryb48.png
deleted file mode 100644
index 9cda7de..0000000
Binary files a/android/BOINC/res/drawable/batteryb48.png and /dev/null differ
diff --git a/android/BOINC/res/drawable/boinc_logo_large.png b/android/BOINC/res/drawable/boinc_logo_large.png
deleted file mode 100644
index 7b878f3..0000000
Binary files a/android/BOINC/res/drawable/boinc_logo_large.png and /dev/null differ
diff --git a/android/BOINC/res/drawable/cogsb48.png b/android/BOINC/res/drawable/cogsb48.png
deleted file mode 100644
index e683595..0000000
Binary files a/android/BOINC/res/drawable/cogsb48.png and /dev/null differ
diff --git a/android/BOINC/res/drawable/collapse.png b/android/BOINC/res/drawable/collapse.png
deleted file mode 100644
index 0a5aa48..0000000
Binary files a/android/BOINC/res/drawable/collapse.png and /dev/null differ
diff --git a/android/BOINC/res/drawable/expand.png b/android/BOINC/res/drawable/expand.png
deleted file mode 100644
index 17b4da7..0000000
Binary files a/android/BOINC/res/drawable/expand.png and /dev/null differ
diff --git a/android/BOINC/res/drawable/infob48.png b/android/BOINC/res/drawable/infob48.png
deleted file mode 100644
index 071cb87..0000000
Binary files a/android/BOINC/res/drawable/infob48.png and /dev/null differ
diff --git a/android/BOINC/res/drawable/notconnectedb48.png b/android/BOINC/res/drawable/notconnectedb48.png
deleted file mode 100644
index 708cc7f..0000000
Binary files a/android/BOINC/res/drawable/notconnectedb48.png and /dev/null differ
diff --git a/android/BOINC/res/drawable/pauseb48.png b/android/BOINC/res/drawable/pauseb48.png
deleted file mode 100644
index cab2878..0000000
Binary files a/android/BOINC/res/drawable/pauseb48.png and /dev/null differ
diff --git a/android/BOINC/res/drawable/pausetask.png b/android/BOINC/res/drawable/pausetask.png
deleted file mode 100644
index 9b77ba3..0000000
Binary files a/android/BOINC/res/drawable/pausetask.png and /dev/null differ
diff --git a/android/BOINC/res/drawable/playb48.png b/android/BOINC/res/drawable/playb48.png
deleted file mode 100644
index 5422b39..0000000
Binary files a/android/BOINC/res/drawable/playb48.png and /dev/null differ
diff --git a/android/BOINC/res/drawable/projectsb48.png b/android/BOINC/res/drawable/projectsb48.png
deleted file mode 100644
index 63cabe4..0000000
Binary files a/android/BOINC/res/drawable/projectsb48.png and /dev/null differ
diff --git a/android/BOINC/res/drawable/reloadb48.png b/android/BOINC/res/drawable/reloadb48.png
deleted file mode 100644
index d0150b5..0000000
Binary files a/android/BOINC/res/drawable/reloadb48.png and /dev/null differ
diff --git a/android/BOINC/res/drawable/resumetask.png b/android/BOINC/res/drawable/resumetask.png
deleted file mode 100644
index 77b1d4d..0000000
Binary files a/android/BOINC/res/drawable/resumetask.png and /dev/null differ
diff --git a/android/BOINC/res/drawable/screen48b.png b/android/BOINC/res/drawable/screen48b.png
deleted file mode 100644
index 0c59fc5..0000000
Binary files a/android/BOINC/res/drawable/screen48b.png and /dev/null differ
diff --git a/android/BOINC/res/drawable/watchb48.png b/android/BOINC/res/drawable/watchb48.png
deleted file mode 100644
index e245167..0000000
Binary files a/android/BOINC/res/drawable/watchb48.png and /dev/null differ
diff --git a/client/client_state.cpp b/client/client_state.cpp
index 2a120ec..5b1daa6 100644
--- a/client/client_state.cpp
+++ b/client/client_state.cpp
@@ -412,7 +412,7 @@ static void set_client_priority() {
 #endif
 #ifdef __linux__
     char buf[1024];
-    sprintf(buf, "ionice -c 3 -n 7 -p %d", getpid());
+    sprintf(buf, "ionice -c 3 -p %d", getpid());
     system(buf);
 #endif
 }
@@ -460,7 +460,7 @@ int CLIENT_STATE::init() {
 
     msg_printf(NULL, MSG_INFO, "Libraries: %s", curl_version());
 
-    if (!cc_config.dont_lower_client_priority) {
+    if (cc_config.lower_client_priority) {
         set_client_priority();
     }
 
diff --git a/client/gpu_nvidia.cpp b/client/gpu_nvidia.cpp
index d12ab11..82a2446 100644
--- a/client/gpu_nvidia.cpp
+++ b/client/gpu_nvidia.cpp
@@ -209,7 +209,6 @@ CUDA_MA __cuMemAlloc = NULL;
 CUDA_MF __cuMemFree = NULL;
 CUDA_MGI __cuMemGetInfo = NULL;
 #else
-void* cudalib;
 int (*__cuInit)(unsigned int);
 int (*__cuDeviceGetCount)(int*);
 int (*__cuDriverGetVersion)(int*);
@@ -233,6 +232,9 @@ void COPROC_NVIDIA::get(
 ) {
     int cuda_ndevs, retval;
     char buf[256];
+    int j, itemp;
+    size_t global_mem = 0;
+    COPROC_NVIDIA cc;
 
 #ifdef _WIN32
     HMODULE cudalib = LoadLibrary("nvcuda.dll");
@@ -277,6 +279,8 @@ void COPROC_NVIDIA::get(
 #endif
 #else
 
+void* cudalib = NULL;
+
 #ifdef __APPLE__
     cudalib = dlopen("/usr/local/cuda/lib/libcuda.dylib", RTLD_NOW);
 #else
@@ -299,44 +303,43 @@ void COPROC_NVIDIA::get(
     __cuMemAlloc = (int(*)(unsigned int*, size_t)) dlsym( cudalib, "cuMemAlloc" );
     __cuMemFree = (int(*)(unsigned int)) dlsym( cudalib, "cuMemFree" );
     __cuMemGetInfo = (int(*)(size_t*, size_t*)) dlsym( cudalib, "cuMemGetInfo" );
-    dlclose(cudalib);
 #endif
 
     if (!__cuDriverGetVersion) {
         warnings.push_back("cuDriverGetVersion() missing from NVIDIA library");
-        return;
+        goto leave;
     }
     if (!__cuInit) {
         warnings.push_back("cuInit() missing from NVIDIA library");
-        return;
+        goto leave;
     }
     if (!__cuDeviceGetCount) {
         warnings.push_back("cuDeviceGetCount() missing from NVIDIA library");
-        return;
+        goto leave;
     }
     if (!__cuDeviceGet) {
         warnings.push_back("cuDeviceGet() missing from NVIDIA library");
-        return;
+        goto leave;
     }
     if (!__cuDeviceGetAttribute) {
         warnings.push_back("cuDeviceGetAttribute() missing from NVIDIA library");
-        return;
+        goto leave;
     }
     if (!__cuDeviceTotalMem) {
         warnings.push_back("cuDeviceTotalMem() missing from NVIDIA library");
-        return;
+        goto leave;
     }
     if (!__cuDeviceComputeCapability) {
         warnings.push_back("cuDeviceComputeCapability() missing from NVIDIA library");
-        return;
+        goto leave;
     }
     if (!__cuMemAlloc) {
         warnings.push_back("cuMemAlloc() missing from NVIDIA library");
-        return;
+        goto leave;
     }
     if (!__cuMemFree) {
         warnings.push_back("cuMemFree() missing from NVIDIA library");
-        return;
+        goto leave;
     }
 
 #ifdef __APPLE__
@@ -355,14 +358,14 @@ void COPROC_NVIDIA::get(
     if (retval) {
         sprintf(buf, "NVIDIA drivers present but no GPUs found");
         warnings.push_back(buf);
-        return;
+        goto leave;
     }
 
     retval = (*__cuDriverGetVersion)(&cuda_version);
     if (retval) {
         sprintf(buf, "cuDriverGetVersion() returned %d", retval);
         warnings.push_back(buf);
-        return;
+        goto leave;
     }
 
     have_cuda = true;
@@ -371,15 +374,11 @@ void COPROC_NVIDIA::get(
     if (retval) {
         sprintf(buf, "cuDeviceGetCount() returned %d", retval);
         warnings.push_back(buf);
-        return;
+        goto leave;
     }
     sprintf(buf, "NVIDIA library reports %d GPU%s", cuda_ndevs, (cuda_ndevs==1)?"":"s");
     warnings.push_back(buf);
 
-    int j, itemp;
-    size_t global_mem = 0;
-    COPROC_NVIDIA cc;
-    string s;
     for (j=0; j<cuda_ndevs; j++) {
         memset(&cc.prop, 0, sizeof(cc.prop));
         CUdevice device;
@@ -387,13 +386,13 @@ void COPROC_NVIDIA::get(
         if (retval) {
             sprintf(buf, "cuDeviceGet(%d) returned %d", j, retval);
             warnings.push_back(buf);
-            return;
+            goto leave;
         }
         (*__cuDeviceGetName)(cc.prop.name, 256, device);
         if (retval) {
             sprintf(buf, "cuDeviceGetName(%d) returned %d", j, retval);
             warnings.push_back(buf);
-            return;
+            goto leave;
         }
         (*__cuDeviceComputeCapability)(&cc.prop.major, &cc.prop.minor, device);
         (*__cuDeviceTotalMem)(&global_mem, device);
@@ -440,6 +439,13 @@ void COPROC_NVIDIA::get(
     if (!nvidia_gpus.size()) {
         warnings.push_back("No CUDA-capable NVIDIA GPUs found");
     }
+    
+leave:
+#ifdef _WIN32
+    if (cudalib) FreeLibrary(cudalib);
+#else
+    if (cudalib) dlclose(cudalib);
+#endif
 }
 
 
diff --git a/client/hostinfo_unix.cpp b/client/hostinfo_unix.cpp
index 7e47237..2715d42 100644
--- a/client/hostinfo_unix.cpp
+++ b/client/hostinfo_unix.cpp
@@ -1224,47 +1224,41 @@ bool isDualGPUMacBook() {
 
 // see if Virtualbox is installed
 //
-static const struct dir_vbox_locations {
-    const char *dir;
-} vbox_locations[] = {
-    { "/usr/bin/VboxManage" },
-    { "/usr/local/bin/VboxManage" },
+const char* vbox_locations[] = {
+    "/usr/bin/VBoxManage",
+    "/usr/local/bin/VBoxManage",
     // add other ifdefs here as necessary.
-    { NULL },
+    NULL
 };
 
 int HOST_INFO::get_virtualbox_version() {
-    char path[MAXPATHLEN];
+    const char** paths;
     char cmd [MAXPATHLEN+35];
     char buf[256];
-	int i = 0;
     FILE* fd;
 
-    do {
-		safe_strcpy(path, vbox_locations[i].dir);
-
-		if (boinc_file_exists(path)) {
-			if (access(path, X_OK)) {
-				return 0;
-			}
-			safe_strcpy(cmd, path);
-			safe_strcat(cmd, " --version");
-			fd = popen(cmd, "r");
-			if (fd) {
-				if (fgets(buf, sizeof(buf), fd)) {
-					strip_whitespace(buf);
-					int n, a,b,c;
-					n = sscanf(buf, "%d.%d.%d", &a, &b, &c);
-					if (n == 3) {
-						strcpy(virtualbox_version, buf);
-					}
-				}
-				pclose(fd);
-			}
-		}
-
-		++i;
-    } while (vbox_locations[i].dir != NULL);
+    for (paths = vbox_locations; *paths != NULL; ++paths) {
+        const char* path = *paths;
+        if (access(path, X_OK)) {
+            continue;
+        }
+        safe_strcpy(cmd, path);
+        safe_strcat(cmd, " --version");
+        fd = popen(cmd, "r");
+        if (fd) {
+            if (fgets(buf, sizeof(buf), fd)) {
+                strip_whitespace(buf);
+                int n, a,b,c;
+                n = sscanf(buf, "%d.%d.%d", &a, &b, &c);
+                if (n == 3) {
+                    safe_strcpy(virtualbox_version, buf);
+                    pclose(fd);
+                    break;
+                }
+            }
+            pclose(fd);
+        }
+    }
 
     return 0;
 }
diff --git a/client/log_flags.cpp b/client/log_flags.cpp
index 7bc128b..16002cb 100644
--- a/client/log_flags.cpp
+++ b/client/log_flags.cpp
@@ -188,9 +188,6 @@ void CC_CONFIG::show() {
     if (dont_check_file_sizes) {
         msg_printf(NULL, MSG_INFO, "Config: don't check file sizes");
     }
-    if (dont_lower_client_priority) {
-        msg_printf(NULL, MSG_INFO, "Config: don't lower client priority");
-    }
     if (dont_suspend_nci) {
         msg_printf(NULL, MSG_INFO, "Config: don't suspend NCI tasks");
     }
@@ -233,6 +230,9 @@ void CC_CONFIG::show() {
     for (int j=1; j<NPROC_TYPES; j++) {
         show_gpu_ignore(ignore_gpu_instance[j], j);
     }
+    if (lower_client_priority) {
+        msg_printf(NULL, MSG_INFO, "Config: lower client priority");
+    }
     if (max_event_log_lines != DEFAULT_MAX_EVENT_LOG_LINES) {
         if (max_event_log_lines) {
             msg_printf(NULL, MSG_INFO,
@@ -349,7 +349,7 @@ int CC_CONFIG::parse_options_client(XML_PARSER& xp) {
         if (xp.parse_bool("disallow_attach", disallow_attach)) continue;
         if (xp.parse_bool("dont_check_file_sizes", dont_check_file_sizes)) continue;
         if (xp.parse_bool("dont_contact_ref_site", dont_contact_ref_site)) continue;
-        if (xp.parse_bool("dont_lower_client_priority", dont_lower_client_priority)) continue;
+        if (xp.parse_bool("lower_client_priority", lower_client_priority)) continue;
         if (xp.parse_bool("dont_suspend_nci", dont_suspend_nci)) continue;
         if (xp.parse_bool("dont_use_vbox", dont_use_vbox)) continue;
         if (xp.match_tag("exclude_gpu")) {
diff --git a/client/result.cpp b/client/result.cpp
index da33b79..2e087d5 100644
--- a/client/result.cpp
+++ b/client/result.cpp
@@ -193,6 +193,8 @@ int RESULT::parse_state(XML_PARSER& xp) {
     return ERR_XML_PARSE;
 }
 
+// write result descriptor to state file, GUI RPC reply, or sched request
+//
 int RESULT::write(MIOFILE& out, bool to_server) {
     unsigned int i;
     FILE_INFO* fip;
@@ -333,6 +335,7 @@ int RESULT::write_gui(MIOFILE& out) {
         "<result>\n"
         "    <name>%s</name>\n"
         "    <wu_name>%s</wu_name>\n"
+        "    <platform>%s</platform>\n"
         "    <version_num>%d</version_num>\n"
         "    <plan_class>%s</plan_class>\n"
         "    <project_url>%s</project_url>\n"
@@ -345,6 +348,7 @@ int RESULT::write_gui(MIOFILE& out) {
         "    <estimated_cpu_time_remaining>%f</estimated_cpu_time_remaining>\n",
         name,
         wu_name,
+        platform,
         version_num,
         plan_class,
         project->master_url,
diff --git a/clientgui/sg_ProjectPanel.cpp b/clientgui/sg_ProjectPanel.cpp
index 41a22fc..602962f 100644
--- a/clientgui/sg_ProjectPanel.cpp
+++ b/clientgui/sg_ProjectPanel.cpp
@@ -29,6 +29,7 @@
 #include "BOINCBaseWizard.h"
 #include "WizardAttach.h"
 #include "sg_ProjectPanel.h"
+#include "str_replace.h"
 #if TESTBIGICONPOPUP
 #include "test/sah_40.xpm"
 #include "test/einstein_icon.xpm"
@@ -250,8 +251,7 @@ void CSimpleProjectPanel::UpdateInterface() {
         char* ctrl_url = ((ProjectSelectionData*)m_ProjectSelectionCtrl->GetClientData(n))->project_url;
         if (strcmp(m_CurrentSelectedProjectURL, ctrl_url)) {
             b_needMenuRebuild = true;
-            strncpy(m_CurrentSelectedProjectURL, ctrl_url, sizeof(m_CurrentSelectedProjectURL));
-            m_CurrentSelectedProjectURL[sizeof(m_CurrentSelectedProjectURL)-1] = '\0';
+            strlcpy(m_CurrentSelectedProjectURL, ctrl_url, sizeof(m_CurrentSelectedProjectURL));
         }
         
         PROJECT* project = pDoc->state.lookup_project(ctrl_url);
@@ -459,8 +459,7 @@ void CSimpleProjectPanel::UpdateProjectList() {
                 }
 #endif
                 selData = new ProjectSelectionData;
-                strncpy(selData->project_url, project->master_url, sizeof(selData->project_url));
-                selData->project_url[sizeof(selData->project_url)-1] = '\0';
+                strlcpy(selData->project_url, project->master_url, sizeof(selData->project_url));
                 selData->project_files_downloaded_time = project->project_files_downloaded_time;
                 wxBitmap* projectBM = GetProjectSpecificBitmap(selData->project_url);
 #if SORTPROJECTLIST
diff --git a/clientgui/sg_TaskPanel.cpp b/clientgui/sg_TaskPanel.cpp
index 86a5fd8..2c8a726 100644
--- a/clientgui/sg_TaskPanel.cpp
+++ b/clientgui/sg_TaskPanel.cpp
@@ -25,6 +25,7 @@
 #include "sg_TaskPanel.h"
 #include "boinc_api.h"
 #include "filesys.h"
+#include "str_replace.h"
 
 
 #define SORTTASKLIST 1  /* TRUE to sort task selection control alphabetically */
@@ -1011,10 +1012,8 @@ void CSimpleTaskPanel::UpdateTaskSelectionList(bool reskin) {
             
             selData = new TaskSelectionData;
             selData->result = result;
-            strncpy(selData->result_name, result->name, sizeof(selData->result_name));
-            selData->result_name[sizeof(selData->result_name)-1] = '\0';
-            strncpy(selData->project_url, result->project_url, sizeof(selData->project_url));
-            selData->project_url[sizeof(selData->project_url)-1] = '\0';
+            strlcpy(selData->result_name, result->name, sizeof(selData->result_name));
+            strlcpy(selData->project_url, result->project_url, sizeof(selData->project_url));
             selData->dotColor = -1;
             FindSlideShowFiles(selData);
             project = pDoc->state.lookup_project(result->project_url);
diff --git a/clientscr/progress/simt b/clientscr/progress/simt
deleted file mode 100644
index 7b68401..0000000
Binary files a/clientscr/progress/simt and /dev/null differ
diff --git a/configure.ac b/configure.ac
index 5a79eac..b79b688 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@ 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.6.17)
+AC_INIT(BOINC, 7.6.19)
 AC_CONFIG_MACRO_DIR([m4])
 LIBBOINC_VERSION=`echo ${PACKAGE_VERSION} | sed 's/\./:/g'`
 AC_SUBST([LIBBOINC_VERSION])
diff --git a/lib/cc_config.cpp b/lib/cc_config.cpp
index 881b962..23f78db 100644
--- a/lib/cc_config.cpp
+++ b/lib/cc_config.cpp
@@ -209,7 +209,7 @@ void CC_CONFIG::defaults() {
     disallow_attach = false;
     dont_check_file_sizes = false;
     dont_contact_ref_site = false;
-    dont_lower_client_priority = false;
+    lower_client_priority = false;
     dont_suspend_nci = false;
     dont_use_vbox = false;
     exclude_gpus.clear();
@@ -343,7 +343,7 @@ int CC_CONFIG::parse_options(XML_PARSER& xp) {
         if (xp.parse_bool("disallow_attach", disallow_attach)) continue;
         if (xp.parse_bool("dont_check_file_sizes", dont_check_file_sizes)) continue;
         if (xp.parse_bool("dont_contact_ref_site", dont_contact_ref_site)) continue;
-        if (xp.parse_bool("dont_lower_client_priority", dont_lower_client_priority)) continue;
+        if (xp.parse_bool("lower_client_priority", lower_client_priority)) continue;
         if (xp.parse_bool("dont_suspend_nci", dont_suspend_nci)) continue;
         if (xp.parse_bool("dont_use_vbox", dont_use_vbox)) continue;
         if (xp.match_tag("exclude_gpu")) {
@@ -550,13 +550,13 @@ int CC_CONFIG::write(MIOFILE& out, LOG_FLAGS& log_flags) {
         "        <disallow_attach>%d</disallow_attach>\n"
         "        <dont_check_file_sizes>%d</dont_check_file_sizes>\n"
         "        <dont_contact_ref_site>%d</dont_contact_ref_site>\n"
-        "        <dont_lower_client_priority>%d</lower_client_priority>\n"
+        "        <lower_client_priority>%d</lower_client_priority>\n"
         "        <dont_suspend_nci>%d</dont_suspend_nci>\n"
         "        <dont_use_vbox>%d</dont_use_vbox>\n",
         disallow_attach,
         dont_check_file_sizes,
         dont_contact_ref_site,
-        dont_lower_client_priority,
+        lower_client_priority,
         dont_suspend_nci,
         dont_use_vbox
     );
diff --git a/lib/cc_config.h b/lib/cc_config.h
index fea507d..29a000f 100644
--- a/lib/cc_config.h
+++ b/lib/cc_config.h
@@ -149,7 +149,6 @@ struct CC_CONFIG {
     bool disallow_attach;
     bool dont_check_file_sizes;
     bool dont_contact_ref_site;
-    bool dont_lower_client_priority;
     bool dont_suspend_nci;
     bool dont_use_vbox;
     std::vector<EXCLUDE_GPU> exclude_gpus;
@@ -165,6 +164,7 @@ struct CC_CONFIG {
     int http_transfer_timeout_bps;
     int http_transfer_timeout;
     std::vector<int> ignore_gpu_instance[NPROC_TYPES];
+    bool lower_client_priority;
     int max_event_log_lines;
     int max_file_xfers;
     int max_file_xfers_per_project;
diff --git a/lib/coproc.cpp b/lib/coproc.cpp
index 2d69abe..239b4a4 100644
--- a/lib/coproc.cpp
+++ b/lib/coproc.cpp
@@ -403,7 +403,7 @@ void COPROC_NVIDIA::clear() {
     prop.textureAlignment = 0;
     prop.deviceOverlap = 0;
     prop.multiProcessorCount = 0;
-    is_used = COPROC_UNUSED;
+    is_used = COPROC_USED;
 }
 
 int COPROC_NVIDIA::parse(XML_PARSER& xp) {
@@ -656,7 +656,7 @@ void COPROC_ATI::clear() {
     memset(&attribs, 0, sizeof(attribs));
     memset(&info, 0, sizeof(info));
     version_num = 0;
-    is_used = COPROC_UNUSED;
+    is_used = COPROC_USED;
 }
 
 int COPROC_ATI::parse(XML_PARSER& xp) {
@@ -845,7 +845,7 @@ void COPROC_INTEL::clear() {
     strcpy(name, "");
     strcpy(version, "");
     global_mem_size = 0;
-    is_used = COPROC_UNUSED;
+    is_used = COPROC_USED;
 }
 
 int COPROC_INTEL::parse(XML_PARSER& xp) {
diff --git a/lib/filesys.cpp b/lib/filesys.cpp
index a16c46a..6535a80 100644
--- a/lib/filesys.cpp
+++ b/lib/filesys.cpp
@@ -505,6 +505,7 @@ FILE* boinc_fopen(const char* path, const char* mode) {
     }
     if (f) {
         if (-1 == fcntl(fileno(f), F_SETFD, FD_CLOEXEC)) {
+            fclose(f);
             return 0;
         }
     }
diff --git a/lib/gui_rpc_client.h b/lib/gui_rpc_client.h
index 2fe1c57..6208f00 100644
--- a/lib/gui_rpc_client.h
+++ b/lib/gui_rpc_client.h
@@ -244,6 +244,7 @@ struct RESULT {
     char name[256];
     char wu_name[256];
     char project_url[256];
+    char platform[256];
     int version_num;
     char plan_class[64];
     double report_deadline;
@@ -396,7 +397,9 @@ struct CC_STATE {
 
     PROJECT* lookup_project(const char* url);
     APP* lookup_app(PROJECT*, const char* name);
-    APP_VERSION* lookup_app_version(PROJECT*, APP*, int, char* plan_class);
+    APP_VERSION* lookup_app_version(PROJECT*, APP*,
+        char* platform, int vnum, char* plan_class
+    );
     APP_VERSION* lookup_app_version_old(PROJECT*, APP*, int);
     WORKUNIT* lookup_wu(PROJECT*, const char* name);
     RESULT* lookup_result(PROJECT*, const char* name);
diff --git a/lib/gui_rpc_client_ops.cpp b/lib/gui_rpc_client_ops.cpp
index 1167d13..bca23d6 100644
--- a/lib/gui_rpc_client_ops.cpp
+++ b/lib/gui_rpc_client_ops.cpp
@@ -639,6 +639,7 @@ int RESULT::parse(XML_PARSER& xp) {
         }
         if (xp.parse_str("name", name, sizeof(name))) continue;
         if (xp.parse_str("wu_name", wu_name, sizeof(wu_name))) continue;
+        if (xp.parse_str("platform", platform, sizeof(platform))) continue;
         if (xp.parse_int("version_num", version_num)) continue;
         if (xp.parse_str("plan_class", plan_class, sizeof(plan_class))) continue;
         if (xp.parse_str("project_url", project_url, sizeof(project_url))) continue;
@@ -974,8 +975,8 @@ int CC_STATE::parse(XML_PARSER& xp) {
             APP_VERSION* avp;
             if (result->version_num) {
                 avp = lookup_app_version(
-                    project, result->app, result->version_num,
-                    result->plan_class
+                    project, result->app,
+                    result->platform, result->version_num, result->plan_class
                 );
             } else {
                 avp = lookup_app_version_old(
@@ -1061,12 +1062,14 @@ APP* CC_STATE::lookup_app(PROJECT* project, const char* name) {
 }
 
 APP_VERSION* CC_STATE::lookup_app_version(
-    PROJECT* project, APP* app, int version_num, char* plan_class
+    PROJECT* project, APP* app,
+    char* platform, int version_num, char* plan_class
 ) {
     unsigned int i;
     for (i=0; i<app_versions.size(); i++) {
         if (app_versions[i]->project != project) continue;
         if (app_versions[i]->app != app) continue;
+        if (strcmp(app_versions[i]->platform, platform)) continue;
         if (app_versions[i]->version_num != version_num) continue;
         if (strcmp(app_versions[i]->plan_class, plan_class)) continue;
         return app_versions[i];
diff --git a/lib/str_util.cpp b/lib/str_util.cpp
index 68c08e9..7d92efd 100644
--- a/lib/str_util.cpp
+++ b/lib/str_util.cpp
@@ -541,6 +541,8 @@ const char* boincerror(int which_error) {
         case ERR_STATFS: return "statfs() failed";
         case ERR_PIPE: return "pipe() failed";
         case ERR_NEED_HTTPS: return "HTTPS needed";
+        case ERR_CHMOD : return "chmod() failed";
+        case ERR_STAT : return "stat() failed";
         case HTTP_STATUS_NOT_FOUND: return "HTTP file not found";
         case HTTP_STATUS_PROXY_AUTH_REQ: return "HTTP proxy authentication failure";
         case HTTP_STATUS_RANGE_REQUEST_ERROR: return "HTTP range request error";
@@ -762,4 +764,4 @@ vector<string> split(string s, char delim) {
         result.push_back(item);
     }
     return result;
-}
\ No newline at end of file
+}
diff --git a/locale/it_IT/BOINC-Manager.po b/locale/it_IT/BOINC-Manager.po
index 58f0cc2..ab21a39 100644
--- a/locale/it_IT/BOINC-Manager.po
+++ b/locale/it_IT/BOINC-Manager.po
@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: BOINC\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-10-16 17:27-0500\n"
-"PO-Revision-Date: 2015-11-20 09:10+0000\n"
+"PO-Revision-Date: 2015-11-27 10:50+0000\n"
 "Last-Translator: Sebastiano Pistore <olatusrooc at virgilio.it>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/boinc/boinc/language/it_IT/)\n"
 "MIME-Version: 1.0\n"
@@ -303,11 +303,11 @@ msgstr "Visualizza utilizzo disco"
 
 #: clientgui/AdvancedFrame.cpp:438
 msgid "Simple &View...\tCtrl+Shift+V"
-msgstr "&Visualizzazione Semplice...\tCtrl+Shift+V"
+msgstr "&Visualizzazione semplice...\tCtrl+Shift+V"
 
 #: clientgui/AdvancedFrame.cpp:439
 msgid "Switch to the Simple View"
-msgstr "Passa alla Vista Semplice"
+msgstr "Passa alla Visualizzazione semplice"
 
 #: clientgui/AdvancedFrame.cpp:453 clientgui/AdvancedFrame.cpp:477
 #: clientgui/sg_BoincSimpleFrame.cpp:205
@@ -348,11 +348,11 @@ msgstr "Rimuovi questo computer dal controllo dell'account manager."
 
 #: clientgui/AdvancedFrame.cpp:493
 msgid "Run CPU &benchmarks"
-msgstr "Esegui i &benchmark per la CPU"
+msgstr "Esegui il &benchmark della CPU"
 
 #: clientgui/AdvancedFrame.cpp:494
 msgid "Run tests that measure CPU speed"
-msgstr "Avvia i test di misurazione della velocità CPU"
+msgstr "Avvia dei test che misurazione la velocità di calcolo della CPU e della GPU"
 
 #: clientgui/AdvancedFrame.cpp:498
 msgid "Retry pending transfers"
@@ -512,7 +512,7 @@ msgstr "Mostra le informazioni su %s"
 #: clientgui/AdvancedFrame.cpp:660
 #, c-format
 msgid "&%s help"
-msgstr "Aiuto sul &%s"
+msgstr "Aiuto su &%s"
 
 #: clientgui/AdvancedFrame.cpp:664 clientgui/sg_BoincSimpleFrame.cpp:237
 #, c-format
@@ -2189,7 +2189,7 @@ msgstr "Non utilizzare il proxy per:"
 
 #: clientgui/DlgOptions.cpp:317 clientgui/DlgOptions.cpp:381
 msgid "Leave these blank if not needed"
-msgstr "Lascia questi spazi vuoti se non necessari"
+msgstr "Lascia questi spazi vuoti se non sono necessari"
 
 #: clientgui/DlgOptions.cpp:323 clientgui/DlgOptions.cpp:387
 #: clientgui/ProxyPage.cpp:343 clientgui/ProxyPage.cpp:363
@@ -2330,7 +2330,7 @@ msgstr "Domande frequenti"
 
 #: clientgui/Localization.cpp:63
 msgid "Read the Einstein at Home Frequently Asked Question list"
-msgstr "Leggi la lista delle domande frequenti di Einstein at Home"
+msgstr "Leggi la lista delle domande frequenti su Einstein at Home"
 
 #: clientgui/Localization.cpp:65
 msgid "Screensaver info"
@@ -2338,7 +2338,7 @@ msgstr "Informazioni sullo screensaver"
 
 #: clientgui/Localization.cpp:67
 msgid "Read a detailed description of the Einstein at Home screensaver"
-msgstr "Leggi una descrizione dettagliata dello sreensaver di Einstein at Home"
+msgstr "Una descrizione dettagliata dello screensaver di Einstein at Home"
 
 #: clientgui/Localization.cpp:71
 msgid ""
@@ -2355,7 +2355,7 @@ msgstr "Stato attuale del server di Einstein at Home"
 
 #: clientgui/Localization.cpp:77
 msgid "Report problems"
-msgstr "Riporta i problemi"
+msgstr "Segnala i problemi"
 
 #: clientgui/Localization.cpp:79
 msgid "A link to the Einstein at Home problems and bug reports message board"
@@ -2403,7 +2403,7 @@ msgstr "Informazioni sul tuo Team"
 
 #: clientgui/Localization.cpp:123
 msgid "Get help for climateprediction.net"
-msgstr "Ricevi aiuto per climateprediction.net"
+msgstr "Assistenza su climateprediction.net"
 
 #: clientgui/Localization.cpp:125
 msgid "News"
@@ -2415,7 +2415,7 @@ msgstr "Notizie su climateprediction.net"
 
 #: clientgui/Localization.cpp:131
 msgid "View your account information, credits, and trickles"
-msgstr "Visualizza le informazioni sul tuo account, i crediti ed il lavoro effettuato"
+msgstr "Visualizza le informazioni sul tuo account, i crediti e le elaborazioni effettuate"
 
 #: clientgui/Localization.cpp:135
 msgid "Info about your team"
@@ -2439,7 +2439,7 @@ msgstr "My Grid"
 
 #: clientgui/Localization.cpp:149
 msgid "Your statistics and settings"
-msgstr "Le tue statistiche e le tue impostazioni"
+msgstr "Le tue statistiche ed impostazioni"
 
 #: clientgui/Localization.cpp:151
 msgid "Device Profiles"
@@ -2497,11 +2497,11 @@ msgstr "limiti di orario"
 
 #: clientgui/MainDocument.cpp:2447
 msgid "CPU benchmarks in progress"
-msgstr "benchmark della CPU in corso"
+msgstr "Benchmark della CPU in corso"
 
 #: clientgui/MainDocument.cpp:2448
 msgid "need disk space - check preferences"
-msgstr "E' necessario spazio su disco - controlla le preferenze"
+msgstr "È necessario più spazio su disco, controlla le preferenze"
 
 #: clientgui/MainDocument.cpp:2449
 msgid "computer is not in use"
@@ -2549,7 +2549,7 @@ msgstr "Scaricamento in corso"
 
 #: clientgui/MainDocument.cpp:2493 clientgui/MainDocument.cpp:2552
 msgid " (suspended - "
-msgstr "(sospesa-"
+msgstr "(sospesa - "
 
 #: clientgui/MainDocument.cpp:2501
 msgid "Project suspended by user"
@@ -2563,7 +2563,7 @@ msgstr "Elaborazione sospesa dall'utente"
 #. (because of <dont_suspend_nci>
 #: clientgui/MainDocument.cpp:2508
 msgid "Suspended - "
-msgstr "Sospesa -"
+msgstr "Sospesa - "
 
 #: clientgui/MainDocument.cpp:2511
 msgid "GPU suspended - "
@@ -2571,7 +2571,7 @@ msgstr "GPU sospesa - "
 
 #: clientgui/MainDocument.cpp:2515
 msgid "Waiting for memory"
-msgstr "In attesa di memoria"
+msgstr "In attesa di più memoria libera"
 
 #: clientgui/MainDocument.cpp:2517
 msgid "Waiting for shared memory"
diff --git a/locale/it_IT/BOINC-Project-Generic.po b/locale/it_IT/BOINC-Project-Generic.po
index bf52574..8af72f7 100644
--- a/locale/it_IT/BOINC-Project-Generic.po
+++ b/locale/it_IT/BOINC-Project-Generic.po
@@ -14,7 +14,7 @@ msgstr ""
 "Project-Id-Version: BOINC\n"
 "Report-Msgid-Bugs-To: BOINC translation team <boinc_loc at boinc.berkeley.edu>\n"
 "POT-Creation-Date: 2015-06-24 13:05 PDT\n"
-"PO-Revision-Date: 2015-11-18 13:06+0000\n"
+"PO-Revision-Date: 2015-11-27 10:50+0000\n"
 "Last-Translator: Sebastiano Pistore <olatusrooc at virgilio.it>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/boinc/boinc/language/it_IT/)\n"
 "MIME-Version: 1.0\n"
diff --git a/locale/nl/BOINC-Project-Generic.po b/locale/nl/BOINC-Project-Generic.po
index a9c6362..4545c0e 100644
--- a/locale/nl/BOINC-Project-Generic.po
+++ b/locale/nl/BOINC-Project-Generic.po
@@ -14,7 +14,7 @@ msgstr ""
 "Project-Id-Version: BOINC\n"
 "Report-Msgid-Bugs-To: BOINC translation team <boinc_loc at boinc.berkeley.edu>\n"
 "POT-Creation-Date: 2015-06-24 13:05 PDT\n"
-"PO-Revision-Date: 2015-11-19 08:59+0000\n"
+"PO-Revision-Date: 2015-11-20 18:32+0000\n"
 "Last-Translator: Jord <elst93 at gmail.com>\n"
 "Language-Team: Dutch (http://www.transifex.com/boinc/boinc/language/nl/)\n"
 "MIME-Version: 1.0\n"
diff --git a/locale/sk/BOINC-Manager.po b/locale/sk/BOINC-Manager.po
index 9c952c0..813d664 100644
--- a/locale/sk/BOINC-Manager.po
+++ b/locale/sk/BOINC-Manager.po
@@ -9,10 +9,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: BOINC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-06-24 16:15-0500\n"
-"PO-Revision-Date: 2015-07-11 20:25+0000\n"
+"POT-Creation-Date: 2015-10-16 17:27-0500\n"
+"PO-Revision-Date: 2015-11-30 23:20+0000\n"
 "Last-Translator: aceman\n"
-"Language-Team: Slovak (http://www.transifex.com/p/boinc/language/sk/)\n"
+"Language-Team: Slovak (http://www.transifex.com/boinc/boinc/language/sk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -206,369 +206,369 @@ msgstr "Pripojené"
 msgid "Disconnected"
 msgstr "Odpojené"
 
-#: clientgui/AdvancedFrame.cpp:327
+#: clientgui/AdvancedFrame.cpp:329
 #, c-format
 msgid "New %s window..."
 msgstr "Nové okno %s..."
 
-#: clientgui/AdvancedFrame.cpp:331
+#: clientgui/AdvancedFrame.cpp:333
 #, c-format
 msgid "Open another %s window"
 msgstr "Otvoriť ďalšie okno %s"
 
-#: clientgui/AdvancedFrame.cpp:342
+#: clientgui/AdvancedFrame.cpp:344
 msgid "Select computer..."
 msgstr "Vybrať počítač..."
 
-#: clientgui/AdvancedFrame.cpp:343
+#: clientgui/AdvancedFrame.cpp:345
 msgid "Connect to a BOINC client on another computer"
 msgstr "Pripojiť k BOINC klientovi na inom počítači"
 
-#: clientgui/AdvancedFrame.cpp:347
+#: clientgui/AdvancedFrame.cpp:349
 msgid "Shut down connected client..."
 msgstr "Vypnúť pripojeného klienta..."
 
-#: clientgui/AdvancedFrame.cpp:348
+#: clientgui/AdvancedFrame.cpp:350
 msgid "Shut down the currently connected BOINC client"
 msgstr "Vypnúť aktuálne pripojeného klienta BOINC"
 
-#: clientgui/AdvancedFrame.cpp:353 clientgui/sg_BoincSimpleFrame.cpp:120
+#: clientgui/AdvancedFrame.cpp:355 clientgui/sg_BoincSimpleFrame.cpp:120
 #, c-format
 msgid "Close the %s window"
 msgstr "Zavrieť okno %s"
 
-#: clientgui/AdvancedFrame.cpp:356 clientgui/sg_BoincSimpleFrame.cpp:123
+#: clientgui/AdvancedFrame.cpp:358 clientgui/sg_BoincSimpleFrame.cpp:123
 msgid "&Close window"
 msgstr "&Zavrieť okno"
 
-#: clientgui/AdvancedFrame.cpp:365 clientgui/AdvancedFrame.cpp:370
-#: clientgui/AdvancedFrame.cpp:375 clientgui/sg_BoincSimpleFrame.cpp:132
+#: clientgui/AdvancedFrame.cpp:367 clientgui/AdvancedFrame.cpp:372
+#: clientgui/AdvancedFrame.cpp:377 clientgui/sg_BoincSimpleFrame.cpp:132
 #: clientgui/sg_BoincSimpleFrame.cpp:137
 #, c-format
 msgid "Exit %s"
 msgstr "Ukončiť %s"
 
-#: clientgui/AdvancedFrame.cpp:389 clientgui/sg_BoincSimpleFrame.cpp:151
+#: clientgui/AdvancedFrame.cpp:391 clientgui/sg_BoincSimpleFrame.cpp:151
 msgid "Preferences..."
 msgstr "Preferencie..."
 
-#: clientgui/AdvancedFrame.cpp:398
+#: clientgui/AdvancedFrame.cpp:400
 msgid "&Notices\tCtrl+Shift+N"
 msgstr "&Oznamy\tCtrl+Shift+N"
 
-#: clientgui/AdvancedFrame.cpp:399
+#: clientgui/AdvancedFrame.cpp:401
 msgid "Show notices"
 msgstr "Zobraziť oznamy"
 
-#: clientgui/AdvancedFrame.cpp:404
+#: clientgui/AdvancedFrame.cpp:406
 msgid "&Projects\tCtrl+Shift+P"
 msgstr "&Projekty\t Ctrl+Shift+P"
 
-#: clientgui/AdvancedFrame.cpp:405
+#: clientgui/AdvancedFrame.cpp:407
 msgid "Show projects"
 msgstr "Zobraziť projekty"
 
-#: clientgui/AdvancedFrame.cpp:410
+#: clientgui/AdvancedFrame.cpp:412
 msgid "&Tasks\tCtrl+Shift+T"
 msgstr "Ú&lohy\t Ctrl+Shift+T"
 
-#: clientgui/AdvancedFrame.cpp:411
+#: clientgui/AdvancedFrame.cpp:413
 msgid "Show tasks"
 msgstr "Zobraziť úlohy"
 
-#: clientgui/AdvancedFrame.cpp:416
+#: clientgui/AdvancedFrame.cpp:418
 msgid "Trans&fers\tCtrl+Shift+X"
 msgstr "P&renosy\tCtrl+Shift+X"
 
-#: clientgui/AdvancedFrame.cpp:417
+#: clientgui/AdvancedFrame.cpp:419
 msgid "Show file transfers"
 msgstr "Zobraziť prenosy"
 
-#: clientgui/AdvancedFrame.cpp:422
+#: clientgui/AdvancedFrame.cpp:424
 msgid "&Statistics\tCtrl+Shift+S"
 msgstr "Š&tatistiky\t Ctrl+Shift+S"
 
-#: clientgui/AdvancedFrame.cpp:423
+#: clientgui/AdvancedFrame.cpp:425
 msgid "Show statistics"
 msgstr "Zobraziť štatistiky"
 
-#: clientgui/AdvancedFrame.cpp:428
+#: clientgui/AdvancedFrame.cpp:430
 msgid "&Disk\tCtrl+Shift+D"
 msgstr "&Disk\tCtrl+Shift+D"
 
-#: clientgui/AdvancedFrame.cpp:429
+#: clientgui/AdvancedFrame.cpp:431
 msgid "Show disk usage"
 msgstr "Zobraziť využitie disku"
 
-#: clientgui/AdvancedFrame.cpp:436
+#: clientgui/AdvancedFrame.cpp:438
 msgid "Simple &View...\tCtrl+Shift+V"
 msgstr "Jednoduché &zobrazenie...\t Ctrl+Shift+V"
 
-#: clientgui/AdvancedFrame.cpp:437
+#: clientgui/AdvancedFrame.cpp:439
 msgid "Switch to the Simple View"
 msgstr "Prepnúť na zjednodušený vzhľad"
 
-#: clientgui/AdvancedFrame.cpp:451 clientgui/AdvancedFrame.cpp:475
+#: clientgui/AdvancedFrame.cpp:453 clientgui/AdvancedFrame.cpp:477
 #: clientgui/sg_BoincSimpleFrame.cpp:205
 msgid "&Add project..."
 msgstr "P&ripojiť k projektu..."
 
-#: clientgui/AdvancedFrame.cpp:452 clientgui/AdvancedFrame.cpp:476
+#: clientgui/AdvancedFrame.cpp:454 clientgui/AdvancedFrame.cpp:478
 #: clientgui/sg_BoincSimpleFrame.cpp:206
 msgid "Add a project"
 msgstr "Pripojiť k projektu"
 
-#: clientgui/AdvancedFrame.cpp:456
+#: clientgui/AdvancedFrame.cpp:458
 msgid "&Use account manager..."
 msgstr "Po&užiť správcu konta..."
 
-#: clientgui/AdvancedFrame.cpp:457
+#: clientgui/AdvancedFrame.cpp:459
 msgid "Use an account manager to control this computer."
 msgstr "Použiť správcu konta, ktorý bude ovládať tento počítač."
 
-#: clientgui/AdvancedFrame.cpp:461
+#: clientgui/AdvancedFrame.cpp:463
 #, c-format
 msgid "&Synchronize with %s"
 msgstr "&Synchronizovať s %s"
 
-#: clientgui/AdvancedFrame.cpp:465
+#: clientgui/AdvancedFrame.cpp:467
 #, c-format
 msgid "Get current settings from %s"
 msgstr "Získať aktuálne nastavenia z %s"
 
-#: clientgui/AdvancedFrame.cpp:479
+#: clientgui/AdvancedFrame.cpp:481
 #, c-format
 msgid "S&top using %s..."
 msgstr "&Ukončiť používanie %s..."
 
-#: clientgui/AdvancedFrame.cpp:485
+#: clientgui/AdvancedFrame.cpp:487
 msgid "Remove this computer from account manager control."
 msgstr "Odstrániť počítač z ovládania Správcom konta."
 
-#: clientgui/AdvancedFrame.cpp:491
+#: clientgui/AdvancedFrame.cpp:493
 msgid "Run CPU &benchmarks"
 msgstr "Spustiť &testy CPU"
 
-#: clientgui/AdvancedFrame.cpp:492
+#: clientgui/AdvancedFrame.cpp:494
 msgid "Run tests that measure CPU speed"
 msgstr "Spustiť testy na zmeranie rýchlosti CPU"
 
-#: clientgui/AdvancedFrame.cpp:496
+#: clientgui/AdvancedFrame.cpp:498
 msgid "Retry pending transfers"
 msgstr "Zopakovať čakajúce prenosy"
 
-#: clientgui/AdvancedFrame.cpp:497
+#: clientgui/AdvancedFrame.cpp:499
 msgid "Retry deferred file transfers and task requests"
 msgstr "Zopakovať odložené prenosy súborov a požiadavky na úlohy."
 
-#: clientgui/AdvancedFrame.cpp:502 clientgui/sg_BoincSimpleFrame.cpp:211
+#: clientgui/AdvancedFrame.cpp:504 clientgui/sg_BoincSimpleFrame.cpp:211
 msgid "Event Log...\tCtrl+Shift+E"
 msgstr "Záznam udalostí...\tCtrl+Shift+E"
 
-#: clientgui/AdvancedFrame.cpp:503
+#: clientgui/AdvancedFrame.cpp:505
 msgid "Show diagnostic messages"
 msgstr "Zobraziť diagnostické správy."
 
-#: clientgui/AdvancedFrame.cpp:511
+#: clientgui/AdvancedFrame.cpp:513
 msgid "&Run always"
 msgstr "&Počítať stále"
 
-#: clientgui/AdvancedFrame.cpp:512
+#: clientgui/AdvancedFrame.cpp:514
 msgid "Allow work regardless of preferences"
 msgstr "Povoliť prácu bez ohľadu na preferencie"
 
-#: clientgui/AdvancedFrame.cpp:516
+#: clientgui/AdvancedFrame.cpp:518
 msgid "Run based on &preferences"
 msgstr "P&očítať podľa preferencií"
 
-#: clientgui/AdvancedFrame.cpp:517
+#: clientgui/AdvancedFrame.cpp:519
 msgid "Allow work according to preferences"
 msgstr "Povoliť prácu podľa preferencií"
 
-#: clientgui/AdvancedFrame.cpp:521
+#: clientgui/AdvancedFrame.cpp:523
 msgid "&Suspend"
 msgstr "Po&zastaviť"
 
-#: clientgui/AdvancedFrame.cpp:522
+#: clientgui/AdvancedFrame.cpp:524
 msgid "Stop work regardless of preferences"
 msgstr "Zastaví prácu bez ohľadu na preferencie"
 
-#: clientgui/AdvancedFrame.cpp:547
+#: clientgui/AdvancedFrame.cpp:549
 msgid "Use GPU always"
 msgstr "Vždy používať GPU"
 
-#: clientgui/AdvancedFrame.cpp:548
+#: clientgui/AdvancedFrame.cpp:550
 msgid "Allow GPU work regardless of preferences"
 msgstr "Povoliť prácu na GPU bez ohľadu na preferencie"
 
-#: clientgui/AdvancedFrame.cpp:552
+#: clientgui/AdvancedFrame.cpp:554
 msgid "Use GPU based on preferences"
 msgstr "Počítať na GPU podľa preferencií"
 
-#: clientgui/AdvancedFrame.cpp:553
+#: clientgui/AdvancedFrame.cpp:555
 msgid "Allow GPU work according to preferences"
 msgstr "Povoliť prácu na GPU podľa Vašich preferencií"
 
-#: clientgui/AdvancedFrame.cpp:557
+#: clientgui/AdvancedFrame.cpp:559
 msgid "Suspend GPU"
 msgstr "Pozastaviť GPU"
 
-#: clientgui/AdvancedFrame.cpp:558
+#: clientgui/AdvancedFrame.cpp:560
 msgid "Stop GPU work regardless of preferences"
 msgstr "Zastaviť prácu na GPU bez ohľadu na preferencie"
 
-#: clientgui/AdvancedFrame.cpp:582
+#: clientgui/AdvancedFrame.cpp:584
 msgid "Network activity always"
 msgstr "Sieťová aktivita vždy"
 
-#: clientgui/AdvancedFrame.cpp:583
+#: clientgui/AdvancedFrame.cpp:585
 msgid "Allow network activity regardless of preferences"
 msgstr "Povoliť sieťové aktivity bez ohľadu na preferencie"
 
-#: clientgui/AdvancedFrame.cpp:587
+#: clientgui/AdvancedFrame.cpp:589
 msgid "Network activity based on preferences"
 msgstr "Sieťové aktivity podľa preferencií"
 
-#: clientgui/AdvancedFrame.cpp:588
+#: clientgui/AdvancedFrame.cpp:590
 msgid "Allow network activity according to preferences"
 msgstr "Povoliť sieťové aktivity v súlade s Vašimi preferenciami"
 
-#: clientgui/AdvancedFrame.cpp:592
+#: clientgui/AdvancedFrame.cpp:594
 msgid "Suspend network activity"
 msgstr "Pozastaviť sieťovú aktivitu"
 
-#: clientgui/AdvancedFrame.cpp:593
+#: clientgui/AdvancedFrame.cpp:595
 msgid "Stop network activity"
 msgstr "Zastaviť sieťovú aktivitu"
 
-#: clientgui/AdvancedFrame.cpp:602 clientgui/sg_BoincSimpleFrame.cpp:191
+#: clientgui/AdvancedFrame.cpp:604 clientgui/sg_BoincSimpleFrame.cpp:191
 msgid "Computing &preferences..."
 msgstr "&Preferencie počítania..."
 
-#: clientgui/AdvancedFrame.cpp:603 clientgui/sg_BoincSimpleFrame.cpp:192
+#: clientgui/AdvancedFrame.cpp:605 clientgui/sg_BoincSimpleFrame.cpp:192
 msgid "Configure computing preferences"
 msgstr "Konfigurovať preferencie počítania"
 
-#: clientgui/AdvancedFrame.cpp:608
+#: clientgui/AdvancedFrame.cpp:610
 msgid "Exclusive applications..."
 msgstr "Výhradné aplikácie..."
 
-#: clientgui/AdvancedFrame.cpp:609
+#: clientgui/AdvancedFrame.cpp:611
 msgid "Configure exclusive applications"
 msgstr "Nastaviť výhradné aplikácie"
 
-#: clientgui/AdvancedFrame.cpp:614
+#: clientgui/AdvancedFrame.cpp:616
 msgid "Select columns..."
 msgstr "Vybrať stĺpce..."
 
-#: clientgui/AdvancedFrame.cpp:615
+#: clientgui/AdvancedFrame.cpp:617
 msgid "Select which columns to display"
 msgstr "Vybrať stĺpce na zobrazenie"
 
-#: clientgui/AdvancedFrame.cpp:619
+#: clientgui/AdvancedFrame.cpp:621
 msgid "Event Log options...\tCtrl+Shift+F"
 msgstr "Nastavenia záznamu udalostí...⇥Ctrl+Shift+F"
 
-#: clientgui/AdvancedFrame.cpp:620
+#: clientgui/AdvancedFrame.cpp:622
 msgid "Enable or disable various diagnostic messages"
 msgstr "Povoliť alebo zakázať rôzne diagnostické správy"
 
-#: clientgui/AdvancedFrame.cpp:624 clientgui/sg_BoincSimpleFrame.cpp:197
+#: clientgui/AdvancedFrame.cpp:626 clientgui/sg_BoincSimpleFrame.cpp:197
 msgid "&Other options..."
 msgstr "&Ďalšie nastavenia..."
 
-#: clientgui/AdvancedFrame.cpp:625
+#: clientgui/AdvancedFrame.cpp:627
 msgid "Configure display options and network settings"
 msgstr "Nastaviť obrazovku a sieť"
 
-#: clientgui/AdvancedFrame.cpp:630
+#: clientgui/AdvancedFrame.cpp:632
 msgid "Read config files"
 msgstr "Načítať konfiguračné súbory"
 
-#: clientgui/AdvancedFrame.cpp:631
+#: clientgui/AdvancedFrame.cpp:633
 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:635
+#: clientgui/AdvancedFrame.cpp:637
 msgid "Read local prefs file"
 msgstr "Načítať súbor lokálnych preferencií"
 
-#: clientgui/AdvancedFrame.cpp:636
+#: clientgui/AdvancedFrame.cpp:638
 msgid "Read preferences from global_prefs_override.xml."
 msgstr "Načítať preferencie z global_prefs_override.xml."
 
-#: clientgui/AdvancedFrame.cpp:644 clientgui/sg_BoincSimpleFrame.cpp:219
+#: clientgui/AdvancedFrame.cpp:646 clientgui/sg_BoincSimpleFrame.cpp:219
 #, c-format
 msgid "%s &help"
 msgstr "P&omoc s %s"
 
-#: clientgui/AdvancedFrame.cpp:648 clientgui/sg_BoincSimpleFrame.cpp:223
+#: clientgui/AdvancedFrame.cpp:650 clientgui/sg_BoincSimpleFrame.cpp:223
 #, c-format
 msgid "Show information about %s"
 msgstr "Zobraziť informácie o %s"
 
-#: clientgui/AdvancedFrame.cpp:658
+#: clientgui/AdvancedFrame.cpp:660
 #, c-format
 msgid "&%s help"
 msgstr "Pomoc s &%s"
 
-#: clientgui/AdvancedFrame.cpp:662 clientgui/sg_BoincSimpleFrame.cpp:237
+#: clientgui/AdvancedFrame.cpp:664 clientgui/sg_BoincSimpleFrame.cpp:237
 #, c-format
 msgid "Show information about the %s"
 msgstr "Zobraziť informácie o %s"
 
-#: clientgui/AdvancedFrame.cpp:673 clientgui/sg_BoincSimpleFrame.cpp:247
+#: clientgui/AdvancedFrame.cpp:675 clientgui/sg_BoincSimpleFrame.cpp:247
 #, c-format
 msgid "%s &web site"
 msgstr "&Webstránka %s"
 
-#: clientgui/AdvancedFrame.cpp:677 clientgui/sg_BoincSimpleFrame.cpp:251
+#: clientgui/AdvancedFrame.cpp:679 clientgui/sg_BoincSimpleFrame.cpp:251
 #, c-format
 msgid "Show information about BOINC and %s"
 msgstr "Zobraziť informácie o BOINC a %s"
 
-#: clientgui/AdvancedFrame.cpp:688 clientgui/BOINCTaskBar.cpp:541
+#: clientgui/AdvancedFrame.cpp:690 clientgui/BOINCTaskBar.cpp:541
 #: clientgui/sg_BoincSimpleFrame.cpp:262
 #, c-format
 msgid "&About %s..."
 msgstr "&O %s..."
 
-#: clientgui/AdvancedFrame.cpp:694 clientgui/sg_BoincSimpleFrame.cpp:268
+#: clientgui/AdvancedFrame.cpp:696 clientgui/sg_BoincSimpleFrame.cpp:268
 msgid "Licensing and copyright information."
 msgstr "Informácie o licencovaní a autorských právach."
 
-#: clientgui/AdvancedFrame.cpp:701 clientgui/sg_BoincSimpleFrame.cpp:275
+#: clientgui/AdvancedFrame.cpp:703 clientgui/sg_BoincSimpleFrame.cpp:275
 msgid "&File"
 msgstr "&Súbor"
 
-#: clientgui/AdvancedFrame.cpp:705 clientgui/sg_BoincSimpleFrame.cpp:279
+#: clientgui/AdvancedFrame.cpp:707 clientgui/sg_BoincSimpleFrame.cpp:279
 msgid "&View"
 msgstr "&Náhľad"
 
-#: clientgui/AdvancedFrame.cpp:709
+#: clientgui/AdvancedFrame.cpp:711
 msgid "&Activity"
 msgstr "&Aktivity"
 
-#: clientgui/AdvancedFrame.cpp:713 clientgui/sg_BoincSimpleFrame.cpp:283
+#: clientgui/AdvancedFrame.cpp:715 clientgui/sg_BoincSimpleFrame.cpp:283
 msgid "&Options"
 msgstr "&Nastavenia"
 
-#: clientgui/AdvancedFrame.cpp:717 clientgui/sg_BoincSimpleFrame.cpp:287
+#: clientgui/AdvancedFrame.cpp:719 clientgui/sg_BoincSimpleFrame.cpp:287
 msgid "&Tools"
 msgstr "&Nástroje"
 
-#: clientgui/AdvancedFrame.cpp:721 clientgui/sg_BoincSimpleFrame.cpp:291
+#: clientgui/AdvancedFrame.cpp:723 clientgui/sg_BoincSimpleFrame.cpp:291
 #: clientgui/wizardex.cpp:374 clientgui/wizardex.cpp:381
 msgid "&Help"
 msgstr "&Pomoc"
 
-#: clientgui/AdvancedFrame.cpp:1235
+#: clientgui/AdvancedFrame.cpp:1237
 #, c-format
 msgid "%s - Stop using %s"
 msgstr "%s - Ukončiť používanie %s"
 
-#: clientgui/AdvancedFrame.cpp:1240
+#: clientgui/AdvancedFrame.cpp:1242
 #, c-format
 msgid ""
 "If you stop using %s,\n"
@@ -578,39 +578,39 @@ msgid ""
 "Do you want to stop using %s?"
 msgstr "Ak prestanete používať %s,\nvšetky Vaše aktuálne projekty zostanú zachované,\nale budete ich musieť spravovať manuálne.\n\nChcete zastaviť používanie %s?"
 
-#: clientgui/AdvancedFrame.cpp:1469
+#: clientgui/AdvancedFrame.cpp:1471
 #, c-format
 msgid "%s - Shut down the current client..."
 msgstr "%s - Vypnúť aktuálneho klienta..."
 
-#: clientgui/AdvancedFrame.cpp:1478
+#: clientgui/AdvancedFrame.cpp:1480
 #, c-format
 msgid ""
 "%s will shut down the current client\n"
 "and prompt you for another host to connect to."
 msgstr "%s vypne aktuálne pripojeného klienta\na vyzve Vás na pripojenie na iný počítač."
 
-#: clientgui/AdvancedFrame.cpp:1881 clientgui/DlgAbout.cpp:119
+#: clientgui/AdvancedFrame.cpp:1883 clientgui/DlgAbout.cpp:119
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: clientgui/AdvancedFrame.cpp:1890
+#: clientgui/AdvancedFrame.cpp:1892
 #, c-format
 msgid "%s has successfully added %s"
 msgstr "%s bol úspešne pripojený k %s"
 
-#: clientgui/AdvancedFrame.cpp:2026
+#: clientgui/AdvancedFrame.cpp:2028
 #, c-format
 msgid "%s - (%s)"
 msgstr "%s - (%s)"
 
-#: clientgui/AdvancedFrame.cpp:2030
+#: clientgui/AdvancedFrame.cpp:2032
 #, c-format
 msgid "Connecting to %s"
 msgstr "Pripájanie k %s"
 
-#: clientgui/AdvancedFrame.cpp:2033
+#: clientgui/AdvancedFrame.cpp:2035
 #, c-format
 msgid "Connected to %s (%s)"
 msgstr "Pripojené k %s (%s)"
@@ -658,9 +658,9 @@ msgstr "&Ukončiť %s"
 msgid "%s - Communication"
 msgstr "%s - Komunikácia"
 
-#: clientgui/AsyncRPC.cpp:1056 clientgui/DlgAdvPreferencesBase.cpp:176
+#: clientgui/AsyncRPC.cpp:1056 clientgui/DlgAdvPreferencesBase.cpp:168
 #: clientgui/DlgDiagnosticLogFlags.cpp:127 clientgui/DlgExclusiveApps.cpp:152
-#: clientgui/DlgHiddenColumns.cpp:108 clientgui/sg_DlgPreferences.cpp:355
+#: clientgui/DlgHiddenColumns.cpp:108 clientgui/sg_DlgPreferences.cpp:357
 msgid "Cancel"
 msgstr "Späť"
 
@@ -738,12 +738,12 @@ msgstr "%s nie je momentálne pripojený k %s clientovi.\nProsím použite 'Súb
 msgid "Project web pages"
 msgstr "Webstránky projektu"
 
-#: clientgui/BOINCClientManager.cpp:573
+#: clientgui/BOINCClientManager.cpp:547
 #, c-format
 msgid "%s - Unexpected Exit"
 msgstr "%s - Nečakané ukončenie"
 
-#: clientgui/BOINCClientManager.cpp:583
+#: clientgui/BOINCClientManager.cpp:557
 #, c-format
 msgid ""
 "The %s client has exited unexpectedly 3 times within the last %d minutes.\n"
@@ -794,7 +794,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:351
+#: clientgui/BOINCGUIApp.cpp:356
 #, c-format
 msgid ""
 "You currently are not authorized to manage the client.\n"
@@ -807,90 +807,94 @@ msgid ""
 "     user group."
 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:357
+#: clientgui/BOINCGUIApp.cpp:362
 #, 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"
 
-#: clientgui/BOINCGUIApp.cpp:363
+#: clientgui/BOINCGUIApp.cpp:368
 msgid " at "
 msgstr " na "
 
-#: clientgui/BOINCGUIApp.cpp:366 clientgui/MainDocument.cpp:2494
-#: clientgui/MainDocument.cpp:2553 clientgui/ViewTransfers.cpp:887
+#: clientgui/BOINCGUIApp.cpp:371 clientgui/MainDocument.cpp:2495
+#: clientgui/MainDocument.cpp:2554 clientgui/ViewTransfers.cpp:867
 msgid ")"
 msgstr ")"
 
-#: clientgui/BOINCGUIApp.cpp:396
+#: clientgui/BOINCGUIApp.cpp:401
 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.\nProsím reštartujte počítač a pokus opakujte."
 
-#: clientgui/BOINCGUIApp.cpp:397 clientgui/DlgAbout.cpp:153
+#: clientgui/BOINCGUIApp.cpp:402 clientgui/DlgAbout.cpp:153
 msgid "BOINC Manager"
 msgstr "Správca BOINC"
 
-#: clientgui/BOINCGUIApp.cpp:658
+#: clientgui/BOINCGUIApp.cpp:664
 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:660
+#: clientgui/BOINCGUIApp.cpp:666
 msgid "Startup BOINC so only the system tray icon is visible"
 msgstr "Spustiť BOINC len s ikonou na paneli úloh"
 
-#: clientgui/BOINCGUIApp.cpp:662
+#: clientgui/BOINCGUIApp.cpp:668
 msgid "Directory containing the BOINC Client executable"
 msgstr "Priečinok obsahujúci program BOINC klient"
 
-#: clientgui/BOINCGUIApp.cpp:663
+#: clientgui/BOINCGUIApp.cpp:669
 msgid "BOINC data directory"
 msgstr "Priečinok pre pracovné dáta BOINC"
 
-#: clientgui/BOINCGUIApp.cpp:665
+#: clientgui/BOINCGUIApp.cpp:671
 msgid "Host name or IP address"
 msgstr "Názov alebo IP adresa servera"
 
-#: clientgui/BOINCGUIApp.cpp:666
+#: clientgui/BOINCGUIApp.cpp:672
 msgid "GUI RPC port number"
 msgstr "Číslo portu pre RPC grafického prostredia"
 
-#: clientgui/BOINCGUIApp.cpp:667
+#: clientgui/BOINCGUIApp.cpp:673
 msgid "Password"
 msgstr "Heslo"
 
-#: clientgui/BOINCGUIApp.cpp:668
+#: clientgui/BOINCGUIApp.cpp:674
 msgid "Startup BOINC with these optional arguments"
 msgstr "Spustiť BOINC s týmito voliteľnými argumentmi"
 
-#: clientgui/BOINCGUIApp.cpp:669
+#: clientgui/BOINCGUIApp.cpp:675
 msgid "disable BOINC security users and permissions"
 msgstr "zablokovať BOINC bezpečnosť používateľov a oprávnení"
 
-#: clientgui/BOINCGUIApp.cpp:670
+#: clientgui/BOINCGUIApp.cpp:676
 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:671
+#: clientgui/BOINCGUIApp.cpp:677
 msgid "multiple instances of BOINC Manager allowed"
 msgstr "viacnásobné spustenie Správcu BOINC je povolené"
 
-#: clientgui/BOINCGUIApp.cpp:673
+#: clientgui/BOINCGUIApp.cpp:679
 msgid "Not used: workaround for bug in XCode 4.2"
 msgstr "Nepoužívané: obchádzka chyby v XCode 4.2"
 
+#: clientgui/BOINCGUIApp.cpp:681
+msgid "Not run the daemon"
+msgstr "Nespúšťať program na pozadí"
+
 #. These are just special tags so deal with them in a special way
-#: clientgui/BOINCGUIApp.cpp:920
+#: clientgui/BOINCGUIApp.cpp:931
 msgid "(Automatic Detection)"
 msgstr "(Automatická detekcia)"
 
-#: clientgui/BOINCGUIApp.cpp:921
+#: clientgui/BOINCGUIApp.cpp:932
 msgid "(Unknown)"
 msgstr "(Neznáme)"
 
-#: clientgui/BOINCGUIApp.cpp:922
+#: clientgui/BOINCGUIApp.cpp:933
 msgid "(User Defined)"
 msgstr "(Používateľom definované)"
 
@@ -918,7 +922,7 @@ msgstr "Uspať GPU"
 msgid "E&xit"
 msgstr "&Ukončiť"
 
-#: clientgui/BOINCTaskBar.cpp:626 clientgui/ViewProjects.cpp:806
+#: clientgui/BOINCTaskBar.cpp:626 clientgui/ViewProjects.cpp:804
 #: clientgui/ViewWork.cpp:882 clientgui/sg_BoincSimpleFrame.cpp:894
 #: clientgui/sg_ProjectCommandPopup.cpp:125
 #: clientgui/sg_TaskCommandPopup.cpp:118
@@ -1076,44 +1080,48 @@ msgid "For more information, visit "
 msgstr "Pre viac informácií navštívte"
 
 #: clientgui/DlgAbout.cpp:215 clientgui/DlgExitMessage.cpp:173
-#: clientgui/DlgGenericMessage.cpp:120 clientgui/DlgOptions.cpp:399
+#: clientgui/DlgGenericMessage.cpp:120 clientgui/DlgOptions.cpp:410
 #: clientgui/DlgSelectComputer.cpp:163
 msgid "&OK"
 msgstr "&OK"
 
-#: clientgui/DlgAdvPreferences.cpp:682 clientgui/sg_DlgPreferences.cpp:773
+#: clientgui/DlgAdvPreferences.cpp:684 clientgui/sg_DlgPreferences.cpp:775
 msgid "Invalid number"
 msgstr "Neplatné číslo"
 
-#: clientgui/DlgAdvPreferences.cpp:683 clientgui/sg_DlgPreferences.cpp:774
+#: clientgui/DlgAdvPreferences.cpp:685 clientgui/sg_DlgPreferences.cpp:776
 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:684 clientgui/sg_DlgPreferences.cpp:775
+#: clientgui/DlgAdvPreferences.cpp:686 clientgui/sg_DlgPreferences.cpp:777
 msgid "Start time must be different from end time"
 msgstr "Začiatočný čas musí byť iný ako koncový"
 
-#: clientgui/DlgAdvPreferences.cpp:685
+#: clientgui/DlgAdvPreferences.cpp:687
 msgid "Number must be between 0 and 10"
 msgstr "Číslo musí byť od 0 do 10"
 
-#: clientgui/DlgAdvPreferences.cpp:686 clientgui/sg_DlgPreferences.cpp:776
+#: clientgui/DlgAdvPreferences.cpp:688 clientgui/sg_DlgPreferences.cpp:778
 msgid "Number must be between 0 and 100"
 msgstr "Číslo musí byť medzi 0 a 100"
 
-#: clientgui/DlgAdvPreferences.cpp:944 clientgui/sg_DlgPreferences.cpp:847
+#: clientgui/DlgAdvPreferences.cpp:689
+msgid "Number must be between 1 and 100"
+msgstr "Číslo musí byť medzi 1 a 100"
+
+#: clientgui/DlgAdvPreferences.cpp:947 clientgui/sg_DlgPreferences.cpp:849
 msgid "invalid input value detected"
 msgstr "bola nájdená neplatná vstupná hodnota"
 
-#: clientgui/DlgAdvPreferences.cpp:946 clientgui/sg_DlgPreferences.cpp:849
+#: clientgui/DlgAdvPreferences.cpp:959 clientgui/sg_DlgPreferences.cpp:861
 msgid "Validation Error"
 msgstr "Chyba pri validácii"
 
-#: clientgui/DlgAdvPreferences.cpp:1158
+#: clientgui/DlgAdvPreferences.cpp:1171
 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:1159 clientgui/sg_DlgPreferences.cpp:1175
+#: clientgui/DlgAdvPreferences.cpp:1172 clientgui/sg_DlgPreferences.cpp:1187
 msgid "Confirmation"
 msgstr "Potvrdenie"
 
@@ -1122,110 +1130,95 @@ msgstr "Potvrdenie"
 msgid "%s - Computing preferences"
 msgstr "%s - Preferencie počítania"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:82 clientgui/sg_DlgPreferences.cpp:161
+#: clientgui/DlgAdvPreferencesBase.cpp:82 clientgui/sg_DlgPreferences.cpp:163
 msgid ""
 "Using local preferences.\n"
 "Click \"Use web prefs\" to use web-based preferences from"
 msgstr "Používanie lokálnych nastavení.\nKliknite na \"Použiť webové nastavenia\" na použitie nastavení z"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:90 clientgui/sg_DlgPreferences.cpp:169
+#: clientgui/DlgAdvPreferencesBase.cpp:90 clientgui/sg_DlgPreferences.cpp:171
 msgid "Using web-based preferences from"
 msgstr "Používanie nastavení webstránky z"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:107 clientgui/sg_DlgPreferences.cpp:187
+#: clientgui/DlgAdvPreferencesBase.cpp:107 clientgui/sg_DlgPreferences.cpp:189
 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:116
-msgid ""
-"This dialog controls preferences for this computer only.\n"
-"Click OK to set preferences.\n"
-"Click Clear to restore web-based settings."
-msgstr "Táto ponuka obsahuje nastavenia len pre tento počítač.\nKliknite OK pre nastavenia.\nKliknite Vymazať pre obnovenie nastavení z webstránky."
-
-#: clientgui/DlgAdvPreferencesBase.cpp:119
-msgid "Clear"
-msgstr "Vymazať"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:120
-msgid "Clear all local preferences and close the dialog."
-msgstr "Odstrániť lokálne preferencie a zavrieť ponuku."
-
-#: clientgui/DlgAdvPreferencesBase.cpp:123 clientgui/sg_DlgPreferences.cpp:215
+#: clientgui/DlgAdvPreferencesBase.cpp:115 clientgui/sg_DlgPreferences.cpp:217
 msgid "Use web prefs"
 msgstr "Použiť webové nastavenia"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:124 clientgui/sg_DlgPreferences.cpp:216
+#: clientgui/DlgAdvPreferencesBase.cpp:116 clientgui/sg_DlgPreferences.cpp:218
 msgid "Restore web-based preferences and close the dialog."
 msgstr "Obnoviť nastavenia z webstránky a zavrieť ponuku."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:148
-#: clientgui/DlgAdvPreferencesBase.cpp:692
+#: clientgui/DlgAdvPreferencesBase.cpp:140
+#: clientgui/DlgAdvPreferencesBase.cpp:684
 msgid "Computing"
 msgstr "Výpočty"
 
 #. Network schedule
-#: clientgui/DlgAdvPreferencesBase.cpp:151
-#: clientgui/DlgAdvPreferencesBase.cpp:894
+#: clientgui/DlgAdvPreferencesBase.cpp:143
+#: clientgui/DlgAdvPreferencesBase.cpp:886
 msgid "Network"
 msgstr "Sieť"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:154
+#: clientgui/DlgAdvPreferencesBase.cpp:146
 msgid "Disk and memory"
 msgstr "Disk & Pamäť"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:157
+#: clientgui/DlgAdvPreferencesBase.cpp:149
 msgid "Daily schedules"
 msgstr "Denné plány"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:170
+#: clientgui/DlgAdvPreferencesBase.cpp:162
 #: clientgui/DlgDiagnosticLogFlags.cpp:119 clientgui/DlgExclusiveApps.cpp:146
-#: clientgui/DlgHiddenColumns.cpp:100 clientgui/sg_DlgPreferences.cpp:351
+#: clientgui/DlgHiddenColumns.cpp:100 clientgui/sg_DlgPreferences.cpp:353
 msgid "OK"
 msgstr "OK"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:171
+#: clientgui/DlgAdvPreferencesBase.cpp:163
 msgid "Save all values and close the dialog."
 msgstr "Uložiť všetky hodnoty a uzavrieť okno."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:177
+#: clientgui/DlgAdvPreferencesBase.cpp:169
 msgid "Close the dialog without saving."
 msgstr "Zavrieť ponuku bez uloženia."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:181 clientgui/DlgExclusiveApps.cpp:157
+#: clientgui/DlgAdvPreferencesBase.cpp:173 clientgui/DlgExclusiveApps.cpp:157
 #: clientgui/Localization.cpp:35 clientgui/Localization.cpp:121
 #: clientgui/Localization.cpp:139 clientgui/sg_BoincSimpleFrame.cpp:930
-#: clientgui/sg_DlgPreferences.cpp:361
+#: clientgui/sg_DlgPreferences.cpp:363
 msgid "Help"
 msgstr "Pomoc"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:182
+#: clientgui/DlgAdvPreferencesBase.cpp:174
 msgid "Shows the preferences web page."
 msgstr "Ukáže preferencie z webstránky."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:244
-#: clientgui/DlgAdvPreferencesBase.cpp:471
+#: clientgui/DlgAdvPreferencesBase.cpp:236
+#: clientgui/DlgAdvPreferencesBase.cpp:463
 msgid "Usage limits"
 msgstr "Limity používania"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:249
+#: clientgui/DlgAdvPreferencesBase.cpp:241
 #, 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:251
-#: clientgui/DlgAdvPreferencesBase.cpp:263 clientgui/sg_DlgPreferences.cpp:284
+#: clientgui/DlgAdvPreferencesBase.cpp:243
+#: clientgui/DlgAdvPreferencesBase.cpp:255 clientgui/sg_DlgPreferences.cpp:286
 msgid "Use at most"
 msgstr "Použiť najviac"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:256
+#: clientgui/DlgAdvPreferencesBase.cpp:248
 #, no-c-format
 msgid "% of the CPUs"
 msgstr "% z procesorov"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:261 clientgui/sg_DlgPreferences.cpp:282
+#: clientgui/DlgAdvPreferencesBase.cpp:253 clientgui/sg_DlgPreferences.cpp:284
 #, no-c-format
 msgid ""
 "Suspend/resume computing every few seconds to reduce CPU temperature and "
@@ -1233,355 +1226,363 @@ msgid ""
 "and repeat."
 msgstr "Pozastaviť/obnoviť výpočty každých pár sekúnd na zníženie teploty a spotreby energie. Príklad: 75% znamená, že budú prebiehať výpočty 3 sekundy a 1 sekundu sa bude čakať a potom opakovať."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:268 clientgui/sg_DlgPreferences.cpp:289
+#: clientgui/DlgAdvPreferencesBase.cpp:260 clientgui/sg_DlgPreferences.cpp:291
 #, no-c-format
 msgid "% of CPU time"
 msgstr "% času CPU"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:275
+#: clientgui/DlgAdvPreferencesBase.cpp:267
 msgid "When to suspend"
 msgstr "Kedy pozastaviť"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:281 clientgui/sg_DlgPreferences.cpp:237
+#: clientgui/DlgAdvPreferencesBase.cpp:273 clientgui/sg_DlgPreferences.cpp:239
 msgid "Suspend when computer is on battery"
 msgstr "Pozastaviť keď je počítač napájaný z batérie"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:284 clientgui/sg_DlgPreferences.cpp:233
+#: clientgui/DlgAdvPreferencesBase.cpp:276 clientgui/sg_DlgPreferences.cpp:235
 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:290 clientgui/sg_DlgPreferences.cpp:251
+#: clientgui/DlgAdvPreferencesBase.cpp:282 clientgui/sg_DlgPreferences.cpp:253
 msgid "Suspend when computer is in use"
 msgstr "Pozastaviť ked sa počítač používa"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:293 clientgui/sg_DlgPreferences.cpp:247
+#: clientgui/DlgAdvPreferencesBase.cpp:285 clientgui/sg_DlgPreferences.cpp:249
 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:299
+#: clientgui/DlgAdvPreferencesBase.cpp:291
 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:302
+#: clientgui/DlgAdvPreferencesBase.cpp:294
 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č."
 
 #. min idle time
-#: clientgui/DlgAdvPreferencesBase.cpp:307 clientgui/sg_DlgPreferences.cpp:262
+#: clientgui/DlgAdvPreferencesBase.cpp:299 clientgui/sg_DlgPreferences.cpp:264
 msgid "This determines when the computer is considered 'in use'."
 msgstr "Týmto sa určí kedy sa počítač považuje za \"používaný\"."
 
 #. context: 'In use' means mouse/keyboard input in last ___ minutes
-#: clientgui/DlgAdvPreferencesBase.cpp:312 clientgui/sg_DlgPreferences.cpp:266
+#: clientgui/DlgAdvPreferencesBase.cpp:304 clientgui/sg_DlgPreferences.cpp:268
 msgid "'In use' means mouse/keyboard input in last"
 msgstr "\"Používa sa\" znamená použitie myši alebo klávesnice za posledných"
 
 #. context: 'In use' means mouse/keyboard input in last ___ minutes
 #. context: Switch between tasks every ___ minutes
-#: clientgui/DlgAdvPreferencesBase.cpp:323
-#: clientgui/DlgAdvPreferencesBase.cpp:421 clientgui/sg_DlgPreferences.cpp:274
+#: clientgui/DlgAdvPreferencesBase.cpp:315
+#: clientgui/DlgAdvPreferencesBase.cpp:413 clientgui/sg_DlgPreferences.cpp:276
 msgid "minutes"
 msgstr "minút(y)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:331
+#: clientgui/DlgAdvPreferencesBase.cpp:323
 msgid "Suspend when non-BOINC CPU usage is above"
 msgstr "Pozastaviť, ak je procesor využívaný mimo BOINC nad"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:333
+#: clientgui/DlgAdvPreferencesBase.cpp:325
 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:339
+msgid "To suspend by time of day, see the \"Daily Schedules\" section."
+msgstr "Ak chcete obmedziť výpočty na dennú dobu, pozrite časť \"Denné plány\"."
+
 #. Context: heading for a group of miscellaneous preferences
-#: clientgui/DlgAdvPreferencesBase.cpp:357
-#: clientgui/DlgAdvPreferencesBase.cpp:524
+#: clientgui/DlgAdvPreferencesBase.cpp:349
+#: clientgui/DlgAdvPreferencesBase.cpp:516
 msgid "Other"
 msgstr "Ostatné"
 
 #. buffer sizes
-#: clientgui/DlgAdvPreferencesBase.cpp:363
+#: clientgui/DlgAdvPreferencesBase.cpp:355
 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."
 
 #. context: Store at least ___ days of work
-#: clientgui/DlgAdvPreferencesBase.cpp:367
+#: clientgui/DlgAdvPreferencesBase.cpp:359
 msgid "Store at least"
 msgstr "Uložiť aspoň"
 
 #. context: Store at least ___ days of work
 #. context: Store up to an additional ___ days of work
-#: clientgui/DlgAdvPreferencesBase.cpp:378
-#: clientgui/DlgAdvPreferencesBase.cpp:400
+#: clientgui/DlgAdvPreferencesBase.cpp:370
+#: clientgui/DlgAdvPreferencesBase.cpp:392
 msgid "days of work"
 msgstr "dní práce"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:384
+#: clientgui/DlgAdvPreferencesBase.cpp:376
 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é koľko práce sa bude vyžadovať pri kontaktovaní projektu."
 
 #. context: Store up to an additional ___ days of work
-#: clientgui/DlgAdvPreferencesBase.cpp:388
+#: clientgui/DlgAdvPreferencesBase.cpp:380
 msgid "Store up to an additional"
 msgstr "Uložiť navyše"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:407
+#: clientgui/DlgAdvPreferencesBase.cpp:399
 #, 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."
 
 #. context: Switch between tasks every ___ minutes
-#: clientgui/DlgAdvPreferencesBase.cpp:412
+#: clientgui/DlgAdvPreferencesBase.cpp:404
 msgid "Switch between tasks every"
 msgstr "Prepínať medzi aplikáciami približne každých"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:427
+#: clientgui/DlgAdvPreferencesBase.cpp:419
 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é."
+"This controls how often tasks save their state to disk, so that they later "
+"can be continued from that point."
+msgstr "Toto yrčuje ako často si úlohy ukladajú svoj stav na disk, aby mohli neskôr pokračovať od tohto bodu."
 
 #. context: Request tasks to checkpoint at most every ___ seconds
-#: clientgui/DlgAdvPreferencesBase.cpp:431
+#: clientgui/DlgAdvPreferencesBase.cpp:423
 msgid "Request tasks to checkpoint at most every"
 msgstr "Ukladať stav úloh každých"
 
 #. context: Request tasks to checkpoint at most every ___ seconds
-#: clientgui/DlgAdvPreferencesBase.cpp:440
+#: clientgui/DlgAdvPreferencesBase.cpp:432
 msgid "seconds"
 msgstr "sekúnd"
 
 #. upload/download rates
-#: clientgui/DlgAdvPreferencesBase.cpp:477
+#: clientgui/DlgAdvPreferencesBase.cpp:469
 msgid "Limit the download rate of file transfers."
 msgstr "Nastaviť limit sťahovania súborov"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:478
+#: clientgui/DlgAdvPreferencesBase.cpp:470
 msgid "Limit download rate to"
 msgstr "Obmedziť rýchlosť sťahovania na"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:482
-#: clientgui/DlgAdvPreferencesBase.cpp:491
+#: clientgui/DlgAdvPreferencesBase.cpp:474
+#: clientgui/DlgAdvPreferencesBase.cpp:483
 msgid "KB/second"
 msgstr "KB/s"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:486
+#: clientgui/DlgAdvPreferencesBase.cpp:478
 msgid "Limit the upload rate of file transfers."
 msgstr "Obmedziť rýchlosť odosielania súborov"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:487
+#: clientgui/DlgAdvPreferencesBase.cpp:479
 msgid "Limit upload rate to"
 msgstr "Limit rýchlosti odosielania"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:498
+#: clientgui/DlgAdvPreferencesBase.cpp:490
 #, 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:500
+#: clientgui/DlgAdvPreferencesBase.cpp:492
 msgid "Limit usage to"
 msgstr "Obmedziť použitie "
 
-#: clientgui/DlgAdvPreferencesBase.cpp:504
+#: clientgui/DlgAdvPreferencesBase.cpp:496
 msgid "MB every"
 msgstr "MB každých"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:508
+#: clientgui/DlgAdvPreferencesBase.cpp:500
 msgid "days"
 msgstr "dňa (dní)"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:530
+#: clientgui/DlgAdvPreferencesBase.cpp:505
+msgid "To limit transfers by time of day, see the \"Daily Schedules\" section."
+msgstr "Ak chcete obmedziť prenosy na dennú dobu, pozrite časť \"Denné plány\"."
+
+#: clientgui/DlgAdvPreferencesBase.cpp:522
 #, 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:532
+#: clientgui/DlgAdvPreferencesBase.cpp:524
 msgid "Skip data verification for image files"
 msgstr "Preskočiť overovanie pri súboroch obrázkov"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:536
+#: clientgui/DlgAdvPreferencesBase.cpp:528
 msgid "Confirm before connecting to Internet"
 msgstr "Potvrdiť pred pripojením k Internetu"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:537
-#: clientgui/DlgAdvPreferencesBase.cpp:541
+#: clientgui/DlgAdvPreferencesBase.cpp:529
+#: clientgui/DlgAdvPreferencesBase.cpp:533
 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:540
+#: clientgui/DlgAdvPreferencesBase.cpp:532
 msgid "Disconnect when done"
 msgstr "Odpojiť po dokončení komunikácie"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:567 clientgui/ViewResources.cpp:116
+#: clientgui/DlgAdvPreferencesBase.cpp:559 clientgui/ViewResources.cpp:116
 msgid "Disk"
 msgstr "Disk"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:572
+#: clientgui/DlgAdvPreferencesBase.cpp:564
 #, 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:578 clientgui/sg_DlgPreferences.cpp:333
+#: clientgui/DlgAdvPreferencesBase.cpp:570 clientgui/sg_DlgPreferences.cpp:335
 #, c-format
 msgid "Limit the total amount of disk space used by %s."
 msgstr "Obmedziť využitie disku pre %s."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:581
-#: clientgui/DlgAdvPreferencesBase.cpp:605 clientgui/sg_DlgPreferences.cpp:336
+#: clientgui/DlgAdvPreferencesBase.cpp:573
+#: clientgui/DlgAdvPreferencesBase.cpp:597 clientgui/sg_DlgPreferences.cpp:338
 msgid "Use no more than"
 msgstr "Nepoužiť viac ako"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:585
+#: clientgui/DlgAdvPreferencesBase.cpp:577
 msgid "GB"
 msgstr "GB"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:590
+#: clientgui/DlgAdvPreferencesBase.cpp:582
 #, c-format
 msgid ""
 "Limit disk usage to leave this much free space on the volume where %s stores"
 " data."
 msgstr "Obmedzí použitie disku, aby ostalo aspoň toľko voľného miesta na disku, kde sú uložené dáta %s."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:593
+#: clientgui/DlgAdvPreferencesBase.cpp:585
 msgid "Leave at least"
 msgstr "Ponechať najmenej"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:597
+#: clientgui/DlgAdvPreferencesBase.cpp:589
 msgid "GB free"
 msgstr "GB voľných"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:602
+#: clientgui/DlgAdvPreferencesBase.cpp:594
 #, c-format
 msgid ""
 "Limit the percentage of disk space used by %s on the volume where it stores "
 "data."
 msgstr "Obmedzí percentuálne využitie miesta na disku aplikáciou %s."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:610
+#: clientgui/DlgAdvPreferencesBase.cpp:602
 #, no-c-format
 msgid "% of total"
 msgstr "% celku"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:617
+#: clientgui/DlgAdvPreferencesBase.cpp:609
 msgid "Memory"
 msgstr "Pamäť"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:622
+#: clientgui/DlgAdvPreferencesBase.cpp:614
 #, c-format
 msgid "Limit the memory used by %s when you're using the computer."
 msgstr "Obmedzenie pamäte, ktorú %s využíva, keď používate počítač."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:624
+#: clientgui/DlgAdvPreferencesBase.cpp:616
 msgid "When computer is in use, use at most"
 msgstr "Keď sa počítač používa, využiť najviac"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:630
-#: clientgui/DlgAdvPreferencesBase.cpp:642
-#: clientgui/DlgAdvPreferencesBase.cpp:658
+#: clientgui/DlgAdvPreferencesBase.cpp:622
+#: clientgui/DlgAdvPreferencesBase.cpp:634
+#: clientgui/DlgAdvPreferencesBase.cpp:650
 #, no-c-format
 msgid "%"
 msgstr "%"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:635
+#: clientgui/DlgAdvPreferencesBase.cpp:627
 #, c-format
 msgid "Limit the memory used by %s when you're not using the computer."
 msgstr "Obmedzenie pamäte, ktorú %s využíva, keď nepoužívate počítač."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:637
+#: clientgui/DlgAdvPreferencesBase.cpp:629
 msgid "When computer is not in use, use at most"
 msgstr "Keď sa počítač nepoužíva, použiť maximálne"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:646
+#: clientgui/DlgAdvPreferencesBase.cpp:638
 msgid "Leave non-GPU tasks in memory while suspended"
 msgstr "Ponechať ne-GPU úlohy v pamäti pri ich pozastavení"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:647
+#: clientgui/DlgAdvPreferencesBase.cpp:639
 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 pamäti a môžu byť obnovené bez strát práce. Ak nie je zaškrtnuté, pozastavené úlohy nebudú uložené v pamäti a musia byť obnovené z ich posledného času uloženia."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:651
+#: clientgui/DlgAdvPreferencesBase.cpp:643
 #, c-format
 msgid "Limit the swap space (page file) used by %s."
 msgstr "Obmedziť využitie ukladacieho priestoru (stránkovacieho súboru) pre %s."
 
-#: clientgui/DlgAdvPreferencesBase.cpp:653
+#: clientgui/DlgAdvPreferencesBase.cpp:645
 msgid "Page/swap file: use at most"
 msgstr "Stránkovací súbor: využiť najviac"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:678 clientgui/sg_DlgPreferences.cpp:293
+#: clientgui/DlgAdvPreferencesBase.cpp:670 clientgui/sg_DlgPreferences.cpp:295
 msgid "and"
 msgstr "a"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:679
+#: clientgui/DlgAdvPreferencesBase.cpp:671
 msgid "to"
 msgstr "až"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:699 clientgui/sg_DlgPreferences.cpp:294
+#: clientgui/DlgAdvPreferencesBase.cpp:691 clientgui/sg_DlgPreferences.cpp:296
 msgid "Compute only during a particular period each day."
 msgstr "Vykonávať výpočty len v určitý čas každý deň"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:702 clientgui/sg_DlgPreferences.cpp:297
+#: clientgui/DlgAdvPreferencesBase.cpp:694 clientgui/sg_DlgPreferences.cpp:299
 msgid "Compute only between"
 msgstr "Počítať len medzi"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:726
-#: clientgui/DlgAdvPreferencesBase.cpp:910
+#: clientgui/DlgAdvPreferencesBase.cpp:718
+#: clientgui/DlgAdvPreferencesBase.cpp:902
 msgid "Day-of-week override"
 msgstr "Samostatné nastavenia pre dni v týždni"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:735
-#: clientgui/DlgAdvPreferencesBase.cpp:914
+#: clientgui/DlgAdvPreferencesBase.cpp:727
+#: clientgui/DlgAdvPreferencesBase.cpp:906
 msgid "Override the times above on the selected days:"
 msgstr "Použiť špecifické nastavenia časov pre tieto dni:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:758
-#: clientgui/DlgAdvPreferencesBase.cpp:931
+#: clientgui/DlgAdvPreferencesBase.cpp:750
+#: clientgui/DlgAdvPreferencesBase.cpp:923
 msgid "Monday"
 msgstr "Pondelok"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:785
-#: clientgui/DlgAdvPreferencesBase.cpp:946
+#: clientgui/DlgAdvPreferencesBase.cpp:777
+#: clientgui/DlgAdvPreferencesBase.cpp:938
 msgid "Friday"
 msgstr "Piatok"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:800
-#: clientgui/DlgAdvPreferencesBase.cpp:959
+#: clientgui/DlgAdvPreferencesBase.cpp:792
+#: clientgui/DlgAdvPreferencesBase.cpp:951
 msgid "Tuesday"
 msgstr "Utorok"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:815
-#: clientgui/DlgAdvPreferencesBase.cpp:974
+#: clientgui/DlgAdvPreferencesBase.cpp:807
+#: clientgui/DlgAdvPreferencesBase.cpp:966
 msgid "Saturday"
 msgstr "Sobota"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:828
-#: clientgui/DlgAdvPreferencesBase.cpp:987
+#: clientgui/DlgAdvPreferencesBase.cpp:820
+#: clientgui/DlgAdvPreferencesBase.cpp:979
 msgid "Wednesday"
 msgstr "Streda"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:843
-#: clientgui/DlgAdvPreferencesBase.cpp:1002
+#: clientgui/DlgAdvPreferencesBase.cpp:835
+#: clientgui/DlgAdvPreferencesBase.cpp:994
 msgid "Sunday"
 msgstr "Nedeľa"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:856
-#: clientgui/DlgAdvPreferencesBase.cpp:1015
+#: clientgui/DlgAdvPreferencesBase.cpp:848
+#: clientgui/DlgAdvPreferencesBase.cpp:1007
 msgid "Thursday"
 msgstr "Štvrtok"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:898 clientgui/sg_DlgPreferences.cpp:315
+#: clientgui/DlgAdvPreferencesBase.cpp:890 clientgui/sg_DlgPreferences.cpp:317
 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:900 clientgui/sg_DlgPreferences.cpp:317
+#: clientgui/DlgAdvPreferencesBase.cpp:892 clientgui/sg_DlgPreferences.cpp:319
 msgid "Transfer files only between"
 msgstr "Prenos súborov len medzi"
 
@@ -1615,45 +1616,45 @@ msgstr "Obnoviť pôvodné nastavenia"
 msgid "Close the dialog without saving"
 msgstr "Zavrieť okno bez uloženia"
 
-#: clientgui/DlgEventLog.cpp:227
+#: clientgui/DlgEventLog.cpp:236
 #, c-format
 msgid "%s - Event Log"
 msgstr "%s - Záznam udalostí"
 
 #. Create List Pane Items
-#: clientgui/DlgEventLog.cpp:237 clientgui/ViewMessages.cpp:117
-#: clientgui/ViewProjects.cpp:253 clientgui/ViewStatistics.cpp:411
+#: clientgui/DlgEventLog.cpp:246 clientgui/ViewMessages.cpp:117
+#: clientgui/ViewProjects.cpp:251 clientgui/ViewStatistics.cpp:411
 #: clientgui/ViewStatistics.cpp:1983 clientgui/ViewTransfers.cpp:209
 #: clientgui/ViewWork.cpp:260
 msgid "Project"
 msgstr "Projekt"
 
-#: clientgui/DlgEventLog.cpp:238 clientgui/ViewMessages.cpp:118
+#: clientgui/DlgEventLog.cpp:247 clientgui/ViewMessages.cpp:118
 msgid "Time"
 msgstr "Čas"
 
-#: clientgui/DlgEventLog.cpp:239 clientgui/ViewMessages.cpp:119
+#: clientgui/DlgEventLog.cpp:248 clientgui/ViewMessages.cpp:119
 msgid "Message"
 msgstr "Hlásenie"
 
-#: clientgui/DlgEventLog.cpp:296 clientgui/DlgEventLog.cpp:346
+#: clientgui/DlgEventLog.cpp:305 clientgui/DlgEventLog.cpp:355
 msgid "&Show only this project"
 msgstr "&Zobraziť len tento projekt"
 
-#: clientgui/DlgEventLog.cpp:300
+#: clientgui/DlgEventLog.cpp:309
 msgid "Copy &All"
 msgstr "Kopírov&ať všetky"
 
-#: clientgui/DlgEventLog.cpp:302 clientgui/DlgEventLog.cpp:306
+#: clientgui/DlgEventLog.cpp:311 clientgui/DlgEventLog.cpp:315
 #: clientgui/ViewMessages.cpp:89
 msgid "Copy all the messages to the clipboard."
 msgstr "Kopírovať všetky správy do kopírovacej schránky."
 
-#: clientgui/DlgEventLog.cpp:311
+#: clientgui/DlgEventLog.cpp:320
 msgid "Copy &Selected"
 msgstr "&Kopírovať vybrané"
 
-#: clientgui/DlgEventLog.cpp:314 clientgui/DlgEventLog.cpp:322
+#: clientgui/DlgEventLog.cpp:323 clientgui/DlgEventLog.cpp:331
 #: clientgui/ViewMessages.cpp:97
 msgid ""
 "Copy the selected messages to the clipboard. You can select multiple "
@@ -1661,7 +1662,7 @@ msgid ""
 "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:316 clientgui/DlgEventLog.cpp:324
+#: clientgui/DlgEventLog.cpp:325 clientgui/DlgEventLog.cpp:333
 #: clientgui/ViewMessages.cpp:99
 msgid ""
 "Copy the selected messages to the clipboard. You can select multiple "
@@ -1669,19 +1670,19 @@ msgid ""
 "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:331 clientgui/DlgItemProperties.cpp:67
+#: clientgui/DlgEventLog.cpp:340 clientgui/DlgItemProperties.cpp:67
 msgid "&Close"
 msgstr "&Zavrieť"
 
-#: clientgui/DlgEventLog.cpp:340
+#: clientgui/DlgEventLog.cpp:349
 msgid "Show all &messages"
 msgstr "Zobraziť všetky &správy"
 
-#: clientgui/DlgEventLog.cpp:341 clientgui/DlgEventLog.cpp:343
+#: clientgui/DlgEventLog.cpp:350 clientgui/DlgEventLog.cpp:352
 msgid "Show messages for all projects"
 msgstr "Zobraziť správy zo všetkých projektov"
 
-#: clientgui/DlgEventLog.cpp:347 clientgui/DlgEventLog.cpp:349
+#: clientgui/DlgEventLog.cpp:356 clientgui/DlgEventLog.cpp:358
 msgid "Show only the messages for the selected project"
 msgstr "Zobraziť správy len z vybraného projektu"
 
@@ -1704,7 +1705,7 @@ msgid "Add an application to this list"
 msgstr "Pridať aplikáciu do tohto zoznamu"
 
 #: clientgui/DlgExclusiveApps.cpp:86 clientgui/DlgExclusiveApps.cpp:110
-#: clientgui/ViewProjects.cpp:232 clientgui/sg_ProjectCommandPopup.cpp:90
+#: clientgui/ViewProjects.cpp:230 clientgui/sg_ProjectCommandPopup.cpp:90
 msgid "Remove"
 msgstr "Odobrať"
 
@@ -1804,7 +1805,7 @@ 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/DlgOptions.cpp:415 clientgui/DlgSelectComputer.cpp:168
 #: clientgui/wizardex.cpp:378
 msgid "&Cancel"
 msgstr "&Späť"
@@ -1823,20 +1824,20 @@ msgstr "Výber stĺpcov %s"
 msgid "Select which columns %s should show."
 msgstr "Vybrať, ktoré stĺpce má %s zobraziť."
 
-#: clientgui/DlgHiddenColumns.cpp:314
+#: clientgui/DlgHiddenColumns.cpp:358
 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
+#: clientgui/DlgHiddenColumns.cpp:359
 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 "
+msgid "Don't request tasks for "
+msgstr "Nežiadať úlohy pre"
 
 #: clientgui/DlgItemProperties.cpp:194
 msgid "Project preference"
@@ -1854,379 +1855,398 @@ msgstr "Projekt nemá aplikácie pre "
 msgid "Client configuration excludes "
 msgstr "Nastavenie klienta vylučuje "
 
-#: clientgui/DlgItemProperties.cpp:208
-msgid " work fetch deferred for"
-msgstr " získavanie práce odložené o"
-
 #: clientgui/DlgItemProperties.cpp:209
-msgid " work fetch deferral interval"
-msgstr " interval odkladania získavania práce"
+#, c-format
+msgid "%s task request deferred for"
+msgstr "%s požiadavka na úlohu odložená o"
+
+#: clientgui/DlgItemProperties.cpp:213
+#, c-format
+msgid "%s task request deferral interval"
+msgstr "%s interval odloženia požiadavky na úlohu"
 
 #. set dialog title
-#: clientgui/DlgItemProperties.cpp:241
+#: clientgui/DlgItemProperties.cpp:247
 msgid "Properties of project "
 msgstr "Vlastnosti projektu "
 
 #. layout controls
-#: clientgui/DlgItemProperties.cpp:245 clientgui/DlgOptions.cpp:221
+#: clientgui/DlgItemProperties.cpp:251 clientgui/DlgOptions.cpp:232
 msgid "General"
 msgstr "Všeobecné"
 
-#: clientgui/DlgItemProperties.cpp:246
+#: clientgui/DlgItemProperties.cpp:252
 msgid "URL"
 msgstr "URL"
 
-#: clientgui/DlgItemProperties.cpp:247
+#: clientgui/DlgItemProperties.cpp:253
 msgid "User name"
 msgstr "Používateľské meno"
 
-#: clientgui/DlgItemProperties.cpp:248
+#: clientgui/DlgItemProperties.cpp:254
 msgid "Team name"
 msgstr "Názov tímu"
 
-#: clientgui/DlgItemProperties.cpp:249 clientgui/ViewProjects.cpp:258
+#: clientgui/DlgItemProperties.cpp:255 clientgui/ViewProjects.cpp:256
 msgid "Resource share"
 msgstr "Podiel výkonu"
 
-#: clientgui/DlgItemProperties.cpp:251
+#: clientgui/DlgItemProperties.cpp:257
 msgid "Scheduler RPC deferred for"
 msgstr "RPC plánovača odložené o"
 
-#: clientgui/DlgItemProperties.cpp:254
+#: clientgui/DlgItemProperties.cpp:260
 msgid "File downloads deferred for"
 msgstr "Sťahovanie súborov odložené o"
 
-#: clientgui/DlgItemProperties.cpp:257
+#: clientgui/DlgItemProperties.cpp:263
 msgid "File uploads deferred for"
 msgstr "Odosielanie súborov odložené o"
 
-#: clientgui/DlgItemProperties.cpp:259
+#: clientgui/DlgItemProperties.cpp:265
 msgid "Disk usage"
 msgstr "Využitie disku"
 
-#: clientgui/DlgItemProperties.cpp:260
+#: clientgui/DlgItemProperties.cpp:266
 msgid "Computer ID"
 msgstr "ID počítača"
 
-#: clientgui/DlgItemProperties.cpp:262
+#: clientgui/DlgItemProperties.cpp:268
 msgid "Non CPU intensive"
 msgstr "Nenáročné na procesor"
 
-#: clientgui/DlgItemProperties.cpp:262 clientgui/DlgItemProperties.cpp:264
-#: clientgui/DlgItemProperties.cpp:265 clientgui/DlgItemProperties.cpp:267
-#: clientgui/DlgItemProperties.cpp:270 clientgui/DlgItemProperties.cpp:279
-#: clientgui/DlgItemProperties.cpp:282 clientgui/DlgItemProperties.cpp:285
+#: clientgui/DlgItemProperties.cpp:268 clientgui/DlgItemProperties.cpp:270
+#: clientgui/DlgItemProperties.cpp:271 clientgui/DlgItemProperties.cpp:273
+#: clientgui/DlgItemProperties.cpp:276 clientgui/DlgItemProperties.cpp:285
+#: clientgui/DlgItemProperties.cpp:288 clientgui/DlgItemProperties.cpp:291
 msgid "yes"
 msgstr "áno"
 
-#: clientgui/DlgItemProperties.cpp:264
+#: clientgui/DlgItemProperties.cpp:270
 msgid "Suspended via GUI"
 msgstr "Pozastavené cez GUI"
 
-#: clientgui/DlgItemProperties.cpp:264 clientgui/DlgItemProperties.cpp:265
+#: clientgui/DlgItemProperties.cpp:270 clientgui/DlgItemProperties.cpp:271
 msgid "no"
 msgstr "nie"
 
-#: clientgui/DlgItemProperties.cpp:265
-msgid "Don't request more work"
-msgstr "Neprijímať ďalšiu prácu"
+#: clientgui/DlgItemProperties.cpp:271
+msgid "Don't request tasks"
+msgstr "Nežiadať úlohy"
 
-#: clientgui/DlgItemProperties.cpp:267
+#: clientgui/DlgItemProperties.cpp:273
 msgid "Scheduler call in progress"
 msgstr "Spracováva sa požiadavka plánovača"
 
-#: clientgui/DlgItemProperties.cpp:270
+#: clientgui/DlgItemProperties.cpp:276
 msgid "Trickle-up pending"
 msgstr "Rýchla správa odosielaná"
 
-#: clientgui/DlgItemProperties.cpp:273 clientgui/DlgItemProperties.cpp:275
+#: clientgui/DlgItemProperties.cpp:279 clientgui/DlgItemProperties.cpp:281
 msgid "Host location"
 msgstr "Umiestnenie počítača"
 
-#: clientgui/DlgItemProperties.cpp:275
+#: clientgui/DlgItemProperties.cpp:281
 msgid "default"
 msgstr "predvolené"
 
-#: clientgui/DlgItemProperties.cpp:279
+#: clientgui/DlgItemProperties.cpp:285
 msgid "Added via account manager"
 msgstr "Pripojené cez Správcu konta"
 
-#: clientgui/DlgItemProperties.cpp:282
+#: clientgui/DlgItemProperties.cpp:288
 msgid "Remove when tasks done"
 msgstr "Odpojiť po skončení úloh"
 
-#: clientgui/DlgItemProperties.cpp:285
+#: clientgui/DlgItemProperties.cpp:291
 msgid "Ended"
 msgstr "Ukončené"
 
-#: clientgui/DlgItemProperties.cpp:287
+#: clientgui/DlgItemProperties.cpp:293
 msgid "Tasks completed"
 msgstr "Úlohy dokončené"
 
-#: clientgui/DlgItemProperties.cpp:288
+#: clientgui/DlgItemProperties.cpp:294
 msgid "Tasks failed"
 msgstr "Úlohy zlyhali"
 
-#: clientgui/DlgItemProperties.cpp:290
+#: clientgui/DlgItemProperties.cpp:296
 msgid "Credit"
 msgstr "Kredit"
 
-#: clientgui/DlgItemProperties.cpp:291
+#: clientgui/DlgItemProperties.cpp:297
 msgid "User"
 msgstr "Používateľ"
 
-#: clientgui/DlgItemProperties.cpp:298
+#: clientgui/DlgItemProperties.cpp:300 clientgui/DlgItemProperties.cpp:308
+#, c-format
+msgid "%s total, %s average"
+msgstr "%s celkom, %s priemer"
+
+#: clientgui/DlgItemProperties.cpp:305
 msgid "Host"
 msgstr "Počítač"
 
-#: clientgui/DlgItemProperties.cpp:307
+#: clientgui/DlgItemProperties.cpp:315
 msgid "Scheduling"
 msgstr "Plánovanie"
 
-#: clientgui/DlgItemProperties.cpp:308
+#: clientgui/DlgItemProperties.cpp:316
 msgid "Scheduling priority"
 msgstr "Priorita plánovania"
 
-#: clientgui/DlgItemProperties.cpp:309
+#: clientgui/DlgItemProperties.cpp:317
 msgid "CPU"
 msgstr "CPU"
 
-#: clientgui/DlgItemProperties.cpp:333
+#: clientgui/DlgItemProperties.cpp:341
 msgid "Duration correction factor"
 msgstr "Koeficient pre korekciu trvania úloh"
 
-#: clientgui/DlgItemProperties.cpp:341
+#: clientgui/DlgItemProperties.cpp:349
 msgid "Last scheduler reply"
 msgstr "Posledná odpoveď plánovača"
 
-#: clientgui/DlgItemProperties.cpp:352
+#: clientgui/DlgItemProperties.cpp:360
 msgid "Properties of task "
 msgstr "Vlastnosti úlohy "
 
-#: clientgui/DlgItemProperties.cpp:364 clientgui/ViewWork.cpp:266
+#: clientgui/DlgItemProperties.cpp:372 clientgui/ViewWork.cpp:266
 msgid "Application"
 msgstr "Aplikácia"
 
-#: clientgui/DlgItemProperties.cpp:365 clientgui/ViewWork.cpp:267
+#: clientgui/DlgItemProperties.cpp:373 clientgui/ViewWork.cpp:267
 msgid "Name"
 msgstr "Názov"
 
-#: clientgui/DlgItemProperties.cpp:366
+#: clientgui/DlgItemProperties.cpp:374
 msgid "State"
 msgstr "Stav"
 
-#: clientgui/DlgItemProperties.cpp:369
+#: clientgui/DlgItemProperties.cpp:377
 msgid "Received"
 msgstr "Prijatá"
 
-#: clientgui/DlgItemProperties.cpp:372
+#: clientgui/DlgItemProperties.cpp:380
 msgid "Report deadline"
 msgstr "Odoslať do"
 
-#: clientgui/DlgItemProperties.cpp:374
+#: clientgui/DlgItemProperties.cpp:382
 msgid "Resources"
 msgstr "Prostriedky"
 
-#: clientgui/DlgItemProperties.cpp:377
+#: clientgui/DlgItemProperties.cpp:385
 msgid "Estimated computation size"
 msgstr "Odhadovaná doba výpočtu"
 
-#: clientgui/DlgItemProperties.cpp:380
+#: clientgui/DlgItemProperties.cpp:390
 msgid "CPU time at last checkpoint"
 msgstr "Čas CPU pri poslednom uložení stavu"
 
-#: clientgui/DlgItemProperties.cpp:381 clientgui/DlgItemProperties.cpp:407
+#: clientgui/DlgItemProperties.cpp:391 clientgui/DlgItemProperties.cpp:417
 msgid "CPU time"
 msgstr "Čas CPU"
 
-#: clientgui/DlgItemProperties.cpp:383 clientgui/DlgItemProperties.cpp:408
+#: clientgui/DlgItemProperties.cpp:393 clientgui/DlgItemProperties.cpp:418
 msgid "Elapsed time"
 msgstr "Uplynutý čas"
 
-#: clientgui/DlgItemProperties.cpp:385
+#: clientgui/DlgItemProperties.cpp:395
 msgid "Estimated time remaining"
 msgstr "Odhad zostávajúceho času"
 
-#: clientgui/DlgItemProperties.cpp:386
+#: clientgui/DlgItemProperties.cpp:396
 msgid "Fraction done"
 msgstr "Hotový podiel"
 
-#: clientgui/DlgItemProperties.cpp:387
+#: clientgui/DlgItemProperties.cpp:397
 msgid "Virtual memory size"
 msgstr "Veľkosť virtuálnej pamäte"
 
-#: clientgui/DlgItemProperties.cpp:388
+#: clientgui/DlgItemProperties.cpp:398
 msgid "Working set size"
 msgstr "Veľkosť pracovnej sady"
 
-#: clientgui/DlgItemProperties.cpp:390
+#: clientgui/DlgItemProperties.cpp:400
 msgid "Directory"
 msgstr "Priečinok"
 
-#: clientgui/DlgItemProperties.cpp:393
+#: clientgui/DlgItemProperties.cpp:403
 msgid "Process ID"
 msgstr "ID procesu"
 
-#: clientgui/DlgItemProperties.cpp:399 clientgui/DlgItemProperties.cpp:401
-#: clientgui/DlgItemProperties.cpp:403
+#: clientgui/DlgItemProperties.cpp:409 clientgui/DlgItemProperties.cpp:411
+#: clientgui/DlgItemProperties.cpp:413
 msgid "Progress rate"
 msgstr "Rýchlosť progresu"
 
-#: clientgui/DlgItemProperties.cpp:399
+#: clientgui/DlgItemProperties.cpp:409
 msgid "per hour"
 msgstr "za hodinu"
 
-#: clientgui/DlgItemProperties.cpp:401
+#: clientgui/DlgItemProperties.cpp:411
 msgid "per minute"
 msgstr "za minútu"
 
-#: clientgui/DlgItemProperties.cpp:403
+#: clientgui/DlgItemProperties.cpp:413
 msgid "per second"
 msgstr "za sekundu"
 
-#: clientgui/DlgItemProperties.cpp:474 clientgui/ViewWork.cpp:1125
+#: clientgui/DlgItemProperties.cpp:421
+msgid "Executable"
+msgstr "Program"
+
+#: clientgui/DlgItemProperties.cpp:487 clientgui/ViewWork.cpp:1125
 #: clientgui/sg_TaskPanel.cpp:828
 msgid "Local: "
 msgstr "Lokálne: "
 
-#: clientgui/DlgOptions.cpp:129 clientgui/DlgOptions.cpp:135
+#: clientgui/DlgOptions.cpp:130 clientgui/DlgOptions.cpp:136
 msgid "Options"
 msgstr "Možnosti"
 
-#: clientgui/DlgOptions.cpp:178
+#: clientgui/DlgOptions.cpp:179
 msgid "Language:"
 msgstr "Jazyk:"
 
-#: clientgui/DlgOptions.cpp:185
+#: clientgui/DlgOptions.cpp:186
 msgid "What language should BOINC use?"
 msgstr "Aký jazyk má Správca BOINC používať?"
 
-#: clientgui/DlgOptions.cpp:189
+#: clientgui/DlgOptions.cpp:190
 msgid "Notice reminder interval:"
 msgstr "Interval upozorňovania na oznamy:"
 
-#: clientgui/DlgOptions.cpp:196
+#: clientgui/DlgOptions.cpp:197
 msgid "How often should BOINC remind you of new notices?"
 msgstr "Ako často má BOINC upozorňovať na nové oznamy?"
 
-#: clientgui/DlgOptions.cpp:201
+#: clientgui/DlgOptions.cpp:202
 msgid "Run Manager at login?"
 msgstr "Spustiť Správcu pri prihlásení?"
 
-#: clientgui/DlgOptions.cpp:207
+#: clientgui/DlgOptions.cpp:208
 msgid "Run the BOINC Manager when you log on."
 msgstr "Spustiť Správcu BOINC keď sa prihlásite do Windows."
 
-#: clientgui/DlgOptions.cpp:212
+#: clientgui/DlgOptions.cpp:213
+msgid "Run daemon?"
+msgstr "Spustiť program na pozadí?"
+
+#: clientgui/DlgOptions.cpp:219
+msgid "Run daemon when launching the Manager."
+msgstr "Spustiť program na pozadí pri spustení Správcu."
+
+#: clientgui/DlgOptions.cpp:223
 msgid "Enable Manager exit dialog?"
 msgstr "Zobraziť potvrdenie pri ukončení Správcu?"
 
-#: clientgui/DlgOptions.cpp:218
+#: clientgui/DlgOptions.cpp:229
 msgid "Display the exit dialog when shutting down the Manager."
 msgstr "Zobrazovať okno na potvrdenie pri ukončovaní Správcu."
 
-#: clientgui/DlgOptions.cpp:229
+#: clientgui/DlgOptions.cpp:240
 msgid "Dial-up and Virtual Private Network settings"
 msgstr "Nastavenia Dialógového pripojenia a Virtuálnej privátnej siete"
 
-#: clientgui/DlgOptions.cpp:243
+#: clientgui/DlgOptions.cpp:254
 msgid "&Set Default"
 msgstr "&Nastaviť predvolené"
 
-#: clientgui/DlgOptions.cpp:248
+#: clientgui/DlgOptions.cpp:259
 msgid "&Clear Default"
 msgstr "&Vymazať predvolené"
 
-#: clientgui/DlgOptions.cpp:255
+#: clientgui/DlgOptions.cpp:266
 msgid "Default Connection:"
 msgstr "Predvolené pripojenie:"
 
-#: clientgui/DlgOptions.cpp:262
+#: clientgui/DlgOptions.cpp:273
 msgid "Connections"
 msgstr "Pripojenia"
 
-#: clientgui/DlgOptions.cpp:271
+#: clientgui/DlgOptions.cpp:282
 msgid "Connect via HTTP proxy server"
 msgstr "Pripojenie cez HTTP proxy server"
 
-#: clientgui/DlgOptions.cpp:275
+#: clientgui/DlgOptions.cpp:286
 msgid "HTTP Proxy Server Configuration"
 msgstr "Konfigurácia HTTP proxy servera"
 
-#: clientgui/DlgOptions.cpp:283 clientgui/DlgOptions.cpp:347
+#: clientgui/DlgOptions.cpp:294 clientgui/DlgOptions.cpp:358
 msgid "Address:"
 msgstr "Adresa:"
 
-#: clientgui/DlgOptions.cpp:291 clientgui/DlgOptions.cpp:355
+#: clientgui/DlgOptions.cpp:302 clientgui/DlgOptions.cpp:366
 #: clientgui/ProxyPage.cpp:340 clientgui/ProxyPage.cpp:360
 msgid "Port:"
 msgstr "Port:"
 
-#: clientgui/DlgOptions.cpp:299 clientgui/DlgOptions.cpp:363
+#: clientgui/DlgOptions.cpp:310 clientgui/DlgOptions.cpp:374
 msgid "Don't use proxy for:"
 msgstr "Nepoužívať proxy pre:"
 
-#: clientgui/DlgOptions.cpp:306 clientgui/DlgOptions.cpp:370
+#: clientgui/DlgOptions.cpp:317 clientgui/DlgOptions.cpp:381
 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:323 clientgui/DlgOptions.cpp:387
 #: clientgui/ProxyPage.cpp:343 clientgui/ProxyPage.cpp:363
 msgid "User Name:"
 msgstr "Používateľské meno:"
 
-#: clientgui/DlgOptions.cpp:320 clientgui/DlgOptions.cpp:384
+#: clientgui/DlgOptions.cpp:331 clientgui/DlgOptions.cpp:395
 #: clientgui/DlgSelectComputer.cpp:152 clientgui/ProxyPage.cpp:346
 #: clientgui/ProxyPage.cpp:366
 msgid "Password:"
 msgstr "Heslo:"
 
-#: clientgui/DlgOptions.cpp:327
+#: clientgui/DlgOptions.cpp:338
 msgid "HTTP Proxy"
 msgstr "HTTP proxy server"
 
-#: clientgui/DlgOptions.cpp:335
+#: clientgui/DlgOptions.cpp:346
 msgid "Connect via SOCKS proxy server"
 msgstr "Pripojenie cez SOCKS proxy server"
 
-#: clientgui/DlgOptions.cpp:339
+#: clientgui/DlgOptions.cpp:350
 msgid "SOCKS Proxy Server Configuration"
 msgstr "Konfigurácia SOCKS proxy servera"
 
-#: clientgui/DlgOptions.cpp:391
+#: clientgui/DlgOptions.cpp:402
 msgid "SOCKS Proxy"
 msgstr "SOCKS proxy server"
 
-#: clientgui/DlgOptions.cpp:589
+#: clientgui/DlgOptions.cpp:600
 msgid "always"
 msgstr "stále"
 
-#: clientgui/DlgOptions.cpp:590
+#: clientgui/DlgOptions.cpp:601
 msgid "1 hour"
 msgstr "1 hodina"
 
-#: clientgui/DlgOptions.cpp:591
+#: clientgui/DlgOptions.cpp:602
 msgid "6 hours"
 msgstr "6 hodín"
 
-#: clientgui/DlgOptions.cpp:592
+#: clientgui/DlgOptions.cpp:603
 msgid "1 day"
 msgstr "1 deň"
 
-#: clientgui/DlgOptions.cpp:593
+#: clientgui/DlgOptions.cpp:604
 msgid "1 week"
 msgstr "1 týždeň"
 
-#: clientgui/DlgOptions.cpp:594
+#: clientgui/DlgOptions.cpp:605
 msgid "never"
 msgstr "nikdy"
 
-#: clientgui/DlgOptions.cpp:691
+#: clientgui/DlgOptions.cpp:703
 #, c-format
 msgid "%s - Language Selection"
 msgstr "%s - Výber jazyka"
 
-#: clientgui/DlgOptions.cpp:698
+#: clientgui/DlgOptions.cpp:710
 #, c-format
 msgid ""
 "The %s's language has been changed.  In order for this change to take "
@@ -2372,7 +2392,7 @@ msgid "The home page of the GEO-600 project"
 msgstr "Domovská stránka projektu GEO-600"
 
 #: clientgui/Localization.cpp:115 clientgui/Localization.cpp:133
-#: clientgui/ViewProjects.cpp:255 clientgui/ViewStatistics.cpp:441
+#: clientgui/ViewProjects.cpp:253 clientgui/ViewStatistics.cpp:441
 msgid "Team"
 msgstr "Tím"
 
@@ -2436,203 +2456,203 @@ msgstr "Výskum"
 msgid "Learn about the projects hosted at World Community Grid"
 msgstr "Spoznajte projekty zapojené do World Community Grid"
 
-#: clientgui/MainDocument.cpp:583
+#: clientgui/MainDocument.cpp:585
 msgid "Starting client"
 msgstr "Spúšťa sa klient"
 
-#: clientgui/MainDocument.cpp:591
+#: clientgui/MainDocument.cpp:593
 msgid "Connecting to client"
 msgstr "Pripája sa ku klientovi"
 
-#: clientgui/MainDocument.cpp:1205
+#: clientgui/MainDocument.cpp:1207
 msgid "Retrieving system state; please wait..."
 msgstr "Zisťuje sa stav systému; prosím čakajte..."
 
-#: clientgui/MainDocument.cpp:1826
+#: clientgui/MainDocument.cpp:1828
 msgid "Missing application"
 msgstr "Chýbajúca aplikácia"
 
-#: clientgui/MainDocument.cpp:1827
+#: clientgui/MainDocument.cpp:1829
 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
+#: clientgui/MainDocument.cpp:2443
 msgid "on batteries"
 msgstr "z batérií"
 
-#: clientgui/MainDocument.cpp:2443
+#: clientgui/MainDocument.cpp:2444
 msgid "computer is in use"
 msgstr "počítač je používaný"
 
-#: clientgui/MainDocument.cpp:2444
+#: clientgui/MainDocument.cpp:2445
 msgid "user request"
 msgstr "požadované používateľom"
 
-#: clientgui/MainDocument.cpp:2445
+#: clientgui/MainDocument.cpp:2446
 msgid "time of day"
 msgstr "denná doba"
 
-#: clientgui/MainDocument.cpp:2446
+#: clientgui/MainDocument.cpp:2447
 msgid "CPU benchmarks in progress"
 msgstr "prebiehajú testy rýchlosti CPU"
 
-#: clientgui/MainDocument.cpp:2447
+#: clientgui/MainDocument.cpp:2448
 msgid "need disk space - check preferences"
 msgstr "nedostatok voľného miesta na disku - skontrolujte preferencie"
 
-#: clientgui/MainDocument.cpp:2448
+#: clientgui/MainDocument.cpp:2449
 msgid "computer is not in use"
 msgstr "počítač nie je používaný"
 
-#: clientgui/MainDocument.cpp:2449
+#: clientgui/MainDocument.cpp:2450
 msgid "starting up"
 msgstr "spúšťa sa"
 
-#: clientgui/MainDocument.cpp:2450
+#: clientgui/MainDocument.cpp:2451
 msgid "an exclusive app is running"
 msgstr "beží aplikácia vo výhradnom režime"
 
-#: clientgui/MainDocument.cpp:2451
+#: clientgui/MainDocument.cpp:2452
 msgid "CPU is busy"
 msgstr "procesor je vyťažený"
 
-#: clientgui/MainDocument.cpp:2452
+#: clientgui/MainDocument.cpp:2453
 msgid "network bandwidth limit exceeded"
 msgstr "prekročený limit prenosu dát"
 
-#: clientgui/MainDocument.cpp:2453
+#: clientgui/MainDocument.cpp:2454
 msgid "requested by operating system"
 msgstr "vyžiadané operačným systémom"
 
-#: clientgui/MainDocument.cpp:2455
+#: clientgui/MainDocument.cpp:2456
 msgid "unknown reason"
 msgstr "neznámy dôvod"
 
-#: clientgui/MainDocument.cpp:2477
+#: clientgui/MainDocument.cpp:2478
 msgid "GPU missing, "
 msgstr "GPU sa nenašlo, "
 
-#: clientgui/MainDocument.cpp:2484
+#: clientgui/MainDocument.cpp:2485
 msgid "New"
 msgstr "Nová"
 
-#: clientgui/MainDocument.cpp:2488
+#: clientgui/MainDocument.cpp:2489
 msgid "Download failed"
 msgstr "Stiahnutie zlyhalo"
 
-#: clientgui/MainDocument.cpp:2490
+#: clientgui/MainDocument.cpp:2491
 msgid "Downloading"
 msgstr "Sťahovanie"
 
-#: clientgui/MainDocument.cpp:2492 clientgui/MainDocument.cpp:2551
+#: clientgui/MainDocument.cpp:2493 clientgui/MainDocument.cpp:2552
 msgid " (suspended - "
 msgstr " (pozastavené - "
 
-#: clientgui/MainDocument.cpp:2500
+#: clientgui/MainDocument.cpp:2501
 msgid "Project suspended by user"
 msgstr "Projekt pozastavený používateľom"
 
-#: clientgui/MainDocument.cpp:2502
+#: clientgui/MainDocument.cpp:2503
 msgid "Task suspended by user"
 msgstr "Úloha pozastavená používateľom"
 
 #. an NCI process can be running even though computation is suspended
 #. (because of <dont_suspend_nci>
-#: clientgui/MainDocument.cpp:2507
+#: clientgui/MainDocument.cpp:2508
 msgid "Suspended - "
 msgstr "Pozastavené - "
 
-#: clientgui/MainDocument.cpp:2510
+#: clientgui/MainDocument.cpp:2511
 msgid "GPU suspended - "
 msgstr "GPU pozastavené - "
 
-#: clientgui/MainDocument.cpp:2514
+#: clientgui/MainDocument.cpp:2515
 msgid "Waiting for memory"
 msgstr "Čakanie na pamäť"
 
-#: clientgui/MainDocument.cpp:2516
+#: clientgui/MainDocument.cpp:2517
 msgid "Waiting for shared memory"
 msgstr "Čakanie na zdieľanú pamäť"
 
-#: clientgui/MainDocument.cpp:2518
+#: clientgui/MainDocument.cpp:2519
 msgid "Running"
 msgstr "Počítanie"
 
-#: clientgui/MainDocument.cpp:2520
+#: clientgui/MainDocument.cpp:2521
 msgid " (non-CPU-intensive)"
 msgstr " (nenáročný na procesor)"
 
-#: clientgui/MainDocument.cpp:2523
+#: clientgui/MainDocument.cpp:2524
 msgid "Waiting to run"
 msgstr "Čakanie na výpočet"
 
-#: clientgui/MainDocument.cpp:2525 clientgui/MainDocument.cpp:2528
+#: clientgui/MainDocument.cpp:2526 clientgui/MainDocument.cpp:2529
 msgid "Ready to start"
 msgstr "Pripravená na spustenie"
 
-#: clientgui/MainDocument.cpp:2532
+#: clientgui/MainDocument.cpp:2533
 msgid "Postponed: "
 msgstr "Odložené:"
 
-#: clientgui/MainDocument.cpp:2535
+#: clientgui/MainDocument.cpp:2536
 msgid "Postponed"
 msgstr "Pozastavené"
 
-#: clientgui/MainDocument.cpp:2539
+#: clientgui/MainDocument.cpp:2540
 msgid "Waiting for network access"
 msgstr "Čakanie na prístup k sieti"
 
-#: clientgui/MainDocument.cpp:2543
+#: clientgui/MainDocument.cpp:2544
 msgid "Computation error"
 msgstr "Chyba výpočtu"
 
-#: clientgui/MainDocument.cpp:2547
+#: clientgui/MainDocument.cpp:2548
 msgid "Upload failed"
 msgstr "Odoslanie zlyhalo"
 
-#: clientgui/MainDocument.cpp:2549
+#: clientgui/MainDocument.cpp:2550
 msgid "Uploading"
 msgstr "Odosielanie"
 
-#: clientgui/MainDocument.cpp:2560
+#: clientgui/MainDocument.cpp:2561
 msgid "Aborted by user"
 msgstr "Zrušená používateľom"
 
-#: clientgui/MainDocument.cpp:2563
+#: clientgui/MainDocument.cpp:2564
 msgid "Aborted by project"
 msgstr "Zrušená projektom"
 
-#: clientgui/MainDocument.cpp:2566
+#: clientgui/MainDocument.cpp:2567
 msgid "Aborted: not started by deadline"
 msgstr "Zrušené: výpočet sa nezačal do určeného termínu"
 
-#: clientgui/MainDocument.cpp:2569
+#: clientgui/MainDocument.cpp:2570
 msgid "Aborted: task disk limit exceeded"
 msgstr "Zrušené: úloha prekročila limit na disku"
 
-#: clientgui/MainDocument.cpp:2572
+#: clientgui/MainDocument.cpp:2573
 msgid "Aborted: run time limit exceeded"
 msgstr "Zrušené: prekročený limit na dĺžku výpočtu"
 
-#: clientgui/MainDocument.cpp:2575
+#: clientgui/MainDocument.cpp:2576
 msgid "Aborted: memory limit exceeded"
 msgstr "Zrušené: prekročený limit použitej pamäte"
 
-#: clientgui/MainDocument.cpp:2578
+#: clientgui/MainDocument.cpp:2579
 msgid "Aborted"
 msgstr "Zrušená"
 
-#: clientgui/MainDocument.cpp:2583
+#: clientgui/MainDocument.cpp:2584
 msgid "Acknowledged"
 msgstr "Potvrdená"
 
-#: clientgui/MainDocument.cpp:2585
+#: clientgui/MainDocument.cpp:2586
 msgid "Ready to report"
 msgstr "Pripravená na odoslanie"
 
-#: clientgui/MainDocument.cpp:2587
+#: clientgui/MainDocument.cpp:2588
 #, c-format
 msgid "Error: invalid state '%d'"
 msgstr "Chyba: neplatný stav '%d'"
@@ -2949,7 +2969,7 @@ msgid "'%s' does not contain a valid path."
 msgstr "'%s' neobsahuje správnu cestu."
 
 #. Setup View
-#: clientgui/ViewMessages.cpp:84 clientgui/ViewProjects.cpp:200
+#: clientgui/ViewMessages.cpp:84 clientgui/ViewProjects.cpp:198
 #: clientgui/ViewStatistics.cpp:1952 clientgui/ViewTransfers.cpp:183
 #: clientgui/ViewWork.cpp:207
 msgid "Commands"
@@ -3007,17 +3027,17 @@ msgstr "Zatiaľ neexistujú žiadne oznamy."
 msgid "Notices"
 msgstr "Oznamy"
 
-#: clientgui/ViewProjects.cpp:204 clientgui/sg_ProjectCommandPopup.cpp:66
+#: clientgui/ViewProjects.cpp:202 clientgui/sg_ProjectCommandPopup.cpp:66
 msgid "Update"
 msgstr "Aktualizovať"
 
-#: clientgui/ViewProjects.cpp:205 clientgui/sg_ProjectCommandPopup.cpp:67
+#: clientgui/ViewProjects.cpp:203 clientgui/sg_ProjectCommandPopup.cpp:67
 msgid ""
 "Report all completed tasks, get latest credit, get latest preferences, and "
 "possibly get more tasks."
 msgstr "Odoslať všetky dokončené úlohy, získať posledný kredit, získať posledné preferencie a ak je možné získať ďalšie úlohy."
 
-#: clientgui/ViewProjects.cpp:211 clientgui/ViewProjects.cpp:810
+#: clientgui/ViewProjects.cpp:209 clientgui/ViewProjects.cpp:808
 #: clientgui/ViewWork.cpp:232 clientgui/ViewWork.cpp:888
 #: clientgui/sg_BoincSimpleFrame.cpp:893
 #: clientgui/sg_ProjectCommandPopup.cpp:72
@@ -3026,196 +3046,196 @@ msgstr "Odoslať všetky dokončené úlohy, získať posledný kredit, získať
 msgid "Suspend"
 msgstr "Pozastaviť"
 
-#: clientgui/ViewProjects.cpp:212 clientgui/ViewProjects.cpp:810
+#: clientgui/ViewProjects.cpp:210 clientgui/ViewProjects.cpp:808
 #: clientgui/sg_ProjectCommandPopup.cpp:73
 #: clientgui/sg_ProjectCommandPopup.cpp:129
 msgid "Suspend tasks for this project."
 msgstr "Pozastaviť úlohy pre tento projekt."
 
-#: clientgui/ViewProjects.cpp:218 clientgui/ViewProjects.cpp:829
+#: clientgui/ViewProjects.cpp:216 clientgui/ViewProjects.cpp:827
 #: clientgui/sg_ProjectCommandPopup.cpp:78
 #: clientgui/sg_ProjectCommandPopup.cpp:136
 msgid "No new tasks"
 msgstr "Žiadne nové úlohy"
 
-#: clientgui/ViewProjects.cpp:219 clientgui/sg_ProjectCommandPopup.cpp:79
+#: clientgui/ViewProjects.cpp:217 clientgui/sg_ProjectCommandPopup.cpp:79
 msgid "Don't get new tasks for this project."
 msgstr "Nezískať nové úlohy pre tento projekt."
 
-#: clientgui/ViewProjects.cpp:225 clientgui/sg_ProjectCommandPopup.cpp:84
+#: clientgui/ViewProjects.cpp:223 clientgui/sg_ProjectCommandPopup.cpp:84
 msgid "Reset project"
 msgstr "Resetovať projekt"
 
-#: clientgui/ViewProjects.cpp:226 clientgui/sg_ProjectCommandPopup.cpp:85
+#: clientgui/ViewProjects.cpp:224 clientgui/sg_ProjectCommandPopup.cpp:85
 msgid ""
 "Delete all files and tasks associated with this project, and get new tasks."
 "  You can update the project first to report any completed tasks."
 msgstr "Vymazať všetky súbory a úlohy spojené s týmto projektom a získať nové úlohy.  Mali by ste najskôr aktualizovať projekt pre odoslanie všetkých dokončených úloh."
 
-#: clientgui/ViewProjects.cpp:233 clientgui/sg_ProjectCommandPopup.cpp:91
+#: clientgui/ViewProjects.cpp:231 clientgui/sg_ProjectCommandPopup.cpp:91
 msgid ""
 "Remove this project.  Tasks in progress will be lost (use 'Update' first to "
 "report any completed tasks)."
 msgstr "Odpojiť počítač od tohto projektu.  Rozpracované úlohy budú stratené (použite najskôr 'Aktualizovať' pre odoslanie všetkých dokončených úloh)."
 
-#: clientgui/ViewProjects.cpp:239 clientgui/ViewWork.cpp:246
+#: clientgui/ViewProjects.cpp:237 clientgui/ViewWork.cpp:246
 #: clientgui/sg_ProjectCommandPopup.cpp:96
 #: clientgui/sg_TaskCommandPopup.cpp:84
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: clientgui/ViewProjects.cpp:240 clientgui/sg_ProjectCommandPopup.cpp:97
+#: clientgui/ViewProjects.cpp:238 clientgui/sg_ProjectCommandPopup.cpp:97
 msgid "Show project details."
 msgstr "Zobraziť detaily projektu."
 
-#: clientgui/ViewProjects.cpp:254 clientgui/ViewStatistics.cpp:426
+#: clientgui/ViewProjects.cpp:252 clientgui/ViewStatistics.cpp:426
 msgid "Account"
 msgstr "Konto"
 
-#: clientgui/ViewProjects.cpp:256
+#: clientgui/ViewProjects.cpp:254
 msgid "Work done"
 msgstr "Kredit"
 
-#: clientgui/ViewProjects.cpp:257
+#: clientgui/ViewProjects.cpp:255
 msgid "Avg. work done"
 msgstr "Denný priemer"
 
-#: clientgui/ViewProjects.cpp:259 clientgui/ViewTransfers.cpp:215
+#: clientgui/ViewProjects.cpp:257 clientgui/ViewTransfers.cpp:215
 #: clientgui/ViewWork.cpp:262
 msgid "Status"
 msgstr "Stav"
 
-#: clientgui/ViewProjects.cpp:338
+#: clientgui/ViewProjects.cpp:336
 msgid "Projects"
 msgstr "Projekty"
 
-#: clientgui/ViewProjects.cpp:390
+#: clientgui/ViewProjects.cpp:388
 msgid "Updating project..."
 msgstr "Aktualizácia projektu..."
 
-#: clientgui/ViewProjects.cpp:432
+#: clientgui/ViewProjects.cpp:430
 msgid "Resuming project..."
 msgstr "Pokračovanie projektu..."
 
-#: clientgui/ViewProjects.cpp:436
+#: clientgui/ViewProjects.cpp:434
 msgid "Suspending project..."
 msgstr "Pozastavenie projektu..."
 
-#: clientgui/ViewProjects.cpp:473
+#: clientgui/ViewProjects.cpp:471
 msgid "Telling project to allow additional task downloads..."
 msgstr "Pokyn projektu, aby stiahol ďalšie úlohy..."
 
-#: clientgui/ViewProjects.cpp:477
+#: clientgui/ViewProjects.cpp:475
 msgid "Telling project to not fetch any additional tasks..."
 msgstr "Pokyn projektu, aby nesťahoval žiadne ďalšie úlohy..."
 
-#: clientgui/ViewProjects.cpp:513
+#: clientgui/ViewProjects.cpp:511
 msgid "Resetting project..."
 msgstr "Resetovanie projektu..."
 
-#: clientgui/ViewProjects.cpp:526 clientgui/sg_ProjectCommandPopup.cpp:229
+#: clientgui/ViewProjects.cpp:524 clientgui/sg_ProjectCommandPopup.cpp:229
 #, c-format
 msgid "Are you sure you want to reset project '%s'?"
 msgstr "Ste si istý, že chcete resetovať projekt '%s'?"
 
-#: clientgui/ViewProjects.cpp:532 clientgui/sg_ProjectCommandPopup.cpp:235
+#: clientgui/ViewProjects.cpp:530 clientgui/sg_ProjectCommandPopup.cpp:235
 msgid "Reset Project"
 msgstr "Resetovať projekt"
 
-#: clientgui/ViewProjects.cpp:571
+#: clientgui/ViewProjects.cpp:569
 msgid "Removing project..."
 msgstr "Odstraňovanie projektu..."
 
-#: clientgui/ViewProjects.cpp:584 clientgui/sg_ProjectCommandPopup.cpp:266
+#: clientgui/ViewProjects.cpp:582 clientgui/sg_ProjectCommandPopup.cpp:266
 #, c-format
 msgid "Are you sure you want to remove project '%s'?"
 msgstr "Ste si istý, že chcete odpojiť projekt '%s'?"
 
-#: clientgui/ViewProjects.cpp:590 clientgui/sg_ProjectCommandPopup.cpp:272
+#: clientgui/ViewProjects.cpp:588 clientgui/sg_ProjectCommandPopup.cpp:272
 msgid "Remove Project"
 msgstr "Odstrániť projekt"
 
-#: clientgui/ViewProjects.cpp:631 clientgui/ViewWork.cpp:686
+#: clientgui/ViewProjects.cpp:629 clientgui/ViewWork.cpp:686
 msgid "Launching browser..."
 msgstr "Spúšťanie webového prehliadača..."
 
-#: clientgui/ViewProjects.cpp:806 clientgui/sg_ProjectCommandPopup.cpp:126
+#: clientgui/ViewProjects.cpp:804 clientgui/sg_ProjectCommandPopup.cpp:126
 msgid "Resume tasks for this project."
 msgstr "Pokračovať na úlohách pre tento projekt."
 
-#: clientgui/ViewProjects.cpp:825 clientgui/sg_ProjectCommandPopup.cpp:133
+#: clientgui/ViewProjects.cpp:823 clientgui/sg_ProjectCommandPopup.cpp:133
 msgid "Allow new tasks"
 msgstr "Povoliť nové úlohy"
 
-#: clientgui/ViewProjects.cpp:825 clientgui/sg_ProjectCommandPopup.cpp:134
+#: clientgui/ViewProjects.cpp:823 clientgui/sg_ProjectCommandPopup.cpp:134
 msgid "Allow fetching new tasks for this project."
 msgstr "Povoliť sťahovanie nových úloh pre tento projekt."
 
-#: clientgui/ViewProjects.cpp:829 clientgui/sg_ProjectCommandPopup.cpp:137
+#: clientgui/ViewProjects.cpp:827 clientgui/sg_ProjectCommandPopup.cpp:137
 msgid "Don't fetch new tasks for this project."
 msgstr "Nesťahovať nové úlohy pre tento projekt."
 
-#: clientgui/ViewProjects.cpp:1133
+#: clientgui/ViewProjects.cpp:1131
 msgid "Requested by user"
 msgstr "Vyžiadané používateľom"
 
-#: clientgui/ViewProjects.cpp:1134
+#: clientgui/ViewProjects.cpp:1132
 msgid "To fetch work"
 msgstr "Získať ďalšiu prácu"
 
-#: clientgui/ViewProjects.cpp:1135
+#: clientgui/ViewProjects.cpp:1133
 msgid "To report completed tasks"
 msgstr "Nahlásiť dokončené úlohy"
 
-#: clientgui/ViewProjects.cpp:1136
+#: clientgui/ViewProjects.cpp:1134
 msgid "To send trickle-up message"
 msgstr "Odoslať rýchlu správu o stave"
 
-#: clientgui/ViewProjects.cpp:1137
+#: clientgui/ViewProjects.cpp:1135
 msgid "Requested by account manager"
 msgstr "Vyžiadané Správcom konta"
 
-#: clientgui/ViewProjects.cpp:1138
+#: clientgui/ViewProjects.cpp:1136
 msgid "Project initialization"
 msgstr "Prvotné nastavenie projektu"
 
-#: clientgui/ViewProjects.cpp:1139
+#: clientgui/ViewProjects.cpp:1137
 msgid "Requested by project"
 msgstr "Vyžiadané projektom"
 
-#: clientgui/ViewProjects.cpp:1140
+#: clientgui/ViewProjects.cpp:1138
 msgid "Unknown reason"
 msgstr "Neznámy dôvod"
 
-#: clientgui/ViewProjects.cpp:1154
+#: clientgui/ViewProjects.cpp:1152
 msgid "Suspended by user"
 msgstr "Pozastavené používateľom"
 
-#: clientgui/ViewProjects.cpp:1157
+#: clientgui/ViewProjects.cpp:1155
 msgid "Won't get new tasks"
 msgstr "Nebudú získané nové úlohy"
 
-#: clientgui/ViewProjects.cpp:1160
+#: clientgui/ViewProjects.cpp:1158
 msgid "Project ended - OK to remove"
 msgstr "Projekt je ukončený - je možné sa od neho odpojiť"
 
-#: clientgui/ViewProjects.cpp:1163
+#: clientgui/ViewProjects.cpp:1161
 msgid "Will remove when tasks done"
 msgstr "Bude odpojený po skončení úloh"
 
-#: clientgui/ViewProjects.cpp:1166
+#: clientgui/ViewProjects.cpp:1164
 msgid "Scheduler request pending"
 msgstr "Žiadosť plánovača nevyriešená"
 
-#: clientgui/ViewProjects.cpp:1172
+#: clientgui/ViewProjects.cpp:1170
 msgid "Scheduler request in progress"
 msgstr "Spracováva sa požiadavka plánovača"
 
-#: clientgui/ViewProjects.cpp:1175
+#: clientgui/ViewProjects.cpp:1173
 msgid "Trickle up message pending"
 msgstr "Rýchla správa o stave čaká na odoslanie"
 
-#: clientgui/ViewProjects.cpp:1181
+#: clientgui/ViewProjects.cpp:1179
 msgid "Communication deferred"
 msgstr "Komunikácia odložená"
 
@@ -3247,7 +3267,7 @@ msgstr "voľné, nedostupné pre BOINC: "
 msgid "free: "
 msgstr "voľné: "
 
-#: clientgui/ViewResources.cpp:299
+#: clientgui/ViewResources.cpp:298
 msgid "used by other programs: "
 msgstr "používané inými programami: "
 
@@ -3458,35 +3478,35 @@ msgstr "Ste si istý, že chcete zrušiť prenos tohoto súboru '%s'?\nPOZNÁMKA
 msgid "Abort File Transfer"
 msgstr "Zrušiť prenos súboru"
 
-#: clientgui/ViewTransfers.cpp:864
+#: clientgui/ViewTransfers.cpp:845
 msgid "Upload"
 msgstr "Odosielanie"
 
-#: clientgui/ViewTransfers.cpp:864
+#: clientgui/ViewTransfers.cpp:845
 msgid "Download"
 msgstr "Sťahovanie"
 
-#: clientgui/ViewTransfers.cpp:868
+#: clientgui/ViewTransfers.cpp:849
 msgid "retry in "
 msgstr "zopakuje sa o "
 
-#: clientgui/ViewTransfers.cpp:870
+#: clientgui/ViewTransfers.cpp:851
 msgid "failed"
 msgstr "zlyhalo"
 
-#: clientgui/ViewTransfers.cpp:873
+#: clientgui/ViewTransfers.cpp:854
 msgid "suspended"
 msgstr "pozastavené"
 
-#: clientgui/ViewTransfers.cpp:878
+#: clientgui/ViewTransfers.cpp:859
 msgid "active"
 msgstr "prebieha"
 
-#: clientgui/ViewTransfers.cpp:880
+#: clientgui/ViewTransfers.cpp:861
 msgid "pending"
 msgstr "čaká"
 
-#: clientgui/ViewTransfers.cpp:887
+#: clientgui/ViewTransfers.cpp:867
 msgid " (project backoff: "
 msgstr " (odsunutie projektu: "
 
@@ -3669,7 +3689,7 @@ msgstr "Pokračovať vo výpočtoch"
 msgid "Open a window to view notices from projects or BOINC"
 msgstr "Otvoriť okno zobrazujúce oznamy z projektov a BOINC"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:934 clientgui/sg_DlgPreferences.cpp:364
+#: clientgui/sg_BoincSimpleFrame.cpp:934 clientgui/sg_DlgPreferences.cpp:366
 #, c-format
 msgid "Get help with %s"
 msgstr "Získať pomoc s %s"
@@ -3683,21 +3703,21 @@ msgstr "Zatvoriť"
 msgid "%s - Notices"
 msgstr "%s - Oznamy"
 
-#: clientgui/sg_DlgPreferences.cpp:206
+#: clientgui/sg_DlgPreferences.cpp:208
 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:344
+#: clientgui/sg_DlgPreferences.cpp:346
 msgid "GB of disk space"
 msgstr "Miesto na disku (GB)"
 
-#: clientgui/sg_DlgPreferences.cpp:1093
+#: clientgui/sg_DlgPreferences.cpp:1105
 #, c-format
 msgid "%s - Computing Preferences"
 msgstr "%s - &Preferencie počítania"
 
-#: clientgui/sg_DlgPreferences.cpp:1174
+#: clientgui/sg_DlgPreferences.cpp:1186
 msgid "Discard all local preferences and use web-based preferences?"
 msgstr "Odstrániť lokálne nastavenia a použiť nastavenia z webstránky projektu?"
 
@@ -3734,12 +3754,12 @@ msgstr "Webstránky projektu"
 msgid "Project Commands"
 msgstr "Príkazy projektu"
 
-#: clientgui/sg_ProjectPanel.cpp:276
+#: clientgui/sg_ProjectPanel.cpp:278
 #, c-format
 msgid "Pop up a menu of web sites for project %s"
 msgstr "Zobraziť ponuku webových stránok projektu %s"
 
-#: clientgui/sg_ProjectPanel.cpp:278
+#: clientgui/sg_ProjectPanel.cpp:280
 #, c-format
 msgid "Pop up a menu of commands to apply to project %s"
 msgstr "Zobraziť menu príkazov pre projekt %s"
@@ -3826,51 +3846,51 @@ msgstr "Zostáva (odhad): %s"
 msgid "Status: %s"
 msgstr "Stav: %s"
 
-#: clientgui/sg_TaskPanel.cpp:1229
+#: clientgui/sg_TaskPanel.cpp:1206
 msgid "Retrieving current status."
 msgstr "Obnovovanie aktuálneho stavu."
 
-#: clientgui/sg_TaskPanel.cpp:1235
+#: clientgui/sg_TaskPanel.cpp:1212
 msgid "Downloading work from the server."
 msgstr "Sťahovanie práce zo servera."
 
-#: clientgui/sg_TaskPanel.cpp:1240
+#: clientgui/sg_TaskPanel.cpp:1217
 msgid "Processing Suspended:  Running On Batteries."
 msgstr "Spracovanie pozastavené:  Beh na batérie."
 
-#: clientgui/sg_TaskPanel.cpp:1242
+#: clientgui/sg_TaskPanel.cpp:1219
 msgid "Processing Suspended:  User Active."
 msgstr "Spracovanie pozastavené:  Používateľ pracuje."
 
-#: clientgui/sg_TaskPanel.cpp:1244
+#: clientgui/sg_TaskPanel.cpp:1221
 msgid "Processing Suspended:  User paused processing."
 msgstr "Spracovanie pozastavené: Používateľ pozastavil spracovanie."
 
-#: clientgui/sg_TaskPanel.cpp:1246
+#: clientgui/sg_TaskPanel.cpp:1223
 msgid "Processing Suspended:  Time of Day."
 msgstr "Spracovanie pozastavené:  Denná doba."
 
-#: clientgui/sg_TaskPanel.cpp:1248
+#: clientgui/sg_TaskPanel.cpp:1225
 msgid "Processing Suspended:  Benchmarks Running."
 msgstr "Spracovanie pozastavené:  Bežia testy rýchlosti."
 
-#: clientgui/sg_TaskPanel.cpp:1250
+#: clientgui/sg_TaskPanel.cpp:1227
 msgid "Processing Suspended."
 msgstr "Spracovanie pozastavené."
 
-#: clientgui/sg_TaskPanel.cpp:1254
+#: clientgui/sg_TaskPanel.cpp:1231
 msgid "Waiting to contact project servers."
 msgstr "Čakanie na spojenie so servermi projektu."
 
-#: clientgui/sg_TaskPanel.cpp:1258 clientgui/sg_TaskPanel.cpp:1267
+#: clientgui/sg_TaskPanel.cpp:1235 clientgui/sg_TaskPanel.cpp:1244
 msgid "Retrieving current status"
 msgstr "Obnovovanie aktuálneho stavu"
 
-#: clientgui/sg_TaskPanel.cpp:1262
+#: clientgui/sg_TaskPanel.cpp:1239
 msgid "No work available to process"
 msgstr "Nie je dostupná žiadna práca na spracovanie"
 
-#: clientgui/sg_TaskPanel.cpp:1264
+#: clientgui/sg_TaskPanel.cpp:1241
 msgid "Unable to connect to the core client"
 msgstr "Zlyhalo pripojenie ku klientovi"
 
diff --git a/locale/sk/BOINC-Project-Generic.po b/locale/sk/BOINC-Project-Generic.po
index 7ba0278..39bf723 100644
--- a/locale/sk/BOINC-Project-Generic.po
+++ b/locale/sk/BOINC-Project-Generic.po
@@ -13,9 +13,9 @@ msgstr ""
 "Project-Id-Version: BOINC\n"
 "Report-Msgid-Bugs-To: BOINC translation team <boinc_loc at boinc.berkeley.edu>\n"
 "POT-Creation-Date: 2015-06-24 13:05 PDT\n"
-"PO-Revision-Date: 2015-07-11 20:26+0000\n"
+"PO-Revision-Date: 2015-11-30 23:30+0000\n"
 "Last-Translator: aceman\n"
-"Language-Team: Slovak (http://www.transifex.com/p/boinc/language/sk/)\n"
+"Language-Team: Slovak (http://www.transifex.com/boinc/boinc/language/sk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -278,7 +278,7 @@ msgstr "Zobraziť s najväčším počtom správ ako prvé"
 
 #: ../inc/forum.inc:104
 msgid "Volunteer moderator"
-msgstr "Prihlásiť sa ako moderátor"
+msgstr "Dobrovoľný moderátor"
 
 #: ../inc/forum.inc:105
 msgid "Project administrator"
@@ -290,19 +290,19 @@ msgstr "Vývojár projektu"
 
 #: ../inc/forum.inc:107
 msgid "Project tester"
-msgstr "Tester"
+msgstr "Tester projektu"
 
 #: ../inc/forum.inc:108
 msgid "Volunteer developer"
-msgstr "Prihlásiť sa ako vývojár"
+msgstr "Dobrovoľný vývojár"
 
 #: ../inc/forum.inc:109
 msgid "Volunteer tester"
-msgstr "Prihlásiť sa ako tester"
+msgstr "Dobrovoľný tester"
 
 #: ../inc/forum.inc:110
 msgid "Project scientist"
-msgstr "Vedec"
+msgstr "Vedec projektu"
 
 #: ../inc/forum.inc:111
 msgid "Help desk expert"
diff --git a/locale/zh_TW/BOINC-Drupal.po b/locale/zh_TW/BOINC-Drupal.po
new file mode 100644
index 0000000..09c7dc2
--- /dev/null
+++ b/locale/zh_TW/BOINC-Drupal.po
@@ -0,0 +1,1732 @@
+# LANGUAGE translation of PROJECT
+# Copyright (c) YEAR NAME <EMAIL at ADDRESS>
+# 
+# Translators:
+# Po-Chun Huang <aphroteus at gmail.com>, 2015
+msgid ""
+msgstr ""
+"Project-Id-Version: BOINC\n"
+"POT-Creation-Date: 2015-08-14 09:37+0000\n"
+"PO-Revision-Date: 2015-11-26 20:42+0000\n"
+"Last-Translator: Mingye Wang <arthur200126 at gmail.com>\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/boinc/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"
+
+msgid "No account exists for @email -- select \"Create new account\" to register"
+msgstr "名為 @email 的帳號不存在 —— 選擇\"建立帳號\"來註冊"
+
+msgid "My team"
+msgstr "我的團隊"
+
+msgid "You are a member of @team."
+msgstr "你是 @team 的成員。"
+
+msgid "View my team"
+msgstr "檢視我的團隊"
+
+msgid "Invalid setting for \"%preference\""
+msgstr "\"%偏好\"設定無效"
+
+msgid ""
+"You must earn @count more credits to be able to post comments on this site."
+msgstr "你還需要得到 @count 積分才能在這個網站上發表評論。"
+
+msgid "Moderation"
+msgstr "仲裁"
+
+msgid "Unvetted profiles"
+msgstr "已驗證的使用者檔案"
+
+msgid "Reason for banning this user"
+msgstr "封禁此使用者的理由"
+
+msgid ""
+"This reason will be included in an email to the user. Please write a brief "
+"explanation of why the user is being banned."
+msgstr "這個原因將列入給使用者的電子郵件。請寫一個簡短解釋為什麼使用者被禁止。"
+
+msgid "Duration of the ban"
+msgstr "這項禁令的持續時間"
+
+msgid "The number of days until the ban expires. Set to 0 to ban permanently."
+msgstr "這項禁令有效期的天數。設定為 0,永久禁止。"
+
+msgid "Lift user ban"
+msgstr "取消使用者禁令"
+
+msgid "You are banned from community participation until @date"
+msgstr "你被禁止參與社群直到 @date"
+
+msgid "Computers @old_ids have been merged successfully into @id."
+msgstr "計算機 @old_id 已被成功合併到 @id。"
+
+msgid "A team named \"@name\" already exists."
+msgstr "名為\"@name\"的團隊已經存在。"
+
+msgid "Post topic"
+msgstr "發表主題"
+
+msgid "Please enter your email address"
+msgstr "請輸入您的電子郵件地址"
+
+msgid "Password entered is not valid. Please verify that it is correct."
+msgstr "輸入的密碼是無效的。請驗證它的正確性。"
+
+msgid "Make founder"
+msgstr "指定創始人"
+
+msgid "!site: comment posted to \"!topic_name\""
+msgstr "!site: 對主題 \"!topic_name\" 發表了評論"
+
+msgid "!author has posted a reply to \"!topic_name\"."
+msgstr "!author 回覆了主題 \"!topic_name\"."
+
+msgid ""
+"To view this topic at !site, click here: \n"
+"!comment_url"
+msgstr "若要在本主題檢視 !site,請單擊此處:\n!comment_url"
+
+msgid "At least one application must be selected"
+msgstr "必須選擇至少一個應用程式"
+
+msgid "Forgot password"
+msgstr "忘記密碼"
+
+msgid ""
+"Enter your email address to receive instructions for resetting your "
+"password."
+msgstr "輸入您的電子郵件地址來接收關於重置密碼的指示。"
+
+msgid "Revise or post comment"
+msgstr "修改或發表評論"
+
+msgid "discuss"
+msgstr "討論"
+
+msgid "Your community preferences have been updated."
+msgstr "已更新您的社群參數設定。"
+
+msgid "Unlock this thread for comments"
+msgstr "解鎖此主題的評論"
+
+msgid "Authenticator login"
+msgstr "驗證器登入"
+
+msgid "Create content"
+msgstr "建立內容"
+
+msgid "authenticator-based login"
+msgstr "基於身份驗證器登入"
+
+msgid ""
+"Enter your email address to receive instructions for resetting your password"
+" (or use the !authenticator_login)."
+msgstr "輸入您的電子郵件地址以便收到重置密碼的指示 (或使用 !authenticator_login)。"
+
+msgid ""
+"If you forgot your account's email address, or you can't receive email "
+"there:"
+msgstr "如果你已經忘記了你賬戶所關聯的電子郵箱地址,或者你已經不能從該地址接收電子郵件:"
+
+msgid ""
+"If you have run BOINC under the account, you can still access it. Here's "
+"how:"
+msgstr "如果您已經在帳號下執行 BOINC,您仍然可以訪問它。這裡是方法:"
+
+msgid ""
+"Go to the BOINC data directory on your computer (on Windows this is usually "
+"%path1 or %path2."
+msgstr "開啟你計算機上的 BOINC 資料路徑 (在 Windows 上這通常是 %path1 或 %path2。"
+
+msgid ""
+"Find your account file for this project; it will have a name like %file "
+"(where the project URL is %url)."
+msgstr "找到本專案的賬戶檔案;檔名像 %檔案 (如專案 URL 是 %url)。"
+
+msgid ""
+"Open the file in a text editor like Notepad. You'll see something like:"
+msgstr "用記事本等文字編輯器開啟該檔案,你將看到類似的如下內容:"
+
+msgid ""
+"Select and Copy the string between <authenticator> and "
+"</authenticator> (%auth in the above example)."
+msgstr "選中並複製< authenticator> 和 &lt之間的字元串;/authenticator> (上述例子中就應該是%auth )。"
+
+msgid "There is no account with that authenticator."
+msgstr "沒有賬戶關聯至此身份驗證碼。"
+
+msgid ""
+"Go to the <a href=\"%wikiref\">BOINC data directory</a> on your computer (on"
+" Windows this is usually %path1 or %path2."
+msgstr "開啟你計算機上的<a href=\"%wikiref\">BOINC 資料目錄</a>(在 Windows 上這通常是 %path1 或 %path2。"
+
+msgid "BOINC documentation"
+msgstr "BOINC 文件"
+
+msgid ""
+"Go to the BOINC data directory on your computer (see !boinc_wiki for help "
+"finding this)."
+msgstr "開啟你計算機上的 BOINC 資料資料夾(請參見!boinc_wiki來幫助您找到這個資料夾)。"
+
+msgid ""
+"@count days have elapsed since your request and the founder has not "
+"responded."
+msgstr "創始人已經有@count 天沒有響應您的請求。"
+
+msgid ""
+"You now have @count days to assume foundership before another team member "
+"may submit a request."
+msgstr "你現在需要在 @count 天內確認創始人資格,否則另一個團隊成員就可以申請成為創始人。"
+
+msgid "Unhide this comment"
+msgstr "取消隱藏此回覆"
+
+msgid "@email is not a well formed email address, please verify"
+msgstr "@email 不是一個適當格式的電子郵件地址,請驗證"
+
+msgid "Email address"
+msgstr "電子郵件地址"
+
+msgid "Home"
+msgstr "首頁"
+
+msgid "Login"
+msgstr "登入"
+
+msgid "search"
+msgstr "搜尋"
+
+msgid "Server status"
+msgstr "伺服器狀態"
+
+msgid "Language"
+msgstr "語言"
+
+msgid "Enter your @s email address."
+msgstr "請輸入您的 @s 電子郵件地址。"
+
+msgid "Join now"
+msgstr "現在加入"
+
+msgid "I'm new"
+msgstr "我是個新人"
+
+msgid "I'm a BOINC user"
+msgstr "我是一個 BOINC 使用者"
+
+msgid "Welcome back!"
+msgstr "歡迎回來!"
+
+msgid ""
+"Einstein at Home is a program that uses your computer's idle time to run a "
+"screensaver to search for gravitational waves from spinning neutron stars "
+"(also called pulsars) using data from the LIGO gravitational wave detector."
+msgstr "Einstein at Home 專案使用您計算機的空閒時間來搜尋從脈衝星發出的引力波。所使用的資料由 LIGO 引力波探測器提供。"
+
+msgid "Learn more"
+msgstr "瞭解更多資訊"
+
+msgid "View account"
+msgstr "檢視帳號"
+
+msgid "About our screensaver"
+msgstr "關於我們的螢幕保護程式"
+
+msgid "Over 500,000 volunteers and counting."
+msgstr "超過50萬名並還在繼續增加的志願者"
+
+msgid "Windows"
+msgstr "Windows"
+
+msgid "Mac"
+msgstr "Mac"
+
+msgid "Linux"
+msgstr "Linux"
+
+msgid "Logout"
+msgstr "登出"
+
+msgid "Name"
+msgstr "名稱"
+
+msgid "Avg credit"
+msgstr "平均積分"
+
+msgid "Total credit"
+msgstr "總積分"
+
+msgid "Enter your password to save changes"
+msgstr "輸入您的密碼以儲存更改"
+
+msgid ""
+"Enter your current password if changing your email\n"
+"          address or password."
+msgstr "如果您要更改電子郵件地址或密碼\n請輸入您的當前密碼。"
+
+msgid "BOINC user ID"
+msgstr "BOINC 使用者 ID"
+
+msgid "Drupal user ID"
+msgstr "Drupal 使用者 ID"
+
+msgid "Account key"
+msgstr "帳號金鑰"
+
+msgid "Weak account key"
+msgstr "密碼太弱"
+
+msgid "Cross-project ID"
+msgstr "跨專案辨識碼 (CPID)"
+
+msgid "Save changes"
+msgstr "儲存更改"
+
+msgid "Cancel"
+msgstr "取消"
+
+msgid "Change password"
+msgstr "修改密碼"
+
+msgid "What is @this_project?"
+msgstr "@this_project 是什麼?"
+
+msgid "no projects..."
+msgstr "沒有專案..."
+
+msgid "Download the desktop software"
+msgstr "下載桌面軟體"
+
+msgid "Run the installer"
+msgstr "執行安裝程式"
+
+msgid "When prompted enter @siteurl"
+msgstr "根據提示輸入 @siteurl"
+
+msgid "Password"
+msgstr "密碼"
+
+msgid "Enter the password that accompanies your username."
+msgstr "輸入使用者名稱對應的密碼"
+
+msgid "Request new password"
+msgstr "請求新密碼"
+
+msgid ""
+"If you're already running BOINC, select <i>Add\n"
+"      Project</i>."
+msgstr "如果你已經在使用 BOINC,選擇<i>增加專案</i>。"
+
+msgid ""
+"If you're running a command-line version of BOINC,\n"
+"        first use the BOINC Manager software (elsewhere if necessary) to create an\n"
+"        an account at this project, then use that account to connect with the\n"
+"        command-line version."
+msgstr "如果你正在使用命令列版本的 BOINC,\n先使用 BOINC Manager 建立該專案的賬戶,\n然後在命令列版本中使用該賬戶來連線。"
+
+msgid ""
+"If you're running a pre-5.0 version of BOINC, please\n"
+"        upgrade to a more recent version to create an account\n"
+"        at this project."
+msgstr "如果你在使用 5.0 之前版本的 BOINC,請升級到更近的版本來建立賬戶。"
+
+msgid ""
+"1) If you know your account's email address, and you can receive email "
+"there:"
+msgstr "1) 如果你知道你的賬戶和電子郵件地址,你可以在這裡接收郵件:"
+
+msgid ""
+"Enter the email address and click OK. You will be sent email instructions "
+"for resetting your password."
+msgstr "輸入電子郵件地址並點選確定,你將會收到電子郵件來指導你來重置你的登入密碼。"
+
+msgid "OK"
+msgstr "確定"
+
+msgid "The latest news from the @site_name project"
+msgstr "來自 @site_name 專案的最新訊息"
+
+msgid "Comment form"
+msgstr "評論表格"
+
+msgid "Total credits"
+msgstr "總積分"
+
+msgid "Recent avg credits"
+msgstr "近期平均積分"
+
+msgid "Country"
+msgstr "國家"
+
+msgid "Type"
+msgstr "類型"
+
+msgid "Founder"
+msgstr "創始人"
+
+msgid "New members in last day"
+msgstr "最新加入成員"
+
+msgid "Total members"
+msgstr "所有成員"
+
+msgid "Active members"
+msgstr "活躍的成員"
+
+msgid "Members with credit"
+msgstr "有積分的成員"
+
+msgid "Description"
+msgstr "描述"
+
+msgid "Search teams"
+msgstr "搜尋團隊"
+
+msgid "Send message"
+msgstr "傳送訊息"
+
+msgid "BOINC"
+msgstr "BOINC"
+
+msgid "Project"
+msgstr "專案"
+
+msgid "Web site"
+msgstr "網站"
+
+msgid "No active computers"
+msgstr "沒有活躍的計算機"
+
+msgid "This user has no computers that have been active in the last 30 days."
+msgstr "使用者在過去 30 天沒有活躍的計算機"
+
+msgid " Default value: @default"
+msgstr "預設值:@default"
+
+msgid "Applications"
+msgstr "程式"
+
+msgid "yes"
+msgstr "是"
+
+msgid "no"
+msgstr "否"
+
+msgid "Message @id"
+msgstr "訊息 @id"
+
+msgid "message @id"
+msgstr "訊息 @id"
+
+msgid " in response to !parent"
+msgstr "回覆 !parent"
+
+msgid "Credits per day"
+msgstr "每日積分"
+
+msgid "Computers hidden"
+msgstr "電腦已隱藏"
+
+msgid "This user has chosen not to show information about their computers."
+msgstr "該使用者已選擇不顯示他的計算機資訊。"
+
+msgid "Stderr output"
+msgstr "標準錯誤輸出"
+
+msgid "@time ago"
+msgstr "@time 之前"
+
+msgid "n/a"
+msgstr "不適用"
+
+msgid "Submitted by !username on !datetime"
+msgstr "由 !username於 !datetime 提交"
+
+msgid "Member since"
+msgstr "成為成員"
+
+msgid "View team"
+msgstr "檢視團隊"
+
+msgid "Friends (@count)"
+msgstr "好友(@count)"
+
+msgid "Website"
+msgstr "網站"
+
+msgid "Locked"
+msgstr "已鎖定"
+
+msgid "Computers pending"
+msgstr "等待的計算機"
+
+msgid ""
+"This user does not yet have any associated computers. Computers will be "
+"displayed when they have earned their first credits."
+msgstr "該使用者沒有關聯的計算機,計算機將在首次得到積分後顯示出來。"
+
+msgid "No results found..."
+msgstr "未找到結果..."
+
+msgid "Background"
+msgstr "背景"
+
+msgid "Teams"
+msgstr "團隊"
+
+msgid ""
+"@project participants may form teams. You may belong to only one team. You "
+"can join or quit a team at any time. To join a team, visit its team page and"
+" click \"Join this team\". Each team has a founder who may:"
+msgstr "@project 專案的參與者可以組成團隊。你只能加入一個團隊。你可以在任何時間加入或退出團隊。要加入團隊,訪問團隊頁面並點選“加入該團隊”。每個團隊都有一個建立人,他可以:"
+
+msgid "access team members' email addresses"
+msgstr "存取團隊成員的電子郵件地址"
+
+msgid "edit the team's name and description"
+msgstr "編輯團隊名稱及描述"
+
+msgid "add or remove team admins"
+msgstr "增加或移除團隊管理員"
+
+msgid "remove members from the team"
+msgstr "移除團隊成員"
+
+msgid "disband a team if it has no members"
+msgstr "解散沒有成員的團隊"
+
+msgid "Create a new team"
+msgstr "建立新團隊"
+
+msgid ""
+"If you cannot find a team that is right for you, you can create a team."
+msgstr "如果找不到對你合適的團隊,你也可以建立一個團隊。"
+
+msgid "You must earn @count more credits!"
+msgstr "你還需要得到 @count 積分!"
+
+msgid "Threads"
+msgstr "主題"
+
+msgid "Posts"
+msgstr "文章"
+
+msgid "Last post"
+msgstr "最新的文章"
+
+msgid "Manage subscriptions"
+msgstr "管理訂閱"
+
+msgid "Featured"
+msgstr "特色"
+
+msgid "Submitted on !datetime"
+msgstr "提交於 !datetime"
+
+msgid "Comments"
+msgstr "評論"
+
+msgid "Opinion"
+msgstr "意見"
+
+msgid "More"
+msgstr "更多"
+
+msgid "Tasks"
+msgstr "任務"
+
+msgid "Generic"
+msgstr "一般"
+
+msgid "Work"
+msgstr "工作"
+
+msgid "School"
+msgstr "學校"
+
+msgid "Presets"
+msgstr "預設"
+
+msgid "Standard"
+msgstr "標準"
+
+msgid "Maximum"
+msgstr "最大"
+
+msgid "Green"
+msgstr "綠"
+
+msgid "Minimum"
+msgstr "最小"
+
+msgid "Custom"
+msgstr "定製"
+
+msgid "Update preset"
+msgstr "更新預設"
+
+msgid "Advanced settings"
+msgstr "高階設定"
+
+msgid "Processor usage"
+msgstr "處理器使用量"
+
+msgid "Run while computer is on battery power?"
+msgstr "電池供電時仍進行計算?"
+
+msgid "Only applies to portable computers"
+msgstr "僅適用於移動電腦"
+
+msgid "Run while computer is in use?"
+msgstr "計算機在使用時仍進行計算?"
+
+msgid "Run GPU work while computer is in use?"
+msgstr "計算機在使用時仍進行 GPU 計算?"
+
+msgid "Enforced by version @number"
+msgstr "由版本 @number 執行"
+
+msgid "\"In use\" means mouse/keyboard activity in last"
+msgstr "“在使用”表示最近一段時間有滑鼠鍵盤操作"
+
+msgid "minutes"
+msgstr "分鐘內仍有動作"
+
+msgid "Suspend work if no mouse/keyboard activity in last"
+msgstr "如果最近一段時間無鍵盤滑鼠操作則暫停計算"
+
+msgid "Needed to enter low-power mode on some computers"
+msgstr "在一些計算機上需要進入低功耗模式"
+
+msgid "Suspend work if CPU usage is above"
+msgstr "如果 CPU 使用率超過則暫停計算"
+
+msgid "0 means no restriction. Enforced by version @number"
+msgstr "0 表示不限制。由版本 @number 執行"
+
+msgid "Do work only between the hours of:"
+msgstr "計算時間段"
+
+msgid "and"
+msgstr "到"
+
+msgid "No restriction if equal"
+msgstr "如果相同即表示不進行限制"
+
+msgid "Leave tasks in memory while suspended?"
+msgstr "計算暫停時仍將任務駐留在記憶體?"
+
+msgid "Suspended tasks will consume swap space if \"yes\""
+msgstr "如果選擇是,則暫停的任務仍將消耗交換空間"
+
+msgid "Switch between tasks every"
+msgstr "切換任務於每"
+
+msgid "Recommended: @period minutes"
+msgstr "建議值:@period 分鐘"
+
+msgid "On multiprocessors, use at most"
+msgstr "在多核心的電腦上,最多使用"
+
+msgid "processors"
+msgstr "處理器"
+
+msgid "Set to 0 for no limit"
+msgstr "設定為 0 表示不限制"
+
+msgid "% of the processors"
+msgstr "% 的處理器"
+
+msgid "Use at most"
+msgstr "最多只使用"
+
+msgid "% of the CPU time"
+msgstr "CPU時間 %"
+
+msgid "Can be used to reduce CPU heat"
+msgstr "能用於減少 CPU 發熱量"
+
+msgid "Disk and memory usage"
+msgstr "硬碟和記憶體使用"
+
+msgid "Disk: use at most"
+msgstr "硬碟:最多使用"
+
+msgid "Disk: leave free at least"
+msgstr "磁碟:至少預留的空閒"
+
+msgid "Values smaller than @number are ignored"
+msgstr "小於 @number 的值將被忽略"
+
+msgid "% of total"
+msgstr "% 總硬碟空間"
+
+msgid "Tasks checkpoint to disk at most every"
+msgstr "任務最短的儲存時間間隔"
+
+msgid "seconds"
+msgstr "秒執行檢查點操作"
+
+msgid "Swap space: use at most"
+msgstr "交換空間:最多使用"
+
+msgid "Memory: when computer is in use, use at most"
+msgstr "記憶體:如果電腦正在使用,最多使用"
+
+msgid "Memory: when computer is not in use, use at most"
+msgstr "記憶體:如果電腦未使用,最多使用"
+
+msgid "Network usage"
+msgstr "網路使用"
+
+msgid "Computer is connected to the Internet about every"
+msgstr "計算機連線網際網路的時間間隔"
+
+msgid "days"
+msgstr "天"
+
+msgid ""
+"Leave blank or 0 if always connected. @project will try to maintain at least"
+" this much work."
+msgstr "如果是一直連線則留空或輸入 0。@project 將申請至少相應的任務數量。"
+
+msgid "Maintain enough work for an additional"
+msgstr "申請額外的任務量"
+
+msgid "Confirm before connecting to Internet?"
+msgstr "連線到網際網路前進行確認?"
+
+msgid "Matters only if you have a modem, ISDN, or VPN connection"
+msgstr "僅在使用調變解調器,ISDN 或 VPN 連線時有關係"
+
+msgid "Disconnect when done?"
+msgstr "完成後斷開連線?"
+
+msgid "Maximum download rate"
+msgstr "最大下載速率"
+
+msgid "Maximum upload rate"
+msgstr "最大上傳速率"
+
+msgid "Use network only between the hours of:"
+msgstr "允許使用網路的時間段:"
+
+msgid "Transfer at most"
+msgstr "最多只使用"
+
+msgid "Skip image file verification?"
+msgstr "跳過映像檔案驗證?"
+
+msgid ""
+"Check this ONLY if your Internet provider modifies image files (UMTS does "
+"this, for example). Skipping verification reduces the security of BOINC."
+msgstr "僅在你的網際網路供應商會修改映像檔案時(比如 UMTS 就會)才需要。跳過驗證將降低 BOINC 的安全性。"
+
+msgid "Show comparison view"
+msgstr "顯示對比檢視"
+
+msgid "Resource settings"
+msgstr "資源設定"
+
+msgid "Resource share"
+msgstr "資源分享"
+
+msgid ""
+"Determines the proportion of your computer's resources allocated to this "
+"project. Example: if you participate in two BOINC projects with resource "
+"shares of 100 and 200, the first will get 1/3 of your resources and the "
+"second will get 2/3."
+msgstr "決定你的計算資源在該專案的投入比例。比如你分別在兩個 BOINC 專案設定了 100 和 200 的資源分享率,則前一個專案將得到 1/3 的資源而第二個將得到 2/3。"
+
+msgid "Use CPU"
+msgstr "使用CPU"
+
+msgid "Use NVIDIA GPU"
+msgstr "使用NVIDIA GPU"
+
+msgid "Use ATI GPU"
+msgstr "使用ATI GPU"
+
+msgid "Use INTEL GPU"
+msgstr "使用 INTEL GPU"
+
+msgid "Beta settings"
+msgstr "Beta 設定"
+
+msgid "Run test applications?"
+msgstr "允許執行測試版程式?"
+
+msgid ""
+"This helps us develop applications, but may cause jobs to fail on your "
+"computer"
+msgstr "這能幫助我們開發程式,但可能造成您電腦上的任務失敗"
+
+msgid "Default set"
+msgstr "預設設定"
+
+msgid "Set used for new computers"
+msgstr "用於新計算機的設定"
+
+msgid "Merge"
+msgstr "合併"
+
+msgid "Delete"
+msgstr "刪除"
+
+msgid ""
+"This will delete host @id from your account forever. Are you sure this is "
+"OK?"
+msgstr "將從你的賬戶永久刪除主機 @id,確定要繼續嗎?"
+
+msgid "Mark all topics read"
+msgstr "標記所有主題已讀"
+
+msgid "Mark all forums read"
+msgstr "標記所有討論已讀"
+
+msgid ""
+"CAPTCHA validation error: unknown CAPTCHA session ID. Contact the site "
+"administrator if this problem persists."
+msgstr "CAPTCHA 驗證錯誤:未知的 CAPTCHA 會話 ID。如果問題一直存在請聯絡網站管理員。"
+
+msgid "The answer you entered for the CAPTCHA was not correct."
+msgstr "你輸入的 CAPTCHA 答案不正確。"
+
+msgid "Access denied. You must login to view this page."
+msgstr "訪問被拒絕,你必須登入才能檢視該頁面。"
+
+msgid "You are not authorized to access this page."
+msgstr "你無許可權訪問該頁面。"
+
+msgid "Disable rich-text"
+msgstr "禁用富文字"
+
+msgid "Enable rich-text"
+msgstr "啟用富文字"
+
+msgid "View user profile."
+msgstr "檢視使用者檔案"
+
+msgid "BBcode help"
+msgstr "BBcode 幫助"
+
+msgid "Post comment"
+msgstr "發表回覆"
+
+msgid "No @type tasks"
+msgstr "沒有 @type 類型的任務"
+
+msgid "There are no tasks of this type on record"
+msgstr "沒有該類型的任務記錄"
+
+msgid "Clear"
+msgstr "清除"
+
+msgid ""
+"This will remove all of your settings from the @name preference set. Are you"
+" sure?"
+msgstr "將要移除你在 @name 的所有參數設定,確定繼續嗎?"
+
+msgid "These apply to all BOINC projects in which you participate."
+msgstr "這適用於所有您參與的 BOINC 專案。"
+
+msgid ""
+"On computers attached to multiple projects, the most recently modified "
+"preferences will be used."
+msgstr "對於加入了多個專案的計算機,將使用最近更新過的參數設定。"
+
+msgid "Preferences last modified: @mod_time"
+msgstr "參數設定最後的修改時間:@mod_time"
+
+msgid "Combined preferences"
+msgstr "以合併的偏好設定"
+
+msgid "Switch View"
+msgstr "切換檢視"
+
+msgid "every"
+msgstr "每"
+
+msgid "Edit"
+msgstr "編輯"
+
+msgid ""
+"This will remove all of your settings from the \"@name\" preference set. Are"
+" you sure?"
+msgstr "將要移除你在“@name”的所有參數設定,確定繼續嗎?"
+
+msgid "Add"
+msgstr "新增"
+
+msgid "General settings"
+msgstr "一般設定"
+
+msgid "Time zone"
+msgstr "時區"
+
+msgid "Notification settings"
+msgstr "通知設定"
+
+msgid "Receive email notification for private messages?"
+msgstr "接收私人訊息的郵件通知?"
+
+msgid "Receive email notification for friend requests?"
+msgstr "接收好友請求的郵件通知?"
+
+msgid "Language settings"
+msgstr "語言設定"
+
+msgid ""
+"This account's default language for e-mails and preferred language for site "
+"presentation."
+msgstr "該賬戶用於電子郵件的預設語言和站點內容呈現的首選語言"
+
+msgid ""
+"If you have a <a href=\"@gravatar-check\">valid Gravatar</a> associated with"
+" your e-mail address, it will be used for your user picture."
+msgstr "如果你有一個<a href=\"@gravatar-check\">正確的大頭貼</a> 和你的電子郵件地址關聯,它將被用作你的使用者圖片。"
+
+msgid "Your Gravatar will not be shown if you upload a user picture."
+msgstr "如果你上傳了一張使用者圖片,則不會顯示你的大頭貼。"
+
+msgid ""
+"If you have a <a href=\"@gravatar-check\">valid Gravatar</a> associated with"
+" your e-mail address, use it for your user picture."
+msgstr "如果你有一個<a href=\"@gravatar-check\">正確的大頭貼</a> 與你的電子郵件地址關聯,它將被用作你的使用者圖片。"
+
+msgid "Gravatar will not be shown if an avatar is uploaded."
+msgstr "如果上傳了大頭貼,則不會顯示。"
+
+msgid "Avatar settings"
+msgstr "大頭貼設定"
+
+msgid "This is not available until your profile is set up."
+msgstr "僅在你的檔案建立後才可用。"
+
+msgid "Create a profile"
+msgstr "建立一個用戶檔案"
+
+msgid "Upload an avatar"
+msgstr "上傳一個新大頭貼"
+
+msgid "Forum settings"
+msgstr "論壇設定"
+
+msgid "In discussion topics, show at most @comments_per_page"
+msgstr "在討論主題裡,最多顯示 @comments_per_page 條回覆"
+
+msgid "comments per page"
+msgstr "每頁評論數"
+
+msgid "Sort comments in discussions"
+msgstr "討論主題的回覆排序"
+
+msgid "Newest post first"
+msgstr "最新的文章顯示在前面"
+
+msgid "Oldest post first"
+msgstr "發帖時間最舊的在前面"
+
+msgid "Signature"
+msgstr "簽名"
+
+msgid "Your signature will be publicly displayed at the end of your comments."
+msgstr "你的簽字將在回覆的最後進行顯示。"
+
+msgid "Hide signatures in forums"
+msgstr "在論壇裡隱藏簽名"
+
+msgid "Privacy settings"
+msgstr "隱私設定"
+
+msgid "Is it OK for @project and your team (if any) to email you?"
+msgstr "是否允許 @project 和你所在的團隊(如果有的話)給你傳送郵件?"
+
+msgid "Should @project show your computers on its web site?"
+msgstr "@project 是否應該在網站上顯示你的計算機?"
+
+msgid "Hide"
+msgstr "隱藏"
+
+msgid "Hide this topic"
+msgstr "隱藏主題"
+
+msgid "Lock"
+msgstr "鎖定"
+
+msgid "Lock this thread for comments"
+msgstr "關閉本主題"
+
+msgid "Make sticky"
+msgstr "置頂"
+
+msgid "Make this topic sticky"
+msgstr "將本主題置頂顯示"
+
+msgid "moderation"
+msgstr "仲裁"
+
+msgid "Post new comment"
+msgstr "發表新回覆"
+
+msgid "You must earn 1 more credit!"
+msgstr "你的積分必須至少為1!"
+
+msgid "Joined"
+msgstr "已加入"
+
+msgid "Credit"
+msgstr "積分"
+
+msgid "RAC"
+msgstr "近期平均積分"
+
+msgid "Join team"
+msgstr "加入團隊"
+
+msgid "Click here to become a member of @this_team"
+msgstr "點選這裡成為 @this_team 的成員"
+
+msgid "Join this team"
+msgstr "加入此團隊"
+
+msgid "Manage team"
+msgstr "管理團隊"
+
+msgid "View member list"
+msgstr "檢視成員列表"
+
+msgid "Member names and emails"
+msgstr "成員名稱和電子郵箱地址"
+
+msgid "View change history"
+msgstr "檢視變更歷史"
+
+msgid "See member activity"
+msgstr "檢視成員活動"
+
+msgid "Manage team message board"
+msgstr "管理團隊留言板"
+
+msgid "Create or manage message board"
+msgstr "建立或管理留言板"
+
+msgid "Remove members"
+msgstr "移除團隊成員"
+
+msgid "Change founder"
+msgstr "更改團隊創始人"
+
+msgid "Manage team admins"
+msgstr "管理團隊管理員"
+
+msgid "Edit team info"
+msgstr "編輯團隊資訊"
+
+msgid "Remove team"
+msgstr "移除團隊"
+
+msgid "Team forum"
+msgstr "團隊論壇"
+
+msgid "A discussion forum has been set up for team members."
+msgstr "已為團隊成員建立論壇。"
+
+msgid "Enter forum"
+msgstr "進入論壇"
+
+msgid "Leave team"
+msgstr "離開團隊"
+
+msgid "Click here to revoke your membership with @this_team"
+msgstr "點選這裡來退出 @this_team"
+
+msgid "Leave this team"
+msgstr "離開該團隊"
+
+msgid "Edit message board"
+msgstr "編輯留言板"
+
+msgid "Message board title"
+msgstr "留言板標題"
+
+msgid "Text only, no HTML tags"
+msgstr "僅文字,不允許 HTML 標籤"
+
+msgid "Minimum time between posts"
+msgstr "最小的發貼時間間隔"
+
+msgid "Seconds"
+msgstr "秒"
+
+msgid "Minimum total credit to post"
+msgstr "發文要求的最低總積分"
+
+msgid "Minimum avg credit to post"
+msgstr "發帖要求的最低平均積分"
+
+msgid "Allow public to read board?"
+msgstr "是否允許公眾訪問該留言板?"
+
+msgid "Save message board"
+msgstr "儲存留言板"
+
+msgid "About message boards"
+msgstr "關於留言板"
+
+msgid "This is a team-only message board"
+msgstr "這裡只對團隊成員開放的留言板"
+
+msgid "Only members may post"
+msgstr "只有團隊成員可以發貼"
+
+msgid "Only members may read (optional)"
+msgstr "只有團隊成員可以閱讀(可選)"
+
+msgid "Founder & Team Admins have moderator privileges"
+msgstr "建立人和團隊管理員有仲裁的權利"
+
+msgid "Changing the team founder"
+msgstr "改變團隊建立人"
+
+msgid "Notes about changes in foundership:"
+msgstr "建立人修改的注意事項:"
+
+msgid "Any member of the team is eligible"
+msgstr "每個團隊成員都可以成為建立人"
+
+msgid "Current founder becomes a normal user"
+msgstr "當前建立人將變成普通使用者"
+
+msgid "Foundership can be requested by team members:"
+msgstr "團隊成員可以主動請求成為建立人"
+
+msgid "One request is allowed at a time"
+msgstr "一次只能處理一個請求"
+
+msgid "It must be 60 days since any previous request"
+msgstr "請求的間隔至少是 60 天"
+
+msgid "Any active request must be older than 90 days"
+msgstr "請求的有效期至少是 90 天"
+
+msgid "Current founder has 60 days to respond to a request"
+msgstr "當前的建立人有 60 天的時間來處理一個請求"
+
+msgid "Add team admin"
+msgstr "增加團隊管理員"
+
+msgid "Enter email address"
+msgstr "輸入電子郵件地址"
+
+msgid "Current team admins"
+msgstr "當前的團隊管理員"
+
+msgid "About team admins"
+msgstr "關於團隊管理員"
+
+msgid "Team admins can:"
+msgstr "團隊管理員可以:"
+
+msgid "Edit team information"
+msgstr "編輯團隊資訊"
+
+msgid "View the team's join / quit history"
+msgstr "檢視團隊的成員加入、退出歷史"
+
+msgid "Moderate the team forum"
+msgstr "團隊論壇仲裁"
+
+msgid "Remove members from the team"
+msgstr "從團隊中移除成員"
+
+msgid "Disband a team if it has no members"
+msgstr "解散沒有成員的團隊"
+
+msgid "Team admins cannot:"
+msgstr "團隊管理員不能:"
+
+msgid "Change the team founder"
+msgstr "改變團隊創始人"
+
+msgid "Add / Remove team admins"
+msgstr "增加或移除團隊管理員"
+
+msgid ""
+"If a team admin quits the team, they cease to be a team admin. We recommend "
+"only selecting people you know and trust"
+msgstr "如果團隊管理員退出團隊,他將不再是團隊管理員。我們建議只選擇你認識並信任的人。"
+
+msgid "Choose type"
+msgstr "選擇類型"
+
+msgid "Team name"
+msgstr "團隊名稱"
+
+msgid "Team name -- HTML version (optional)"
+msgstr "團隊名稱 -- HTML 版本(可選)"
+
+msgid "You may use limited HTML tags"
+msgstr "你可以使用有限的 HTML 標籤"
+
+msgid "Team website (optional)"
+msgstr "團隊網站(可選)"
+
+msgid "Displayed on the team's page"
+msgstr "在團隊頁面上顯示"
+
+msgid "Type of team"
+msgstr "團隊類型"
+
+msgid "Accept new members?"
+msgstr "是否接受新隊員加入?"
+
+msgid "Description of team"
+msgstr "團隊描述"
+
+msgid "Create new team"
+msgstr "建立新團隊"
+
+msgid "Create a team"
+msgstr "建立團隊"
+
+msgid "Save team"
+msgstr "儲存團隊"
+
+msgid "Create team message board"
+msgstr "建立團隊留言板"
+
+msgid "Create message board"
+msgstr "建立留言板"
+
+msgid "You may create a message board for use by @team"
+msgstr "你可以為 @team 團隊建立一個留言板"
+
+msgid ""
+"Please set the minimum average credit that a user is required to have in "
+"order to post to this message board."
+msgstr "請設定使用者在該留言板發貼所要求的最小平均積分。"
+
+msgid "Post new topic"
+msgstr "發表新主題"
+
+msgid "Anonymous"
+msgstr "匿名"
+
+msgid "Unpublished"
+msgstr "未發表"
+
+msgid "parent removed"
+msgstr "parent 已移除"
+
+msgid "Sorry, unrecognized email address or password."
+msgstr "對不起,無法識別的郵件地址或登入密碼。"
+
+msgid "Have you forgotten your password?"
+msgstr "忘記密碼?"
+
+msgid "Id"
+msgstr "ID"
+
+msgid "Recent average credit"
+msgstr "最近平均積分"
+
+msgid "Members"
+msgstr "成員"
+
+msgid "Total Credit"
+msgstr "總積分"
+
+msgid "User ID"
+msgstr "用戶 ID"
+
+msgid "User"
+msgstr "使用者"
+
+msgid "Admin since"
+msgstr "成為管理員"
+
+msgid "Team ID"
+msgstr "團隊 ID"
+
+msgid "User joined"
+msgstr "成為使用者"
+
+msgid "Timestamp"
+msgstr "時間戳"
+
+msgid "Account Key"
+msgstr "帳號金鑰"
+
+msgid "CPID"
+msgstr "CPID"
+
+msgid "Email Address"
+msgstr "電子郵件地址"
+
+msgid "Password Hash"
+msgstr "密碼雜湊"
+
+msgid "Postal Code"
+msgstr "郵編"
+
+msgid "Send Email"
+msgstr "傳送郵件"
+
+msgid "Show Hosts"
+msgstr "顯示主機"
+
+msgid "URL"
+msgstr "網址"
+
+msgid "Computer ID"
+msgstr "電腦辨識 ID"
+
+msgid "Location"
+msgstr "位置"
+
+msgid "While BOINC running, % of time work is allowed"
+msgstr "當 BONC 執行時,允許處理任務的時間比 (%)"
+
+msgid "Average turnaround time"
+msgstr "平均任務周轉時間"
+
+msgid "Created"
+msgstr "建立日期"
+
+msgid "While BOINC running, % of time host has an Internet connection"
+msgstr "當 BOINC 正在運作時,主機連接網路的時間比 (%)"
+
+msgid "Average CPU efficiency"
+msgstr "平均 CPU 效率"
+
+msgid "Free disk space"
+msgstr "剩餘磁碟空間"
+
+msgid "Total disk space"
+msgstr "總硬碟容量"
+
+msgid "Task duration correction factor"
+msgstr "任務持續修正的原因"
+
+msgid "Avg. credit"
+msgstr "平均積分"
+
+msgid "External IP address"
+msgstr "外部 IP 位址"
+
+msgid "Cross project ID"
+msgstr "跨專案標識符(CPID)"
+
+msgid "Last IP address"
+msgstr "最近使用的 IP 地址"
+
+msgid "Cache"
+msgstr "快取"
+
+msgid "Memory"
+msgstr "記憶體"
+
+msgid "Swap space"
+msgstr "交換區域"
+
+msgid "Maximum daily WU quota per CPU"
+msgstr "單 CPU 每日 WU 限額"
+
+msgid "Average download rate"
+msgstr "平均下載速率"
+
+msgid "Average upload rate"
+msgstr "平均上傳速率"
+
+msgid "Same IP address count"
+msgstr "同 IP 地址的數量"
+
+msgid "% of time BOINC client is running"
+msgstr "% BOINC 客戶端執行時間"
+
+msgid "Operating system"
+msgstr "作業系統"
+
+msgid "Operating system version"
+msgstr "作業系統版本"
+
+msgid "Measured floating point speed"
+msgstr "浮點運算速度"
+
+msgid "Measured integer speed"
+msgstr "整數運算速度"
+
+msgid "CPU model"
+msgstr "CPU 型號"
+
+msgid "Number of processors"
+msgstr "處理器數量"
+
+msgid "CPU"
+msgstr "CPU"
+
+msgid "Number of times client has contacted server"
+msgstr "客戶端連接服務端的次數"
+
+msgid "Last contact"
+msgstr "最後聯繫時間"
+
+msgid "Serial number"
+msgstr "序列號"
+
+msgid "Timezone"
+msgstr "時區"
+
+msgid "Platform ID"
+msgstr "平臺 ID"
+
+msgid "Task ID"
+msgstr "任務 ID"
+
+msgid "Workunit ID"
+msgstr "任務單元 ID"
+
+msgid "Host ID"
+msgstr "主機 ID"
+
+msgid "Application ID"
+msgstr "應用程式 ID"
+
+msgid "Application version"
+msgstr "程式版本"
+
+msgid "Claimed credit"
+msgstr "申請積分"
+
+msgid "Client state"
+msgstr "客戶端狀態"
+
+msgid "CPU time"
+msgstr "CPU 時間"
+
+msgid "Run time"
+msgstr "執行時間"
+
+msgid "Exit status"
+msgstr "離開狀態"
+
+msgid "Granted credit"
+msgstr "授予的積分"
+
+msgid "Outcome"
+msgstr "結果"
+
+msgid "Received time"
+msgstr "接收時間"
+
+msgid "Report deadline"
+msgstr "回報期限"
+
+msgid "Sent"
+msgstr "傳送時間"
+
+msgid "Server state"
+msgstr "伺服器狀態"
+
+msgid "Stderr out"
+msgstr "標準錯誤輸出"
+
+msgid "Validation state"
+msgstr "驗證狀態"
+
+msgid "App ID"
+msgstr "應用 ID"
+
+msgid "Canonical credit"
+msgstr "規範積分"
+
+msgid "Canonical result ID"
+msgstr "規範結果 ID"
+
+msgid "Created time"
+msgstr "建立時間"
+
+msgid "Error mask"
+msgstr "錯誤掩碼"
+
+msgid "Minimum quorum"
+msgstr "最小配額"
+
+msgid "Max error tasks"
+msgstr "最大的錯誤任務"
+
+msgid "Max success tasks"
+msgstr "最大的成功任務"
+
+msgid "Max total tasks"
+msgstr "最大的總任務"
+
+msgid "Needs validation"
+msgstr "需要驗證"
+
+msgid "Initial replication"
+msgstr "初始任務拷貝"
+
+msgid "Target number of results"
+msgstr "結果的目標數量"
+
+msgid "Application version ID"
+msgstr "應用版本 ID"
+
+msgid "Plan class"
+msgstr "計劃類別"
+
+msgid "Version number"
+msgstr "版本號"
+
+msgid "Computer"
+msgstr "電腦"
+
+msgid "App version ID"
+msgstr "應用版本 ID"
+
+msgid "Consecutive valid tasks"
+msgstr "連續完成的運算任務數量"
+
+msgid "Number of tasks completed"
+msgstr "完成的運算任務數量"
+
+msgid "Max tasks per day"
+msgstr "每日最大任務數量"
+
+msgid "Number of tasks today"
+msgstr "今天的任務數量"
+
+msgid "Show IP address"
+msgstr "表示 IP 地址"
+
+msgid "hours"
+msgstr "小時"
+
+msgid "@count million ops/sec"
+msgstr "@count 百萬操作/秒"
+
+msgid "@rate KiB/sec"
+msgstr "@rate 千位元組/秒"
+
+msgid "@count days"
+msgstr "@count 天"
+
+msgid "Remove friend"
+msgstr "移除好友"
+
+msgid "Ban user"
+msgstr "禁止使用者"
+
+msgid "Add as friend"
+msgstr "新增為好友"
+
+msgid "Team"
+msgstr "團隊"
+
+msgid "Reply"
+msgstr "回覆"
+
+msgid "Reply to this comment"
+msgstr "回覆該訊息"
+
+msgid "Quote"
+msgstr "引用"
+
+msgid "Reply to this comment with quote"
+msgstr "引用回覆該訊息"
+
+msgid "Edit this comment"
+msgstr "編輯此回覆"
+
+msgid "Delete this comment"
+msgstr "刪除此回覆"
+
+msgid "Hide this comment"
+msgstr "隱藏此恢復"
+
+msgid "Convert"
+msgstr "轉換"
+
+msgid "Convert this comment to a new topic"
+msgstr "將此回覆轉移成一個新主題"
+
+msgid "Details"
+msgstr "細節"
+
+msgid "@ip_address (same the last @count times)"
+msgstr "@ip_address(最近 @count 次)"
+
+msgid "commented on"
+msgstr "評論時間"
+
+msgid "Make unsticky"
+msgstr "取消置頂"
+
+msgid "Remove sticky status from this topic"
+msgstr "去除此主題的置頂狀態"
+
+msgid ""
+"Sometimes BOINC assigns separate identities to the same computer by mistake."
+" You can correct this by merging old identities with the newest one."
+msgstr "有時候,BOINC 會給同一台電腦賦予多個唯一標識,你可以通過將舊標識和新標識合併以糾正該問題。"
+
+msgid ""
+"Check the computers that are the same as @name (created on @date at @time "
+"with computer ID @id)"
+msgstr "檢查和 @name 同名的計算機(計算機 ID %id,建立日期及時間 @date @time)"
+
+msgid "Computer @old_id has been merged successfully into @id."
+msgstr "計算機 @old_id 已被成功合併到 @id。"
+
+msgid "started discussion"
+msgstr "已開始的討論"
+
+msgid "posted"
+msgstr "已發表"
+
+msgid "Minimum value not met for @field"
+msgstr "@field 未達到最小值"
+
+msgid "Remove"
+msgstr "移除"
+
+msgid "hidden"
+msgstr "隱藏"
+
+msgid "Invalid data type for @field"
+msgstr "@field 非法資料類型"
+
+msgid ""
+"Authentication is required when changing E-mail address or setting new "
+"password."
+msgstr "更改電子郵件地址或密碼時,需要驗證身份。"
+
+msgid "Request foundership"
+msgstr "請求創始人資格"
+
+msgid ""
+"If the team founder is not active and you want to assume the role of "
+"founder, click below to request foundership of @this_team."
+msgstr "在團隊創始人處於不活躍狀態的情況下,如果您想要代替其成為創始人,請點選下面以申請成為 @this_team 的創始人。"
+
+msgid "Initiate request"
+msgstr "發起請求"
+
+msgid "A BOINC account already exists for @email."
+msgstr "@email名下已經註冊了一個BOINC賬戶,請嘗試登入。"
+
+msgid ""
+"Please be responsible in what you write and do not create posts which are "
+"offensive or insulting. Offensive posts or threads may be deleted by forum "
+"moderators without warning or discussion. Do not respond to offensive "
+"postings. Click on the \"report\" button at the bottom of the post to call "
+"it to the attention of the moderators."
+msgstr "請對你所寫的內容負責,不要發表含有攻擊性或侮辱性的主題。論壇版主可以不經警告或討論而直接刪除不恰當的主題或主題。不要在無禮的主題上浪費時間,請直接單擊底部的\"報告\"按鈕向版主報告這個主題。"
+
+msgid "this project"
+msgstr "此專案"
+
+msgid ""
+"We also ask that you keep all discussion on the message boards related to "
+"@project or BOINC with the small exception of the Science message board "
+"where you are free to discuss anything relevant to the underlying science. "
+"Participants interested in broader discussions should post to unofficial "
+"forums for @project."
+msgstr "我們也要求你保證留言板上的所有討論均在@project 或 BOINC的範圍內。除了一個小小的例外,科學留言板,你可以在那裡自由討論任何有關的基本科學問題。更廣泛的討論應該發表到 @project 的非正式論壇。"
+
+msgid "These message boards now support BBCode tags only."
+msgstr "這些留言板目前僅支援BBCode標記。"
+
+msgid "Posts contributed"
+msgstr "發表的主題"
+
+msgid "Profile awaiting moderator approval"
+msgstr "待稽核的個人資料"
+
+msgid "Approve profile"
+msgstr "批准個人資料"
+
+msgid "Approve this profile content"
+msgstr "批准此個人資料內容"
+
+msgid "Edit profile"
+msgstr "編輯個人資料"
+
+msgid "Edit the content of this profile"
+msgstr "編輯此個人資料的內容"
+
+msgid "Remove profile"
+msgstr "刪除個人資料"
+
+msgid "Remove this profile content from the system"
+msgstr "從系統中刪除此個人資料的內容"
+
+msgid "The team founder has @count days to respond to your transfer request."
+msgstr "團隊創始人有 @count 天來回應您的轉讓申請。"
+
+msgid "Reject profile"
+msgstr "拒絕個人資料"
+
+msgid "Reject this profile content"
+msgstr "拒絕此個人資料內容"
+
+msgid "Reason for rejecting this profile"
+msgstr "拒絕此個人資料的原因"
+
+msgid ""
+"This reason will be included in an email to the user. Please write a brief "
+"explanation of the problem and how to fix it."
+msgstr "這個原因將附在給使用者的電子郵件裡。請簡要說明存在的問題以及解決它的方法。"
+
+msgid "Submit"
+msgstr "提交"
+
+msgid "project"
+msgstr "專案"
+
+msgid "Unknown"
+msgstr "未知"
+
+msgid "Pending"
+msgstr "等待中"
+
+msgid "User of the day"
+msgstr "本日用戶"
+
+msgid "Account"
+msgstr "帳號"
+
+msgid "Log in"
+msgstr "登入"
+
+msgid "Send"
+msgstr "傳送"
+
+msgid "News"
+msgstr "新聞"
+
+msgid "Unlock"
+msgstr "解鎖"
+
+msgid "Paste the string into the field below, and click OK."
+msgstr "將之前複製的內容貼到下面的表格中,並點擊確定。"
+
+msgid ""
+"You will now be logged in to your account; update the email and password of "
+"your account."
+msgstr "你現在將登入進自己的帳號,可以更新你的電子郵件和密碼。"
+
+msgid "Log in with authenticator"
+msgstr "用身份驗證碼 (authenticator)來登入"
+
+msgid "Assume foundership"
+msgstr "得到創始人資格"
+
+msgid "Unhide"
+msgstr "取消隱藏"
diff --git a/locale/zh_TW/BOINC-Manager.po b/locale/zh_TW/BOINC-Manager.po
index 0d9dbe4..01ca693 100644
--- a/locale/zh_TW/BOINC-Manager.po
+++ b/locale/zh_TW/BOINC-Manager.po
@@ -10,24 +10,24 @@ msgid ""
 msgstr ""
 "Project-Id-Version: BOINC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-24 13:36-0500\n"
-"PO-Revision-Date: 2015-04-20 12:34+0000\n"
-"Last-Translator: Died <doomdied at gmail.com>\n"
-"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/boinc/language/zh_TW/)\n"
+"POT-Creation-Date: 2015-10-16 17:27-0500\n"
+"PO-Revision-Date: 2015-11-26 19:57+0000\n"
+"Last-Translator: Mingye Wang <arthur200126 at gmail.com>\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/boinc/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: Poedit 1.7.6\n"
 "X-Poedit-Basepath: C:\\Src\\BOINCGIT\\boinc\n"
-"X-Poedit-Country: UNITED STATES\n"
-"X-Poedit-Language: English\n"
+"X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: clientgui\n"
 "X-Poedit-SearchPath-1: clientgui\\common\n"
 "X-Poedit-SearchPath-2: clientgui\\gtk\n"
-"X-Poedit-SearchPath-3: clientgui\\mac\n"
-"X-Poedit-SearchPath-4: clientgui\\msw\n"
-"X-Poedit-SourceCharset: utf-8\n"
+"X-Poedit-SearchPath-3: clientgui\\msw\n"
+"X-Poedit-SearchPath-4: clientgui\\mac\n"
+"X-Poedit-SourceCharset: UTF-8\n"
 
 #: clientgui/AccountInfoPage.cpp:361
 #, c-format
@@ -177,6 +177,8 @@ msgstr "開啟網頁"
 msgid "Visit this account manager's web site"
 msgstr "造訪帳號管理服務網站"
 
+#. %s is the project name
+#. i.e. 'BOINC', 'GridRepublic'
 #: clientgui/AccountManagerProcessingPage.cpp:186
 #: clientgui/AccountManagerPropertiesPage.cpp:192
 #, c-format
@@ -205,364 +207,369 @@ msgstr "已連線"
 msgid "Disconnected"
 msgstr "已斷線"
 
-#: clientgui/AdvancedFrame.cpp:325
+#: clientgui/AdvancedFrame.cpp:329
 #, c-format
 msgid "New %s window..."
 msgstr "開新 %s 視窗..."
 
-#: clientgui/AdvancedFrame.cpp:329
+#: clientgui/AdvancedFrame.cpp:333
 #, c-format
 msgid "Open another %s window"
 msgstr "開啟另一個 %s 視窗"
 
-#: clientgui/AdvancedFrame.cpp:340
+#: clientgui/AdvancedFrame.cpp:344
 msgid "Select computer..."
 msgstr "選擇電腦..."
 
-#: clientgui/AdvancedFrame.cpp:341
+#: clientgui/AdvancedFrame.cpp:345
 msgid "Connect to a BOINC client on another computer"
 msgstr "連線到另一台電腦的 BOINC 客戶端"
 
-#: clientgui/AdvancedFrame.cpp:345
+#: clientgui/AdvancedFrame.cpp:349
 msgid "Shut down connected client..."
 msgstr "關閉已連線的客戶端..."
 
-#: clientgui/AdvancedFrame.cpp:346
+#: clientgui/AdvancedFrame.cpp:350
 msgid "Shut down the currently connected BOINC client"
 msgstr "關閉目前連線的 BOINC 客戶端"
 
-#: clientgui/AdvancedFrame.cpp:351
+#: clientgui/AdvancedFrame.cpp:355 clientgui/sg_BoincSimpleFrame.cpp:120
 #, c-format
 msgid "Close the %s window"
 msgstr "關閉 %s 視窗"
 
-#: clientgui/AdvancedFrame.cpp:354
+#: clientgui/AdvancedFrame.cpp:358 clientgui/sg_BoincSimpleFrame.cpp:123
 msgid "&Close window"
 msgstr "關閉視窗 (&C)"
 
-#: clientgui/AdvancedFrame.cpp:363 clientgui/AdvancedFrame.cpp:368
-#: clientgui/AdvancedFrame.cpp:373
+#: clientgui/AdvancedFrame.cpp:367 clientgui/AdvancedFrame.cpp:372
+#: clientgui/AdvancedFrame.cpp:377 clientgui/sg_BoincSimpleFrame.cpp:132
+#: clientgui/sg_BoincSimpleFrame.cpp:137
 #, c-format
 msgid "Exit %s"
 msgstr "離開 %s"
 
-#: clientgui/AdvancedFrame.cpp:386
-msgid "Preferences…"
+#: clientgui/AdvancedFrame.cpp:391 clientgui/sg_BoincSimpleFrame.cpp:151
+msgid "Preferences..."
 msgstr "偏好設定..."
 
-#: clientgui/AdvancedFrame.cpp:395
+#: clientgui/AdvancedFrame.cpp:400
 msgid "&Notices\tCtrl+Shift+N"
 msgstr "訊息 (&N)\tCtrl+Shift+N"
 
-#: clientgui/AdvancedFrame.cpp:396
+#: clientgui/AdvancedFrame.cpp:401
 msgid "Show notices"
 msgstr "顯示訊息"
 
-#: clientgui/AdvancedFrame.cpp:401
+#: clientgui/AdvancedFrame.cpp:406
 msgid "&Projects\tCtrl+Shift+P"
 msgstr "專案 (&P)\tCtrl+Shift+P"
 
-#: clientgui/AdvancedFrame.cpp:402
+#: clientgui/AdvancedFrame.cpp:407
 msgid "Show projects"
 msgstr "顯示專案"
 
-#: clientgui/AdvancedFrame.cpp:407
+#: clientgui/AdvancedFrame.cpp:412
 msgid "&Tasks\tCtrl+Shift+T"
 msgstr "任務 (&T)\tCtrl+Shift+T"
 
-#: clientgui/AdvancedFrame.cpp:408
+#: clientgui/AdvancedFrame.cpp:413
 msgid "Show tasks"
 msgstr "顯示任務"
 
-#: clientgui/AdvancedFrame.cpp:413
+#: clientgui/AdvancedFrame.cpp:418
 msgid "Trans&fers\tCtrl+Shift+X"
 msgstr "傳輸 (&F)\tCtrl+Shift+X"
 
-#: clientgui/AdvancedFrame.cpp:414
+#: clientgui/AdvancedFrame.cpp:419
 msgid "Show file transfers"
 msgstr "顯示檔案傳輸"
 
-#: clientgui/AdvancedFrame.cpp:419
+#: clientgui/AdvancedFrame.cpp:424
 msgid "&Statistics\tCtrl+Shift+S"
 msgstr "統計 (&S)\tCtrl+Shift+S"
 
-#: clientgui/AdvancedFrame.cpp:420
+#: clientgui/AdvancedFrame.cpp:425
 msgid "Show statistics"
 msgstr "顯示統計"
 
-#: clientgui/AdvancedFrame.cpp:425
+#: clientgui/AdvancedFrame.cpp:430
 msgid "&Disk\tCtrl+Shift+D"
 msgstr "硬碟空間 (&D)\tCtrl+Shift+D"
 
-#: clientgui/AdvancedFrame.cpp:426
+#: clientgui/AdvancedFrame.cpp:431
 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:439
+#: clientgui/AdvancedFrame.cpp:438
 msgid "Simple &View...\tCtrl+Shift+V"
 msgstr "精簡模式 (&V)\tCtrl+Shift+V"
 
-#: clientgui/AdvancedFrame.cpp:440
+#: clientgui/AdvancedFrame.cpp:439
 msgid "Switch to the Simple View"
 msgstr "切換至精簡模式"
 
-#: clientgui/AdvancedFrame.cpp:454
-msgid "&Add project or account manager..."
-msgstr "加入帳號管理服務 (&A)..."
+#: clientgui/AdvancedFrame.cpp:453 clientgui/AdvancedFrame.cpp:477
+#: clientgui/sg_BoincSimpleFrame.cpp:205
+msgid "&Add project..."
+msgstr "新增專案... (&A)"
+
+#: clientgui/AdvancedFrame.cpp:454 clientgui/AdvancedFrame.cpp:478
+#: clientgui/sg_BoincSimpleFrame.cpp:206
+msgid "Add a project"
+msgstr "新增專案"
 
-#: clientgui/AdvancedFrame.cpp:455
-msgid "Add a new science project, or use an account manager"
-msgstr "新增科學專案或使用帳號管理服務"
+#: clientgui/AdvancedFrame.cpp:458
+msgid "&Use account manager..."
+msgstr "&帳號管理服務"
 
 #: clientgui/AdvancedFrame.cpp:459
+msgid "Use an account manager to control this computer."
+msgstr "使用帳號管理服務來控制該計算機。"
+
+#: clientgui/AdvancedFrame.cpp:463
 #, c-format
 msgid "&Synchronize with %s"
 msgstr "與 %s 同步 (&S)"
 
-#: clientgui/AdvancedFrame.cpp:463
+#: clientgui/AdvancedFrame.cpp:467
 #, c-format
 msgid "Get current settings from %s"
 msgstr "從 %s 取得現在的設定"
 
-#: clientgui/AdvancedFrame.cpp:473
-msgid "&Add project..."
-msgstr "新增專案... (&A)"
-
-#: clientgui/AdvancedFrame.cpp:474
-msgid "Add a project"
-msgstr "新增專案"
-
-#: clientgui/AdvancedFrame.cpp:477
+#: clientgui/AdvancedFrame.cpp:481
 #, c-format
 msgid "S&top using %s..."
 msgstr "停止使用 %s (&S)..."
 
-#: clientgui/AdvancedFrame.cpp:483
+#: clientgui/AdvancedFrame.cpp:487
 msgid "Remove this computer from account manager control."
 msgstr "從用戶端中移除帳號管理服務。"
 
-#: clientgui/AdvancedFrame.cpp:489
+#: clientgui/AdvancedFrame.cpp:493
 msgid "Run CPU &benchmarks"
 msgstr "執行 CPU 效能測試 (&B)"
 
-#: clientgui/AdvancedFrame.cpp:490
+#: clientgui/AdvancedFrame.cpp:494
 msgid "Run tests that measure CPU speed"
 msgstr "測試 CPU 速度"
 
-#: clientgui/AdvancedFrame.cpp:494
+#: clientgui/AdvancedFrame.cpp:498
 msgid "Retry pending transfers"
 msgstr "重試等待中的傳輸"
 
-#: clientgui/AdvancedFrame.cpp:495
+#: clientgui/AdvancedFrame.cpp:499
 msgid "Retry deferred file transfers and task requests"
 msgstr "重試延遲檔案傳輸及任務請求"
 
-#: clientgui/AdvancedFrame.cpp:503
+#: clientgui/AdvancedFrame.cpp:504 clientgui/sg_BoincSimpleFrame.cpp:211
+msgid "Event Log...\tCtrl+Shift+E"
+msgstr "事件記錄檔... Ctrl+Shift+E"
+
+#: clientgui/AdvancedFrame.cpp:505
+msgid "Show diagnostic messages"
+msgstr "顯示診斷訊息"
+
+#: clientgui/AdvancedFrame.cpp:513
 msgid "&Run always"
 msgstr "持續執行 (&R)"
 
-#: clientgui/AdvancedFrame.cpp:504
+#: clientgui/AdvancedFrame.cpp:514
 msgid "Allow work regardless of preferences"
 msgstr "不管偏好設定執行任務"
 
-#: clientgui/AdvancedFrame.cpp:508
+#: clientgui/AdvancedFrame.cpp:518
 msgid "Run based on &preferences"
 msgstr "依照偏好設定執行(&P)"
 
-#: clientgui/AdvancedFrame.cpp:509
+#: clientgui/AdvancedFrame.cpp:519
 msgid "Allow work according to preferences"
 msgstr "依照您的偏好設定執行任務"
 
-#: clientgui/AdvancedFrame.cpp:513
+#: clientgui/AdvancedFrame.cpp:523
 msgid "&Suspend"
 msgstr "暫停 (&S)"
 
-#: clientgui/AdvancedFrame.cpp:514
+#: clientgui/AdvancedFrame.cpp:524
 msgid "Stop work regardless of preferences"
 msgstr "不管偏好設定停止任務"
 
-#: clientgui/AdvancedFrame.cpp:539
+#: clientgui/AdvancedFrame.cpp:549
 msgid "Use GPU always"
 msgstr "持續執行 GPU"
 
-#: clientgui/AdvancedFrame.cpp:540
+#: clientgui/AdvancedFrame.cpp:550
 msgid "Allow GPU work regardless of preferences"
 msgstr "不管偏好設定執行任務"
 
-#: clientgui/AdvancedFrame.cpp:544
+#: clientgui/AdvancedFrame.cpp:554
 msgid "Use GPU based on preferences"
 msgstr "依照偏好設定使用 GPU (&P)"
 
-#: clientgui/AdvancedFrame.cpp:545
+#: clientgui/AdvancedFrame.cpp:555
 msgid "Allow GPU work according to preferences"
 msgstr "依照您的偏好設定執行 GPU 任務"
 
-#: clientgui/AdvancedFrame.cpp:549
+#: clientgui/AdvancedFrame.cpp:559
 msgid "Suspend GPU"
 msgstr "暫停 GPU"
 
-#: clientgui/AdvancedFrame.cpp:550
+#: clientgui/AdvancedFrame.cpp:560
 msgid "Stop GPU work regardless of preferences"
 msgstr "不管偏好設定停止 GPU 任務"
 
-#: clientgui/AdvancedFrame.cpp:574
-msgid "Network activity always allowed"
+#: clientgui/AdvancedFrame.cpp:584
+msgid "Network activity always"
 msgstr "保持網路活動"
 
-#: clientgui/AdvancedFrame.cpp:575
+#: clientgui/AdvancedFrame.cpp:585
 msgid "Allow network activity regardless of preferences"
 msgstr "不管偏好設定進行網路活動"
 
-#: clientgui/AdvancedFrame.cpp:579
+#: clientgui/AdvancedFrame.cpp:589
 msgid "Network activity based on preferences"
 msgstr "依照偏好設定連線網路(&P)"
 
-#: clientgui/AdvancedFrame.cpp:580
+#: clientgui/AdvancedFrame.cpp:590
 msgid "Allow network activity according to preferences"
 msgstr "依照您的偏好設定保持網路活動"
 
-#: clientgui/AdvancedFrame.cpp:584
-msgid "Network activity suspended"
+#: clientgui/AdvancedFrame.cpp:594
+msgid "Suspend network activity"
 msgstr "暫停網路活動"
 
-#: clientgui/AdvancedFrame.cpp:585
-msgid "Stop BOINC network activity"
-msgstr "停止 BONIC 的網路活動"
+#: clientgui/AdvancedFrame.cpp:595
+msgid "Stop network activity"
+msgstr "停止網路活動"
 
-#: clientgui/AdvancedFrame.cpp:594
+#: clientgui/AdvancedFrame.cpp:604 clientgui/sg_BoincSimpleFrame.cpp:191
 msgid "Computing &preferences..."
 msgstr "運算偏好設定 (&P)..."
 
-#: clientgui/AdvancedFrame.cpp:595
+#: clientgui/AdvancedFrame.cpp:605 clientgui/sg_BoincSimpleFrame.cpp:192
 msgid "Configure computing preferences"
 msgstr "配置運算偏好設定"
 
-#: clientgui/AdvancedFrame.cpp:600
+#: clientgui/AdvancedFrame.cpp:610
 msgid "Exclusive applications..."
 msgstr "衝突程式..."
 
-#: clientgui/AdvancedFrame.cpp:601
+#: clientgui/AdvancedFrame.cpp:611
 msgid "Configure exclusive applications"
 msgstr "配置衝突程式"
 
-#: clientgui/AdvancedFrame.cpp:606
+#: clientgui/AdvancedFrame.cpp:616
 msgid "Select columns..."
 msgstr "選擇欄位..."
 
-#: clientgui/AdvancedFrame.cpp:607
+#: clientgui/AdvancedFrame.cpp:617
 msgid "Select which columns to display"
 msgstr "選擇欲顯示的欄位"
 
-#: clientgui/AdvancedFrame.cpp:611
+#: clientgui/AdvancedFrame.cpp:621
 msgid "Event Log options...\tCtrl+Shift+F"
 msgstr "事件記錄檔選項...\tCtrl+Shift+F"
 
-#: clientgui/AdvancedFrame.cpp:612
+#: clientgui/AdvancedFrame.cpp:622
 msgid "Enable or disable various diagnostic messages"
 msgstr "啟用或停用各種診斷訊息"
 
-#: clientgui/AdvancedFrame.cpp:616
+#: clientgui/AdvancedFrame.cpp:626 clientgui/sg_BoincSimpleFrame.cpp:197
 msgid "&Other options..."
 msgstr "其他選項... (&O)"
 
-#: clientgui/AdvancedFrame.cpp:617
+#: clientgui/AdvancedFrame.cpp:627
 msgid "Configure display options and network settings"
 msgstr "配置顯示選項和網路設置"
 
-#: clientgui/AdvancedFrame.cpp:622
+#: clientgui/AdvancedFrame.cpp:632
 msgid "Read config files"
 msgstr "讀取設定資料檔"
 
-#: clientgui/AdvancedFrame.cpp:623
+#: clientgui/AdvancedFrame.cpp:633
 msgid ""
 "Read configuration info from cc_config.xml and any app_config.xml files"
 msgstr "從cc_config.xml和任何app_config.xml檔案讀取配置資訊"
 
-#: clientgui/AdvancedFrame.cpp:627
+#: clientgui/AdvancedFrame.cpp:637
 msgid "Read local prefs file"
 msgstr "讀取本機偏好設定"
 
-#: clientgui/AdvancedFrame.cpp:628
+#: clientgui/AdvancedFrame.cpp:638
 msgid "Read preferences from global_prefs_override.xml."
 msgstr "從 global_prefs_override.xml 讀取偏好設定。"
 
-#: clientgui/AdvancedFrame.cpp:636
+#: clientgui/AdvancedFrame.cpp:646 clientgui/sg_BoincSimpleFrame.cpp:219
 #, c-format
 msgid "%s &help"
 msgstr "%s 說明 (&H)"
 
-#: clientgui/AdvancedFrame.cpp:640
+#: clientgui/AdvancedFrame.cpp:650 clientgui/sg_BoincSimpleFrame.cpp:223
 #, c-format
 msgid "Show information about %s"
 msgstr "顯示關於 %s 的資訊"
 
-#: clientgui/AdvancedFrame.cpp:650
+#: clientgui/AdvancedFrame.cpp:660
 #, c-format
 msgid "&%s help"
 msgstr "說明 (&%s)"
 
-#: clientgui/AdvancedFrame.cpp:654
+#: clientgui/AdvancedFrame.cpp:664 clientgui/sg_BoincSimpleFrame.cpp:237
 #, c-format
 msgid "Show information about the %s"
 msgstr "顯示關於 %s 的資訊"
 
-#: clientgui/AdvancedFrame.cpp:665
+#: clientgui/AdvancedFrame.cpp:675 clientgui/sg_BoincSimpleFrame.cpp:247
 #, c-format
 msgid "%s &web site"
 msgstr "%s &網站"
 
-#: clientgui/AdvancedFrame.cpp:669
+#: clientgui/AdvancedFrame.cpp:679 clientgui/sg_BoincSimpleFrame.cpp:251
 #, c-format
 msgid "Show information about BOINC and %s"
 msgstr "顯示關於 BONIC 及 %s 的資訊"
 
-#: clientgui/AdvancedFrame.cpp:680 clientgui/BOINCTaskBar.cpp:544
+#: clientgui/AdvancedFrame.cpp:690 clientgui/BOINCTaskBar.cpp:541
+#: clientgui/sg_BoincSimpleFrame.cpp:262
 #, c-format
 msgid "&About %s..."
 msgstr "關於 %s (&A)"
 
-#: clientgui/AdvancedFrame.cpp:686
+#: clientgui/AdvancedFrame.cpp:696 clientgui/sg_BoincSimpleFrame.cpp:268
 msgid "Licensing and copyright information."
 msgstr "授權與版權資訊。"
 
-#: clientgui/AdvancedFrame.cpp:693
+#: clientgui/AdvancedFrame.cpp:703 clientgui/sg_BoincSimpleFrame.cpp:275
 msgid "&File"
 msgstr "檔案 (&F)"
 
-#: clientgui/AdvancedFrame.cpp:697
+#: clientgui/AdvancedFrame.cpp:707 clientgui/sg_BoincSimpleFrame.cpp:279
 msgid "&View"
 msgstr "檢視 (&V)"
 
-#: clientgui/AdvancedFrame.cpp:701
+#: clientgui/AdvancedFrame.cpp:711
 msgid "&Activity"
 msgstr "活動 (&A)"
 
-#: clientgui/AdvancedFrame.cpp:705
+#: clientgui/AdvancedFrame.cpp:715 clientgui/sg_BoincSimpleFrame.cpp:283
 msgid "&Options"
 msgstr "選項 (&O)"
 
-#: clientgui/AdvancedFrame.cpp:709
+#: clientgui/AdvancedFrame.cpp:719 clientgui/sg_BoincSimpleFrame.cpp:287
 msgid "&Tools"
 msgstr "工具 (&T)"
 
-#: clientgui/AdvancedFrame.cpp:713
+#: clientgui/AdvancedFrame.cpp:723 clientgui/sg_BoincSimpleFrame.cpp:291
+#: clientgui/wizardex.cpp:374 clientgui/wizardex.cpp:381
 msgid "&Help"
 msgstr "說明 (&H)"
 
-#: clientgui/AdvancedFrame.cpp:1188
+#: clientgui/AdvancedFrame.cpp:1237
 #, c-format
 msgid "%s - Stop using %s"
 msgstr "%s - 停止使用 %s"
 
-#: clientgui/AdvancedFrame.cpp:1193
+#: clientgui/AdvancedFrame.cpp:1242
 #, c-format
 msgid ""
 "If you stop using %s,\n"
@@ -572,39 +579,39 @@ msgid ""
 "Do you want to stop using %s?"
 msgstr "如果您停止使用 %s,你會保留所有目前的計畫,\n但您必須手動管理計畫。\n\n您確定要停止使用 %s 嗎?"
 
-#: clientgui/AdvancedFrame.cpp:1420
+#: clientgui/AdvancedFrame.cpp:1471
 #, c-format
 msgid "%s - Shut down the current client..."
 msgstr "%s - 關閉目前客戶端..."
 
-#: clientgui/AdvancedFrame.cpp:1429
+#: clientgui/AdvancedFrame.cpp:1480
 #, c-format
 msgid ""
 "%s will shut down the current client\n"
 "and prompt you for another host to connect to."
 msgstr "%s 將會關閉目前的客戶端\n然後提示您輸入想要連結的客戶端。"
 
-#: clientgui/AdvancedFrame.cpp:1832
+#: clientgui/AdvancedFrame.cpp:1883 clientgui/DlgAbout.cpp:119
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: clientgui/AdvancedFrame.cpp:1841
+#: clientgui/AdvancedFrame.cpp:1892
 #, c-format
 msgid "%s has successfully added %s"
 msgstr "%s 已成功加入 %s 計畫。"
 
-#: clientgui/AdvancedFrame.cpp:1977
+#: clientgui/AdvancedFrame.cpp:2028
 #, c-format
 msgid "%s - (%s)"
 msgstr "%s - (%s)"
 
-#: clientgui/AdvancedFrame.cpp:1981
+#: clientgui/AdvancedFrame.cpp:2032
 #, c-format
 msgid "Connecting to %s"
 msgstr "正在連線到 %s"
 
-#: clientgui/AdvancedFrame.cpp:1984
+#: clientgui/AdvancedFrame.cpp:2035
 #, c-format
 msgid "Connected to %s (%s)"
 msgstr "已連線到 %s (%s)"
@@ -652,7 +659,9 @@ msgstr "結束 %s (&X)"
 msgid "%s - Communication"
 msgstr "%s - 網路通訊"
 
-#: clientgui/AsyncRPC.cpp:1056
+#: clientgui/AsyncRPC.cpp:1056 clientgui/DlgAdvPreferencesBase.cpp:168
+#: clientgui/DlgDiagnosticLogFlags.cpp:127 clientgui/DlgExclusiveApps.cpp:152
+#: clientgui/DlgHiddenColumns.cpp:108 clientgui/sg_DlgPreferences.cpp:357
 msgid "Cancel"
 msgstr "取消"
 
@@ -710,7 +719,7 @@ msgstr "%s 無法啟動 %s 客戶端的程式。 \n請依次 控制面板->管
 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:696
 #, c-format
@@ -725,16 +734,17 @@ msgid ""
 "To connect up to your local computer please use 'localhost' as the host name."
 msgstr "%s 目前未連線到 %s 用戶端。\n請選擇「檔案」>「選擇電腦...」來連到 %s 用戶端。\n要連線到本機電腦,請於主機名稱輸入「localhost」。"
 
+#. Create the web sites task group
 #: clientgui/BOINCBaseView.cpp:790
 msgid "Project web pages"
 msgstr "專案網站"
 
-#: clientgui/BOINCClientManager.cpp:573
+#: clientgui/BOINCClientManager.cpp:547
 #, c-format
 msgid "%s - Unexpected Exit"
 msgstr "%s - 關閉確認視窗"
 
-#: clientgui/BOINCClientManager.cpp:583
+#: clientgui/BOINCClientManager.cpp:557
 #, c-format
 msgid ""
 "The %s client has exited unexpectedly 3 times within the last %d minutes.\n"
@@ -785,7 +795,7 @@ msgstr "%s 已成功從網路斷線。"
 msgid "%s failed to disconnected from the Internet."
 msgstr "%s 從網路斷線失敗。"
 
-#: clientgui/BOINCGUIApp.cpp:597
+#: clientgui/BOINCGUIApp.cpp:356
 #, c-format
 msgid ""
 "You currently are not authorized to manage the client.\n"
@@ -798,161 +808,170 @@ msgid ""
 "     user group."
 msgstr "您目前沒有權限管理本用戶端。\n\n要在目前用戶下執行 %s,請:\n- 重新安裝 %s,在被問到關於非系統管理員用戶的問題時,回答\"是\"\n- 聯繫系統管理員將您加入到“boinc_master”用戶群組。"
 
-#: clientgui/BOINCGUIApp.cpp:603
+#: clientgui/BOINCGUIApp.cpp:362
 #, c-format
 msgid ""
 "%s ownership or permissions are not set properly; please reinstall %s.\n"
 "(Error code %d"
 msgstr "%s的權限設定不當,請重新安裝%s。\n(錯誤代碼 %d"
 
-#: clientgui/BOINCGUIApp.cpp:609
+#: clientgui/BOINCGUIApp.cpp:368
 msgid " at "
 msgstr "最多只使用"
 
-#: clientgui/BOINCGUIApp.cpp:612
+#: clientgui/BOINCGUIApp.cpp:371 clientgui/MainDocument.cpp:2495
+#: clientgui/MainDocument.cpp:2554 clientgui/ViewTransfers.cpp:867
 msgid ")"
 msgstr ")"
 
-#: clientgui/BOINCGUIApp.cpp:642
+#: clientgui/BOINCGUIApp.cpp:401
 msgid ""
 "A reboot is required in order for BOINC to run properly.\n"
 "Please reboot your computer and try again."
 msgstr "BOINC 需要在重新開機後才能運作。\n請先將電腦重新開機再試。"
 
-#: clientgui/BOINCGUIApp.cpp:643
+#: clientgui/BOINCGUIApp.cpp:402 clientgui/DlgAbout.cpp:153
 msgid "BOINC Manager"
 msgstr "BOINC Manager"
 
-#: clientgui/BOINCGUIApp.cpp:904
+#: clientgui/BOINCGUIApp.cpp:664
 msgid "BOINC Manager was started by the operating system automatically"
 msgstr "BOINC Manager 已經由作業系統啟動"
 
-#: clientgui/BOINCGUIApp.cpp:906
+#: clientgui/BOINCGUIApp.cpp:666
 msgid "Startup BOINC so only the system tray icon is visible"
 msgstr "只以系統匣圖示啟動 BOINC"
 
-#: clientgui/BOINCGUIApp.cpp:908
+#: clientgui/BOINCGUIApp.cpp:668
 msgid "Directory containing the BOINC Client executable"
 msgstr "包含 BOINC 客戶端執行的目錄"
 
-#: clientgui/BOINCGUIApp.cpp:909
+#: clientgui/BOINCGUIApp.cpp:669
 msgid "BOINC data directory"
 msgstr "BOINC 數據目錄"
 
-#: clientgui/BOINCGUIApp.cpp:911
+#: clientgui/BOINCGUIApp.cpp:671
 msgid "Host name or IP address"
 msgstr "電腦名稱或 IP 位址"
 
-#: clientgui/BOINCGUIApp.cpp:912
+#: clientgui/BOINCGUIApp.cpp:672
 msgid "GUI RPC port number"
 msgstr "圖形介面 RPC port"
 
-#: clientgui/BOINCGUIApp.cpp:913
+#: clientgui/BOINCGUIApp.cpp:673
 msgid "Password"
 msgstr "密碼"
 
-#: clientgui/BOINCGUIApp.cpp:914
+#: clientgui/BOINCGUIApp.cpp:674
 msgid "Startup BOINC with these optional arguments"
 msgstr "以這些選用參數啟動 BOINC"
 
-#: clientgui/BOINCGUIApp.cpp:915
+#: clientgui/BOINCGUIApp.cpp:675
 msgid "disable BOINC security users and permissions"
 msgstr "停用 BOINC 安全性使用者和權限"
 
-#: clientgui/BOINCGUIApp.cpp:916
+#: clientgui/BOINCGUIApp.cpp:676
 msgid "set skin debugging mode to enable skin manager error messages"
 msgstr "設置介面調試模式已啟用介面管理器的錯誤消息記錄"
 
-#: clientgui/BOINCGUIApp.cpp:917
+#: clientgui/BOINCGUIApp.cpp:677
 msgid "multiple instances of BOINC Manager allowed"
 msgstr "允許執行多個 BOINC Manager"
 
-#: clientgui/BOINCGUIApp.cpp:919
+#: clientgui/BOINCGUIApp.cpp:679
 msgid "Not used: workaround for bug in XCode 4.2"
 msgstr "未使用:用於臨時修復 XCode 4.2 的錯誤"
 
-#: clientgui/BOINCGUIApp.cpp:1166
+#: clientgui/BOINCGUIApp.cpp:681
+msgid "Not run the daemon"
+msgstr "不執行守護程式"
+
+#. These are just special tags so deal with them in a special way
+#: clientgui/BOINCGUIApp.cpp:931
 msgid "(Automatic Detection)"
 msgstr "(自動偵測)"
 
-#: clientgui/BOINCGUIApp.cpp:1167
+#: clientgui/BOINCGUIApp.cpp:932
 msgid "(Unknown)"
 msgstr "(未知的語言)"
 
-#: clientgui/BOINCGUIApp.cpp:1168
+#: clientgui/BOINCGUIApp.cpp:933
 msgid "(User Defined)"
 msgstr "(使用者定義)"
 
-#: clientgui/BOINCTaskBar.cpp:522
+#: clientgui/BOINCTaskBar.cpp:519
 #, c-format
 msgid "Open %s Web..."
 msgstr "開啟 %s 網站..."
 
-#: clientgui/BOINCTaskBar.cpp:529
+#: clientgui/BOINCTaskBar.cpp:526
 #, c-format
 msgid "Open %s..."
 msgstr "開啟 %s..."
 
-#: clientgui/BOINCTaskBar.cpp:536 clientgui/BOINCTaskBar.cpp:633
-#: clientgui/BOINCTaskBar.cpp:641
+#: clientgui/BOINCTaskBar.cpp:533 clientgui/BOINCTaskBar.cpp:631
+#: clientgui/BOINCTaskBar.cpp:636
 msgid "Snooze"
 msgstr "暫停執行"
 
-#: clientgui/BOINCTaskBar.cpp:538 clientgui/BOINCTaskBar.cpp:660
-#: clientgui/BOINCTaskBar.cpp:668
+#: clientgui/BOINCTaskBar.cpp:535 clientgui/BOINCTaskBar.cpp:650
+#: clientgui/BOINCTaskBar.cpp:655
 msgid "Snooze GPU"
 msgstr "暫停執行 GPU"
 
-#: clientgui/BOINCTaskBar.cpp:556
+#: clientgui/BOINCTaskBar.cpp:553
 msgid "E&xit"
 msgstr "結束 (&X)"
 
-#: clientgui/BOINCTaskBar.cpp:626
+#: clientgui/BOINCTaskBar.cpp:626 clientgui/ViewProjects.cpp:804
+#: clientgui/ViewWork.cpp:882 clientgui/sg_BoincSimpleFrame.cpp:894
+#: clientgui/sg_ProjectCommandPopup.cpp:125
+#: clientgui/sg_TaskCommandPopup.cpp:118
 msgid "Resume"
 msgstr "恢復"
 
-#: clientgui/BOINCTaskBar.cpp:653
+#: clientgui/BOINCTaskBar.cpp:646
 msgid "Resume GPU"
 msgstr "恢復 GPU"
 
-#: clientgui/BOINCTaskBar.cpp:727
+#: clientgui/BOINCTaskBar.cpp:712
 msgid "Computing is enabled"
 msgstr "運算已啟用"
 
-#: clientgui/BOINCTaskBar.cpp:731
+#: clientgui/BOINCTaskBar.cpp:716
 msgid "Computing is suspended - "
 msgstr "運算已暫停 - "
 
-#: clientgui/BOINCTaskBar.cpp:741
+#: clientgui/BOINCTaskBar.cpp:726
 msgid "GPU computing is enabled"
 msgstr "GPU 運算已啟用"
 
-#: clientgui/BOINCTaskBar.cpp:744
+#: clientgui/BOINCTaskBar.cpp:729
 msgid "GPU computing is suspended - "
 msgstr "GPU 運算已暫停 - "
 
-#: clientgui/BOINCTaskBar.cpp:753
+#: clientgui/BOINCTaskBar.cpp:738
 msgid "Network is enabled"
 msgstr "網路已啟用"
 
-#: clientgui/BOINCTaskBar.cpp:756
+#: clientgui/BOINCTaskBar.cpp:741
 msgid "Network is suspended - "
 msgstr "網路已暫停 - "
 
-#: clientgui/BOINCTaskBar.cpp:764
+#: clientgui/BOINCTaskBar.cpp:749
 msgid "Reconnecting to client."
 msgstr "重新連線到客戶端。"
 
-#: clientgui/BOINCTaskBar.cpp:766
+#: clientgui/BOINCTaskBar.cpp:751
 msgid "Not connected to a client."
 msgstr "未連線到客戶端。"
 
-#: clientgui/BOINCTaskBar.cpp:819
+#: clientgui/BOINCTaskBar.cpp:804
 #, c-format
 msgid "%s Notices"
 msgstr "%s 訊息"
 
-#: clientgui/BOINCTaskBar.cpp:825
+#: clientgui/BOINCTaskBar.cpp:810
 msgid "There are new notices - click to view."
 msgstr "有新訊息 - 前往觀看。"
 
@@ -1011,6 +1030,7 @@ msgstr "從 %s 更新已完成。"
 msgid "Update completed."
 msgstr "更新已完成。"
 
+#. Attach Completed
 #: clientgui/CompletionPage.cpp:247
 msgid "Now using account manager"
 msgstr "正在使用帳戶管理服務"
@@ -1057,48 +1077,52 @@ 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:211
-msgid "for more information."
-msgstr "了解更多資訊。"
+msgid "For more information, visit "
+msgstr "要獲取更多資訊,請訪問"
 
-#: clientgui/DlgAbout.cpp:219 clientgui/DlgExitMessage.cpp:173
-#: clientgui/DlgGenericMessage.cpp:120 clientgui/DlgOptions.cpp:399
+#: clientgui/DlgAbout.cpp:215 clientgui/DlgExitMessage.cpp:173
+#: clientgui/DlgGenericMessage.cpp:120 clientgui/DlgOptions.cpp:410
 #: clientgui/DlgSelectComputer.cpp:163
 msgid "&OK"
 msgstr "確定 (&O)"
 
-#: clientgui/DlgAdvPreferences.cpp:669
+#: clientgui/DlgAdvPreferences.cpp:684 clientgui/sg_DlgPreferences.cpp:775
 msgid "Invalid number"
 msgstr "無效數字"
 
-#: clientgui/DlgAdvPreferences.cpp:670
+#: clientgui/DlgAdvPreferences.cpp:685 clientgui/sg_DlgPreferences.cpp:776
 msgid "Invalid time, value must be between 0:00 and 24:00, format is HH:MM"
 msgstr "無效時間,時間必須介於0:00到24:00,格式為HH:MM"
 
-#: clientgui/DlgAdvPreferences.cpp:671
+#: clientgui/DlgAdvPreferences.cpp:686 clientgui/sg_DlgPreferences.cpp:777
+msgid "Start time must be different from end time"
+msgstr "起始時間必須和結束時間不同"
+
+#: clientgui/DlgAdvPreferences.cpp:687
 msgid "Number must be between 0 and 10"
 msgstr "數字必須在1到10之間"
 
-#: clientgui/DlgAdvPreferences.cpp:672
+#: clientgui/DlgAdvPreferences.cpp:688 clientgui/sg_DlgPreferences.cpp:778
 msgid "Number must be between 0 and 100"
 msgstr "數字必須在1到100之間"
 
-#: clientgui/DlgAdvPreferences.cpp:905
+#: clientgui/DlgAdvPreferences.cpp:689
+msgid "Number must be between 1 and 100"
+msgstr "數字必須介於 1 和 100 之間"
+
+#: clientgui/DlgAdvPreferences.cpp:947 clientgui/sg_DlgPreferences.cpp:849
 msgid "invalid input value detected"
 msgstr "偵測到無效的輸入值"
 
-#: clientgui/DlgAdvPreferences.cpp:907
+#: clientgui/DlgAdvPreferences.cpp:959 clientgui/sg_DlgPreferences.cpp:861
 msgid "Validation Error"
 msgstr "驗證錯誤"
 
-#: clientgui/DlgAdvPreferences.cpp:1119
+#: clientgui/DlgAdvPreferences.cpp:1171
 msgid "Discard local preferences and use web-based preferences?"
 msgstr "放棄本機偏好設定改用網站偏好設定?"
 
-#: clientgui/DlgAdvPreferences.cpp:1120
+#: clientgui/DlgAdvPreferences.cpp:1172 clientgui/sg_DlgPreferences.cpp:1187
 msgid "Confirmation"
 msgstr "確認"
 
@@ -1107,106 +1131,95 @@ msgstr "確認"
 msgid "%s - Computing preferences"
 msgstr "%s - 運算偏好設定"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:77
+#: clientgui/DlgAdvPreferencesBase.cpp:82 clientgui/sg_DlgPreferences.cpp:163
 msgid ""
 "Using local preferences.\n"
 "Click \"Use web prefs\" to use web-based preferences from"
 msgstr "目前正使用本機偏好設定。\n點擊 \"使用網站設定\" 可改用來自下列網站的偏好設定"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:85
+#: clientgui/DlgAdvPreferencesBase.cpp:90 clientgui/sg_DlgPreferences.cpp:171
 msgid "Using web-based preferences from"
 msgstr "目前正使用下列網站的偏好設定"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:102
+#: clientgui/DlgAdvPreferencesBase.cpp:107 clientgui/sg_DlgPreferences.cpp:189
 msgid "Set values and click OK to use local preferences instead."
 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 "Clear"
-msgstr "清除"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:115
-msgid "Clear all local preferences and close the dialog."
-msgstr "清除所有本機偏好設定並關閉視窗。"
-
-#: clientgui/DlgAdvPreferencesBase.cpp:118
+#: clientgui/DlgAdvPreferencesBase.cpp:115 clientgui/sg_DlgPreferences.cpp:217
 msgid "Use web prefs"
 msgstr "使用網站設定"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:119
+#: clientgui/DlgAdvPreferencesBase.cpp:116 clientgui/sg_DlgPreferences.cpp:218
 msgid "Restore web-based preferences and close the dialog."
 msgstr "還原至網站偏好設定並關閉視窗。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:143
-#: clientgui/DlgAdvPreferencesBase.cpp:637
+#: clientgui/DlgAdvPreferencesBase.cpp:140
+#: clientgui/DlgAdvPreferencesBase.cpp:684
 msgid "Computing"
 msgstr "運算設定"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:146
-#: clientgui/DlgAdvPreferencesBase.cpp:785
+#. Network schedule
+#: clientgui/DlgAdvPreferencesBase.cpp:143
+#: clientgui/DlgAdvPreferencesBase.cpp:886
 msgid "Network"
 msgstr "網路使用"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:149
+#: clientgui/DlgAdvPreferencesBase.cpp:146
 msgid "Disk and memory"
 msgstr "硬碟和記憶體"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:152
+#: clientgui/DlgAdvPreferencesBase.cpp:149
 msgid "Daily schedules"
 msgstr "每日排程"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:165
+#: clientgui/DlgAdvPreferencesBase.cpp:162
 #: clientgui/DlgDiagnosticLogFlags.cpp:119 clientgui/DlgExclusiveApps.cpp:146
-#: clientgui/DlgHiddenColumns.cpp:100
+#: clientgui/DlgHiddenColumns.cpp:100 clientgui/sg_DlgPreferences.cpp:353
 msgid "OK"
 msgstr "確定"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:166
+#: clientgui/DlgAdvPreferencesBase.cpp:163
 msgid "Save all values and close the dialog."
 msgstr "儲存並關閉視窗。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:172
+#: clientgui/DlgAdvPreferencesBase.cpp:169
 msgid "Close the dialog without saving."
 msgstr "不儲存並關閉視窗"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:176 clientgui/DlgExclusiveApps.cpp:157
+#: clientgui/DlgAdvPreferencesBase.cpp:173 clientgui/DlgExclusiveApps.cpp:157
+#: clientgui/Localization.cpp:35 clientgui/Localization.cpp:121
+#: clientgui/Localization.cpp:139 clientgui/sg_BoincSimpleFrame.cpp:930
+#: clientgui/sg_DlgPreferences.cpp:363
 msgid "Help"
 msgstr "幫助"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:177
+#: clientgui/DlgAdvPreferencesBase.cpp:174
 msgid "Shows the preferences web page."
 msgstr "開啟偏好設定網頁。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:239
-#: clientgui/DlgAdvPreferencesBase.cpp:425
+#: clientgui/DlgAdvPreferencesBase.cpp:236
+#: clientgui/DlgAdvPreferencesBase.cpp:463
 msgid "Usage limits"
 msgstr "使用限制"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:244
+#: clientgui/DlgAdvPreferencesBase.cpp:241
 #, 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:246
-#: clientgui/DlgAdvPreferencesBase.cpp:258
+#: clientgui/DlgAdvPreferencesBase.cpp:243
+#: clientgui/DlgAdvPreferencesBase.cpp:255 clientgui/sg_DlgPreferences.cpp:286
 msgid "Use at most"
 msgstr "最多只使用"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:251
+#: clientgui/DlgAdvPreferencesBase.cpp:248
 #, no-c-format
 msgid "% of the CPUs"
 msgstr "% CPU核心"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:256
+#: clientgui/DlgAdvPreferencesBase.cpp:253 clientgui/sg_DlgPreferences.cpp:284
 #, no-c-format
 msgid ""
 "Suspend/resume computing every few seconds to reduce CPU temperature and "
@@ -1214,342 +1227,363 @@ msgid ""
 "and repeat."
 msgstr "週期內自動暫停/繼續運算以達到降低CPU溫度及能源消耗。例如: 75% 表示每運算 3 秒,休息 1 秒,並重複循環。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:263
+#: clientgui/DlgAdvPreferencesBase.cpp:260 clientgui/sg_DlgPreferences.cpp:291
 #, no-c-format
 msgid "% of CPU time"
 msgstr "% CPU時間"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:270
+#: clientgui/DlgAdvPreferencesBase.cpp:267
 msgid "When to suspend"
 msgstr "何時暫停"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:276
+#: clientgui/DlgAdvPreferencesBase.cpp:273 clientgui/sg_DlgPreferences.cpp:239
 msgid "Suspend when computer is on battery"
 msgstr "當電腦使用電池時暫停"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:279
+#: clientgui/DlgAdvPreferencesBase.cpp:276 clientgui/sg_DlgPreferences.cpp:235
 msgid ""
 "Check this to suspend computing on portables when running on battery power."
 msgstr "當筆記型電腦使用電池時暫停運算。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:285
+#: clientgui/DlgAdvPreferencesBase.cpp:282 clientgui/sg_DlgPreferences.cpp:253
 msgid "Suspend when computer is in use"
 msgstr "當電腦使用時暫停"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:288
+#: clientgui/DlgAdvPreferencesBase.cpp:285 clientgui/sg_DlgPreferences.cpp:249
 msgid ""
 "Check this to suspend computing and file transfers when you're using the "
 "computer."
 msgstr "當您正在使用電腦時暫停運算及檔案傳輸。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:294
+#: clientgui/DlgAdvPreferencesBase.cpp:291
 msgid "Suspend GPU computing when computer is in use"
 msgstr "當電腦使用時暫停GPU運算"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:297
+#: clientgui/DlgAdvPreferencesBase.cpp:294
 msgid "Check this to suspend GPU computing when you're using the computer."
 msgstr "當您正在使電腦時暫停GPU運算。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:302
+#. min idle time
+#: clientgui/DlgAdvPreferencesBase.cpp:299 clientgui/sg_DlgPreferences.cpp:264
 msgid "This determines when the computer is considered 'in use'."
 msgstr "用於判斷電腦是否於'使用中'。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:306
+#. context: 'In use' means mouse/keyboard input in last ___ minutes
+#: clientgui/DlgAdvPreferencesBase.cpp:304 clientgui/sg_DlgPreferences.cpp:268
 msgid "'In use' means mouse/keyboard input in last"
 msgstr "'使用中'代表滑鼠/鍵盤在"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:314
-#: clientgui/DlgAdvPreferencesBase.cpp:387
+#. context: 'In use' means mouse/keyboard input in last ___ minutes
+#. context: Switch between tasks every ___ minutes
+#: clientgui/DlgAdvPreferencesBase.cpp:315
+#: clientgui/DlgAdvPreferencesBase.cpp:413 clientgui/sg_DlgPreferences.cpp:276
 msgid "minutes"
 msgstr "分鐘內仍有動作"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:321
-#, c-format
-msgid "Suspend when non-%s CPU usage is above"
-msgstr "暫停當非%s的CPU使用率高於"
-
 #: clientgui/DlgAdvPreferencesBase.cpp:323
+msgid "Suspend when non-BOINC CPU usage is above"
+msgstr "暫停當非 BOINC 的 CPU 使用率高於"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:325
 msgid "Suspend computing when your computer is busy running other programs."
 msgstr "當電腦正忙於其他程式時暫停運算。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:344
-#: clientgui/DlgAdvPreferencesBase.cpp:474
+#: clientgui/DlgAdvPreferencesBase.cpp:339
+msgid "To suspend by time of day, see the \"Daily Schedules\" section."
+msgstr "若要在一天的特定時間暫停,請參見\"日程\"一節。"
+
+#. Context: heading for a group of miscellaneous preferences
+#: clientgui/DlgAdvPreferencesBase.cpp:349
+#: clientgui/DlgAdvPreferencesBase.cpp:516
 msgid "Other"
 msgstr "其他"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:349
+#. buffer sizes
+#: clientgui/DlgAdvPreferencesBase.cpp:355
 msgid "Store at least enough tasks to keep the computer busy for this long."
 msgstr "預先下載足夠的任務以保持電腦持續運算。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:352
+#. context: Store at least ___ days of work
+#: clientgui/DlgAdvPreferencesBase.cpp:359
 msgid "Store at least"
 msgstr "儲存至少"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:360
-#: clientgui/DlgAdvPreferencesBase.cpp:376
+#. context: Store at least ___ days of work
+#. context: Store up to an additional ___ days of work
+#: clientgui/DlgAdvPreferencesBase.cpp:370
+#: clientgui/DlgAdvPreferencesBase.cpp:392
 msgid "days of work"
 msgstr "天的任務"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:365
+#: clientgui/DlgAdvPreferencesBase.cpp:376
 msgid ""
 "Store additional tasks above the minimum level.  Determines how much work is"
 " requested when contacting a project."
 msgstr "儲存高於設定最小值的任務。用於判斷每次聯繫專案取得任務的多寡。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:368
+#. context: Store up to an additional ___ days of work
+#: clientgui/DlgAdvPreferencesBase.cpp:380
 msgid "Store up to an additional"
 msgstr "儲存多於"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:381
+#: clientgui/DlgAdvPreferencesBase.cpp:399
 #, c-format
 msgid "If you run several projects, %s may switch between them this often."
 msgstr "如果您有參與許多專案,%s可能會切換執行。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:383
+#. context: Switch between tasks every ___ minutes
+#: clientgui/DlgAdvPreferencesBase.cpp:404
 msgid "Switch between tasks every"
 msgstr "切換任務於每"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:391
+#: clientgui/DlgAdvPreferencesBase.cpp:419
 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 later "
+"can be continued from that point."
+msgstr "這個選項決定計算任務向磁碟儲存其進度的頻繁程度,以便於之後重新啟動。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:392
+#. context: Request tasks to checkpoint at most every ___ seconds
+#: clientgui/DlgAdvPreferencesBase.cpp:423
 msgid "Request tasks to checkpoint at most every"
 msgstr "要求任務最多每"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:396
+#. context: Request tasks to checkpoint at most every ___ seconds
+#: clientgui/DlgAdvPreferencesBase.cpp:432
 msgid "seconds"
 msgstr "秒執行檢查點操作"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:431
+#. upload/download rates
+#: clientgui/DlgAdvPreferencesBase.cpp:469
 msgid "Limit the download rate of file transfers."
 msgstr "限制檔案下載速率。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:432
+#: clientgui/DlgAdvPreferencesBase.cpp:470
 msgid "Limit download rate to"
 msgstr "限制下載速率"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:436
-#: clientgui/DlgAdvPreferencesBase.cpp:445
+#: clientgui/DlgAdvPreferencesBase.cpp:474
+#: clientgui/DlgAdvPreferencesBase.cpp:483
 msgid "KB/second"
 msgstr "Kb/s"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:440
+#: clientgui/DlgAdvPreferencesBase.cpp:478
 msgid "Limit the upload rate of file transfers."
 msgstr "限制檔案上傳速率。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:441
+#: clientgui/DlgAdvPreferencesBase.cpp:479
 msgid "Limit upload rate to"
 msgstr "限制上傳速率"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:452
+#: clientgui/DlgAdvPreferencesBase.cpp:490
 #, c-format
 msgid "Example: %s should transfer at most 2000 MB of data every 30 days."
 msgstr "例如: %s能在每30天傳送2000MB的數據。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:454
+#: clientgui/DlgAdvPreferencesBase.cpp:492
 msgid "Limit usage to"
 msgstr "限制傳送數據"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:458
+#: clientgui/DlgAdvPreferencesBase.cpp:496
 msgid "MB every"
 msgstr "MB 每"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:462
+#: clientgui/DlgAdvPreferencesBase.cpp:500
 msgid "days"
 msgstr "天"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:479
+#: clientgui/DlgAdvPreferencesBase.cpp:505
+msgid "To limit transfers by time of day, see the \"Daily Schedules\" section."
+msgstr "若要在一天的特定時間限制通訊,請參見\"日程\"一節。"
+
+#: clientgui/DlgAdvPreferencesBase.cpp:522
 #, c-format
 msgid ""
 "Check this only if your Internet provider modifies image files. Skipping "
 "verification reduces the security of %s."
 msgstr "建議僅在您的網路供應商會修改圖檔時使用。略過驗證會降低%s的安全性。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:481
+#: clientgui/DlgAdvPreferencesBase.cpp:524
 msgid "Skip data verification for image files"
 msgstr "略過圖檔驗證"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:485
+#: clientgui/DlgAdvPreferencesBase.cpp:528
 msgid "Confirm before connecting to Internet"
 msgstr "連線前確認"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:486
-#: clientgui/DlgAdvPreferencesBase.cpp:490
+#: clientgui/DlgAdvPreferencesBase.cpp:529
+#: clientgui/DlgAdvPreferencesBase.cpp:533
 msgid "Useful only if you have a modem, ISDN or VPN connection."
 msgstr "適用於數據機, ISDN 或 VPN 連線。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:489
+#: clientgui/DlgAdvPreferencesBase.cpp:532
 msgid "Disconnect when done"
 msgstr "完成後斷線"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:516
+#: clientgui/DlgAdvPreferencesBase.cpp:559 clientgui/ViewResources.cpp:116
 msgid "Disk"
 msgstr "硬碟"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:521
+#: clientgui/DlgAdvPreferencesBase.cpp:564
 #, c-format
 msgid "%s will use the most restrictive of these settings:"
 msgstr "%s 會嚴格遵守下列設定:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:527
+#: clientgui/DlgAdvPreferencesBase.cpp:570 clientgui/sg_DlgPreferences.cpp:335
 #, c-format
 msgid "Limit the total amount of disk space used by %s."
 msgstr "限制%s使用硬碟空間。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:530
-#: clientgui/DlgAdvPreferencesBase.cpp:554
+#: clientgui/DlgAdvPreferencesBase.cpp:573
+#: clientgui/DlgAdvPreferencesBase.cpp:597 clientgui/sg_DlgPreferences.cpp:338
 msgid "Use no more than"
 msgstr "使用不會超過"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:534
+#: clientgui/DlgAdvPreferencesBase.cpp:577
 msgid "GB"
 msgstr "GB"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:539
+#: clientgui/DlgAdvPreferencesBase.cpp:582
 #, c-format
 msgid ""
 "Limit disk usage to leave this much free space on the volume where %s stores"
 " data."
 msgstr "限制%s儲存資料並保留可用空間。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:542
+#: clientgui/DlgAdvPreferencesBase.cpp:585
 msgid "Leave at least"
 msgstr "保留至少"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:546
+#: clientgui/DlgAdvPreferencesBase.cpp:589
 msgid "GB free"
 msgstr "GB 可用空間"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:551
+#: clientgui/DlgAdvPreferencesBase.cpp:594
 #, c-format
 msgid ""
 "Limit the percentage of disk space used by %s on the volume where it stores "
 "data."
 msgstr "限制%s儲存資料所佔用硬碟空間百分比。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:559
+#: clientgui/DlgAdvPreferencesBase.cpp:602
 #, no-c-format
 msgid "% of total"
 msgstr "% 總硬碟空間"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:566
+#: clientgui/DlgAdvPreferencesBase.cpp:609
 msgid "Memory"
 msgstr "記憶體"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:571
+#: clientgui/DlgAdvPreferencesBase.cpp:614
 #, c-format
 msgid "Limit the memory used by %s when you're using the computer."
 msgstr "當您使用電腦時限制%s記憶體使用量。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:573
+#: clientgui/DlgAdvPreferencesBase.cpp:616
 msgid "When computer is in use, use at most"
 msgstr "當電腦使用時,最多占用"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:579
-#: clientgui/DlgAdvPreferencesBase.cpp:591
-#: clientgui/DlgAdvPreferencesBase.cpp:607
+#: clientgui/DlgAdvPreferencesBase.cpp:622
+#: clientgui/DlgAdvPreferencesBase.cpp:634
+#: clientgui/DlgAdvPreferencesBase.cpp:650
 #, no-c-format
 msgid "%"
 msgstr "%記憶體"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:584
+#: clientgui/DlgAdvPreferencesBase.cpp:627
 #, c-format
 msgid "Limit the memory used by %s when you're not using the computer."
 msgstr "限制電腦閒置時%s記憶體使用量。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:586
+#: clientgui/DlgAdvPreferencesBase.cpp:629
 msgid "When computer is not in use, use at most"
 msgstr "當電腦閒置時,最多占用"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:595
+#: clientgui/DlgAdvPreferencesBase.cpp:638
 msgid "Leave non-GPU tasks in memory while suspended"
 msgstr "暫停時保留非 GPU 任務於記憶體中"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:596
+#: clientgui/DlgAdvPreferencesBase.cpp:639
 msgid ""
 "If checked, suspended tasks stay in memory, and resume with no work lost. If"
 " unchecked, suspended tasks are removed from memory, and resume from their "
 "last checkpoint."
 msgstr "勾選後暫停時將保留任務於記憶體中,並不會遺失進度。非勾選則暫停時將會從記憶體消除,只保留進度到最新的檢查點。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:600
+#: clientgui/DlgAdvPreferencesBase.cpp:643
 #, c-format
 msgid "Limit the swap space (page file) used by %s."
 msgstr "限制交換空間(分頁檔)使用為%s"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:602
+#: clientgui/DlgAdvPreferencesBase.cpp:645
 msgid "Page/swap file: use at most"
 msgstr "分頁/交換檔:最多使用"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:627
+#: clientgui/DlgAdvPreferencesBase.cpp:670 clientgui/sg_DlgPreferences.cpp:295
 msgid "and"
 msgstr "到"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:628
+#: clientgui/DlgAdvPreferencesBase.cpp:671
 msgid "to"
 msgstr "到"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:641
+#: clientgui/DlgAdvPreferencesBase.cpp:691 clientgui/sg_DlgPreferences.cpp:296
 msgid "Compute only during a particular period each day."
 msgstr "僅在每天特定時段運算。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:644
+#: clientgui/DlgAdvPreferencesBase.cpp:694 clientgui/sg_DlgPreferences.cpp:299
 msgid "Compute only between"
 msgstr "運算將從"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:654
-#: clientgui/DlgAdvPreferencesBase.cpp:801
+#: clientgui/DlgAdvPreferencesBase.cpp:718
+#: clientgui/DlgAdvPreferencesBase.cpp:902
 msgid "Day-of-week override"
 msgstr "每日獨立設定"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:658
-#: clientgui/DlgAdvPreferencesBase.cpp:805
+#: clientgui/DlgAdvPreferencesBase.cpp:727
+#: clientgui/DlgAdvPreferencesBase.cpp:906
 msgid "Override the times above on the selected days:"
 msgstr "選定日將覆蓋上述時段:"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:676
-#: clientgui/DlgAdvPreferencesBase.cpp:822
+#: clientgui/DlgAdvPreferencesBase.cpp:750
+#: clientgui/DlgAdvPreferencesBase.cpp:923
 msgid "Monday"
 msgstr "星期一"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:691
-#: clientgui/DlgAdvPreferencesBase.cpp:837
+#: clientgui/DlgAdvPreferencesBase.cpp:777
+#: clientgui/DlgAdvPreferencesBase.cpp:938
 msgid "Friday"
 msgstr "星期五"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:704
-#: clientgui/DlgAdvPreferencesBase.cpp:850
+#: clientgui/DlgAdvPreferencesBase.cpp:792
+#: clientgui/DlgAdvPreferencesBase.cpp:951
 msgid "Tuesday"
 msgstr "星期二"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:719
-#: clientgui/DlgAdvPreferencesBase.cpp:865
+#: clientgui/DlgAdvPreferencesBase.cpp:807
+#: clientgui/DlgAdvPreferencesBase.cpp:966
 msgid "Saturday"
 msgstr "星期六"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:732
-#: clientgui/DlgAdvPreferencesBase.cpp:878
+#: clientgui/DlgAdvPreferencesBase.cpp:820
+#: clientgui/DlgAdvPreferencesBase.cpp:979
 msgid "Wednesday"
 msgstr "星期三"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:747
-#: clientgui/DlgAdvPreferencesBase.cpp:893
+#: clientgui/DlgAdvPreferencesBase.cpp:835
+#: clientgui/DlgAdvPreferencesBase.cpp:994
 msgid "Sunday"
 msgstr "星期日"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:760
-#: clientgui/DlgAdvPreferencesBase.cpp:906
+#: clientgui/DlgAdvPreferencesBase.cpp:848
+#: clientgui/DlgAdvPreferencesBase.cpp:1007
 msgid "Thursday"
 msgstr "星期四"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:789
+#: clientgui/DlgAdvPreferencesBase.cpp:890 clientgui/sg_DlgPreferences.cpp:317
 msgid "Transfer files only during a particular period each day."
 msgstr "僅在每天特定時段傳輸檔案。"
 
-#: clientgui/DlgAdvPreferencesBase.cpp:791
+#: clientgui/DlgAdvPreferencesBase.cpp:892 clientgui/sg_DlgPreferences.cpp:319
 msgid "Transfer files only between"
 msgstr "檔案傳輸將從"
 
@@ -1583,66 +1617,73 @@ msgstr "還原至預設值"
 msgid "Close the dialog without saving"
 msgstr "不儲存並關閉視窗"
 
-#: clientgui/DlgEventLog.cpp:227
+#: clientgui/DlgEventLog.cpp:236
 #, c-format
 msgid "%s - Event Log"
 msgstr "%s - 事件記錄檔"
 
-#: clientgui/DlgEventLog.cpp:237
+#. Create List Pane Items
+#: clientgui/DlgEventLog.cpp:246 clientgui/ViewMessages.cpp:117
+#: clientgui/ViewProjects.cpp:251 clientgui/ViewStatistics.cpp:411
+#: clientgui/ViewStatistics.cpp:1983 clientgui/ViewTransfers.cpp:209
+#: clientgui/ViewWork.cpp:260
 msgid "Project"
 msgstr "專案"
 
-#: clientgui/DlgEventLog.cpp:238
+#: clientgui/DlgEventLog.cpp:247 clientgui/ViewMessages.cpp:118
 msgid "Time"
 msgstr "時間"
 
-#: clientgui/DlgEventLog.cpp:239
+#: clientgui/DlgEventLog.cpp:248 clientgui/ViewMessages.cpp:119
 msgid "Message"
 msgstr "訊息"
 
-#: clientgui/DlgEventLog.cpp:301 clientgui/DlgEventLog.cpp:351
+#: clientgui/DlgEventLog.cpp:305 clientgui/DlgEventLog.cpp:355
 msgid "&Show only this project"
 msgstr "只顯示本專案 (&S)"
 
-#: clientgui/DlgEventLog.cpp:305
+#: clientgui/DlgEventLog.cpp:309
 msgid "Copy &All"
 msgstr "全部複製 (&A)"
 
-#: clientgui/DlgEventLog.cpp:307 clientgui/DlgEventLog.cpp:311
+#: clientgui/DlgEventLog.cpp:311 clientgui/DlgEventLog.cpp:315
+#: clientgui/ViewMessages.cpp:89
 msgid "Copy all the messages to the clipboard."
 msgstr "複製全部訊息到剪貼簿。"
 
-#: clientgui/DlgEventLog.cpp:316
+#: clientgui/DlgEventLog.cpp:320
 msgid "Copy &Selected"
 msgstr "複製所選擇的 (&S)"
 
-#: clientgui/DlgEventLog.cpp:319 clientgui/DlgEventLog.cpp:327
+#: clientgui/DlgEventLog.cpp:323 clientgui/DlgEventLog.cpp:331
+#: clientgui/ViewMessages.cpp:97
 msgid ""
 "Copy the selected messages to the clipboard. You can select multiple "
 "messages by holding down the shift or command key while clicking on "
 "messages."
 msgstr "只複製已選取的訊息到剪貼簿,您可以在選取訊息時按住 Shift 或 Command 鍵以同時選取多個訊息。"
 
-#: clientgui/DlgEventLog.cpp:321 clientgui/DlgEventLog.cpp:329
+#: clientgui/DlgEventLog.cpp:325 clientgui/DlgEventLog.cpp:333
+#: clientgui/ViewMessages.cpp:99
 msgid ""
 "Copy the selected messages to the clipboard. You can select multiple "
 "messages by holding down the shift or control key while clicking on "
 "messages."
 msgstr "只複製已選取的訊息到剪貼簿, 您可以在選取訊息時按住 Shift 或 Ctrl 鍵以同時選取多個訊息。"
 
-#: clientgui/DlgEventLog.cpp:336 clientgui/DlgItemProperties.cpp:67
+#: clientgui/DlgEventLog.cpp:340 clientgui/DlgItemProperties.cpp:67
 msgid "&Close"
 msgstr "關閉 (&C)"
 
-#: clientgui/DlgEventLog.cpp:345
+#: clientgui/DlgEventLog.cpp:349
 msgid "Show all &messages"
 msgstr "顯示所有訊息"
 
-#: clientgui/DlgEventLog.cpp:346 clientgui/DlgEventLog.cpp:348
+#: clientgui/DlgEventLog.cpp:350 clientgui/DlgEventLog.cpp:352
 msgid "Show messages for all projects"
 msgstr "顯示所有計畫於同一統計圖"
 
-#: clientgui/DlgEventLog.cpp:352 clientgui/DlgEventLog.cpp:354
+#: clientgui/DlgEventLog.cpp:356 clientgui/DlgEventLog.cpp:358
 msgid "Show only the messages for the selected project"
 msgstr "顯示所選計畫於同一統計圖"
 
@@ -1665,6 +1706,7 @@ msgid "Add an application to this list"
 msgstr "新增程式到列表中"
 
 #: clientgui/DlgExclusiveApps.cpp:86 clientgui/DlgExclusiveApps.cpp:110
+#: clientgui/ViewProjects.cpp:230 clientgui/sg_ProjectCommandPopup.cpp:90
 msgid "Remove"
 msgstr "移除"
 
@@ -1692,6 +1734,8 @@ msgstr "關閉視窗且不儲存"
 msgid "shows the preferences web page"
 msgstr "顯示網頁上的偏好設定"
 
+#. TODO: fill in the default directory for MSW
+#. TODO: fill in the default directory for Linux
 #: clientgui/DlgExclusiveApps.cpp:303 clientgui/DlgExclusiveApps.cpp:309
 #: clientgui/DlgExclusiveApps.cpp:315
 msgid "Applications to add"
@@ -1762,7 +1806,8 @@ 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/DlgOptions.cpp:415 clientgui/DlgSelectComputer.cpp:168
+#: clientgui/wizardex.cpp:378
 msgid "&Cancel"
 msgstr "取消 (&C)"
 
@@ -1780,20 +1825,20 @@ msgstr "%s 選擇欄位"
 msgid "Select which columns %s should show."
 msgstr "選擇想要%s顯示的欄位。"
 
-#: clientgui/DlgHiddenColumns.cpp:314
+#: clientgui/DlgHiddenColumns.cpp:358
 msgid ""
 "Are you sure you want to reset all list columns to the default "
 "configurations?"
 msgstr "您確定要將欄位設定還原至預設值?"
 
-#: clientgui/DlgHiddenColumns.cpp:315
+#: clientgui/DlgHiddenColumns.cpp:359
 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 "禁止取得新任務"
+msgid "Don't request tasks for "
+msgstr "不要請求任務:"
 
 #: clientgui/DlgItemProperties.cpp:194
 msgid "Project preference"
@@ -1811,352 +1856,398 @@ msgstr "找不到計畫"
 msgid "Client configuration excludes "
 msgstr "用戶端帳號建立已停止"
 
-#: clientgui/DlgItemProperties.cpp:207
-msgid " work fetch deferred for"
-msgstr " 閒置多久後執行任務"
+#: clientgui/DlgItemProperties.cpp:209
+#, c-format
+msgid "%s task request deferred for"
+msgstr "%s 任務請求推遲:"
 
-#: clientgui/DlgItemProperties.cpp:208
-msgid " work fetch deferral interval"
-msgstr " 任務的延遲間隔"
+#: clientgui/DlgItemProperties.cpp:213
+#, c-format
+msgid "%s task request deferral interval"
+msgstr "%s 任務請求延遲間隔時間"
 
-#: clientgui/DlgItemProperties.cpp:239
+#. set dialog title
+#: clientgui/DlgItemProperties.cpp:247
 msgid "Properties of project "
 msgstr "專案細節"
 
-#: clientgui/DlgItemProperties.cpp:243 clientgui/DlgOptions.cpp:221
+#. layout controls
+#: clientgui/DlgItemProperties.cpp:251 clientgui/DlgOptions.cpp:232
 msgid "General"
 msgstr "一般"
 
-#: clientgui/DlgItemProperties.cpp:244
-msgid "Master URL"
-msgstr "主要網址"
+#: clientgui/DlgItemProperties.cpp:252
+msgid "URL"
+msgstr "網址"
 
-#: clientgui/DlgItemProperties.cpp:245
+#: clientgui/DlgItemProperties.cpp:253
 msgid "User name"
 msgstr "用戶名稱"
 
-#: clientgui/DlgItemProperties.cpp:246
+#: clientgui/DlgItemProperties.cpp:254
 msgid "Team name"
 msgstr "團隊名稱"
 
-#: clientgui/DlgItemProperties.cpp:247
+#: clientgui/DlgItemProperties.cpp:255 clientgui/ViewProjects.cpp:256
 msgid "Resource share"
 msgstr "資源分享"
 
-#: clientgui/DlgItemProperties.cpp:249
+#: clientgui/DlgItemProperties.cpp:257
 msgid "Scheduler RPC deferred for"
 msgstr "請求被延遲"
 
-#: clientgui/DlgItemProperties.cpp:252
+#: clientgui/DlgItemProperties.cpp:260
 msgid "File downloads deferred for"
 msgstr "下載檔案被延遲"
 
-#: clientgui/DlgItemProperties.cpp:255
+#: clientgui/DlgItemProperties.cpp:263
 msgid "File uploads deferred for"
 msgstr "上傳檔案被延遲"
 
-#: clientgui/DlgItemProperties.cpp:257
+#: clientgui/DlgItemProperties.cpp:265
 msgid "Disk usage"
 msgstr "硬碟用量"
 
-#: clientgui/DlgItemProperties.cpp:258
+#: clientgui/DlgItemProperties.cpp:266
 msgid "Computer ID"
 msgstr "電腦辨識 ID"
 
-#: clientgui/DlgItemProperties.cpp:260
+#: clientgui/DlgItemProperties.cpp:268
 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:268 clientgui/DlgItemProperties.cpp:270
+#: clientgui/DlgItemProperties.cpp:271 clientgui/DlgItemProperties.cpp:273
+#: clientgui/DlgItemProperties.cpp:276 clientgui/DlgItemProperties.cpp:285
+#: clientgui/DlgItemProperties.cpp:288 clientgui/DlgItemProperties.cpp:291
 msgid "yes"
 msgstr "是"
 
-#: clientgui/DlgItemProperties.cpp:262
+#: clientgui/DlgItemProperties.cpp:270
 msgid "Suspended via GUI"
 msgstr "被使用者暫停"
 
-#: clientgui/DlgItemProperties.cpp:262 clientgui/DlgItemProperties.cpp:263
+#: clientgui/DlgItemProperties.cpp:270 clientgui/DlgItemProperties.cpp:271
 msgid "no"
 msgstr "否"
 
-#: clientgui/DlgItemProperties.cpp:263
-msgid "Don't request more work"
-msgstr "不允許新的任務"
+#: clientgui/DlgItemProperties.cpp:271
+msgid "Don't request tasks"
+msgstr "不要請求任務"
 
-#: clientgui/DlgItemProperties.cpp:265
+#: clientgui/DlgItemProperties.cpp:273
 msgid "Scheduler call in progress"
 msgstr "排程器請求進行中"
 
-#: clientgui/DlgItemProperties.cpp:268
+#: clientgui/DlgItemProperties.cpp:276
 msgid "Trickle-up pending"
 msgstr "排程器請求中"
 
-#: clientgui/DlgItemProperties.cpp:271 clientgui/DlgItemProperties.cpp:273
+#: clientgui/DlgItemProperties.cpp:279 clientgui/DlgItemProperties.cpp:281
 msgid "Host location"
 msgstr "此主機總計"
 
-#: clientgui/DlgItemProperties.cpp:273
+#: clientgui/DlgItemProperties.cpp:281
 msgid "default"
 msgstr "預設"
 
-#: clientgui/DlgItemProperties.cpp:277
+#: clientgui/DlgItemProperties.cpp:285
 msgid "Added via account manager"
 msgstr "加入帳號管理服務"
 
-#: clientgui/DlgItemProperties.cpp:280
+#: clientgui/DlgItemProperties.cpp:288
 msgid "Remove when tasks done"
 msgstr "任務完成後退出"
 
-#: clientgui/DlgItemProperties.cpp:283
+#: clientgui/DlgItemProperties.cpp:291
 msgid "Ended"
 msgstr "已結束"
 
-#: clientgui/DlgItemProperties.cpp:285
+#: clientgui/DlgItemProperties.cpp:293
 msgid "Tasks completed"
 msgstr "任務完成"
 
-#: clientgui/DlgItemProperties.cpp:286
+#: clientgui/DlgItemProperties.cpp:294
 msgid "Tasks failed"
 msgstr "任務失敗"
 
-#: clientgui/DlgItemProperties.cpp:288
+#: clientgui/DlgItemProperties.cpp:296
 msgid "Credit"
 msgstr "積分"
 
-#: clientgui/DlgItemProperties.cpp:289
+#: clientgui/DlgItemProperties.cpp:297
 msgid "User"
 msgstr "使用者"
 
-#: clientgui/DlgItemProperties.cpp:296
+#: clientgui/DlgItemProperties.cpp:300 clientgui/DlgItemProperties.cpp:308
+#, c-format
+msgid "%s total, %s average"
+msgstr "%s %s 平均總量"
+
+#: clientgui/DlgItemProperties.cpp:305
 msgid "Host"
 msgstr "主機"
 
-#: clientgui/DlgItemProperties.cpp:305
+#: clientgui/DlgItemProperties.cpp:315
 msgid "Scheduling"
 msgstr "設定"
 
-#: clientgui/DlgItemProperties.cpp:306
+#: clientgui/DlgItemProperties.cpp:316
 msgid "Scheduling priority"
 msgstr "設定優先權"
 
-#: clientgui/DlgItemProperties.cpp:307
+#: clientgui/DlgItemProperties.cpp:317
 msgid "CPU"
 msgstr "CPU"
 
-#: clientgui/DlgItemProperties.cpp:331
+#: clientgui/DlgItemProperties.cpp:341
 msgid "Duration correction factor"
 msgstr "時間校正參數"
 
-#: clientgui/DlgItemProperties.cpp:345
+#: clientgui/DlgItemProperties.cpp:349
+msgid "Last scheduler reply"
+msgstr "排程程式上次響應時間"
+
+#: clientgui/DlgItemProperties.cpp:360
 msgid "Properties of task "
 msgstr "任務細節"
 
-#: clientgui/DlgItemProperties.cpp:357
+#: clientgui/DlgItemProperties.cpp:372 clientgui/ViewWork.cpp:266
 msgid "Application"
 msgstr "程式"
 
-#: clientgui/DlgItemProperties.cpp:358
+#: clientgui/DlgItemProperties.cpp:373 clientgui/ViewWork.cpp:267
 msgid "Name"
 msgstr "名稱"
 
-#: clientgui/DlgItemProperties.cpp:359
+#: clientgui/DlgItemProperties.cpp:374
 msgid "State"
 msgstr "狀態"
 
-#: clientgui/DlgItemProperties.cpp:362
+#: clientgui/DlgItemProperties.cpp:377
 msgid "Received"
 msgstr "獲得時間"
 
-#: clientgui/DlgItemProperties.cpp:365
+#: clientgui/DlgItemProperties.cpp:380
 msgid "Report deadline"
 msgstr "回報期限"
 
-#: clientgui/DlgItemProperties.cpp:367
+#: clientgui/DlgItemProperties.cpp:382
 msgid "Resources"
 msgstr "資源"
 
-#: clientgui/DlgItemProperties.cpp:370
+#: clientgui/DlgItemProperties.cpp:385
 msgid "Estimated computation size"
 msgstr "預估任務大小"
 
-#: clientgui/DlgItemProperties.cpp:373
+#: clientgui/DlgItemProperties.cpp:390
 msgid "CPU time at last checkpoint"
 msgstr "上次儲存的 CPU 時間"
 
-#: clientgui/DlgItemProperties.cpp:374 clientgui/DlgItemProperties.cpp:389
+#: clientgui/DlgItemProperties.cpp:391 clientgui/DlgItemProperties.cpp:417
 msgid "CPU time"
 msgstr "CPU 時間"
 
-#: clientgui/DlgItemProperties.cpp:376 clientgui/DlgItemProperties.cpp:390
+#: clientgui/DlgItemProperties.cpp:393 clientgui/DlgItemProperties.cpp:418
 msgid "Elapsed time"
 msgstr "執行時間"
 
-#: clientgui/DlgItemProperties.cpp:378
+#: clientgui/DlgItemProperties.cpp:395
 msgid "Estimated time remaining"
 msgstr "預估剩餘時間"
 
-#: clientgui/DlgItemProperties.cpp:379
+#: clientgui/DlgItemProperties.cpp:396
 msgid "Fraction done"
 msgstr "完成度"
 
-#: clientgui/DlgItemProperties.cpp:380
+#: clientgui/DlgItemProperties.cpp:397
 msgid "Virtual memory size"
 msgstr "虛擬記憶體大小"
 
-#: clientgui/DlgItemProperties.cpp:381
+#: clientgui/DlgItemProperties.cpp:398
 msgid "Working set size"
 msgstr "記憶體大小"
 
-#: clientgui/DlgItemProperties.cpp:383
+#: clientgui/DlgItemProperties.cpp:400
 msgid "Directory"
 msgstr "任務目錄"
 
-#: clientgui/DlgItemProperties.cpp:386
+#: clientgui/DlgItemProperties.cpp:403
 msgid "Process ID"
-msgstr "程序 ID"
+msgstr "程式 ID"
+
+#: clientgui/DlgItemProperties.cpp:409 clientgui/DlgItemProperties.cpp:411
+#: clientgui/DlgItemProperties.cpp:413
+msgid "Progress rate"
+msgstr "計算效率"
+
+#: clientgui/DlgItemProperties.cpp:409
+msgid "per hour"
+msgstr "每小時"
 
-#: clientgui/DlgItemProperties.cpp:456
+#: clientgui/DlgItemProperties.cpp:411
+msgid "per minute"
+msgstr "每分鐘"
+
+#: clientgui/DlgItemProperties.cpp:413
+msgid "per second"
+msgstr "每秒"
+
+#: clientgui/DlgItemProperties.cpp:421
+msgid "Executable"
+msgstr "可執行檔案"
+
+#: clientgui/DlgItemProperties.cpp:487 clientgui/ViewWork.cpp:1125
+#: clientgui/sg_TaskPanel.cpp:828
 msgid "Local: "
 msgstr "本地:"
 
-#: clientgui/DlgOptions.cpp:129 clientgui/DlgOptions.cpp:135
+#: clientgui/DlgOptions.cpp:130 clientgui/DlgOptions.cpp:136
 msgid "Options"
 msgstr "基本設定"
 
-#: clientgui/DlgOptions.cpp:178
+#: clientgui/DlgOptions.cpp:179
 msgid "Language:"
 msgstr "語言:"
 
-#: clientgui/DlgOptions.cpp:185
+#: clientgui/DlgOptions.cpp:186
 msgid "What language should BOINC use?"
 msgstr "BOINC 使用何種語言:"
 
-#: clientgui/DlgOptions.cpp:189
+#: clientgui/DlgOptions.cpp:190
 msgid "Notice reminder interval:"
 msgstr "訊息提醒間隔時間:"
 
-#: clientgui/DlgOptions.cpp:196
+#: clientgui/DlgOptions.cpp:197
 msgid "How often should BOINC remind you of new notices?"
 msgstr "當有新的訊息時,BOINC 應該間隔多久的時間來提醒您?"
 
-#: clientgui/DlgOptions.cpp:201
+#: clientgui/DlgOptions.cpp:202
 msgid "Run Manager at login?"
 msgstr "登入時執行管理介面?"
 
-#: clientgui/DlgOptions.cpp:207
+#: clientgui/DlgOptions.cpp:208
 msgid "Run the BOINC Manager when you log on."
 msgstr "當您登入時啟動 BOINC 管理介面"
 
-#: clientgui/DlgOptions.cpp:212
+#: clientgui/DlgOptions.cpp:213
+msgid "Run daemon?"
+msgstr "執行守護程式?"
+
+#: clientgui/DlgOptions.cpp:219
+msgid "Run daemon when launching the Manager."
+msgstr "當管理器啟動時自動執行守護程式。"
+
+#: clientgui/DlgOptions.cpp:223
 msgid "Enable Manager exit dialog?"
 msgstr "啟用 BOINC 管理介面的退出提示?"
 
-#: clientgui/DlgOptions.cpp:218
+#: clientgui/DlgOptions.cpp:229
 msgid "Display the exit dialog when shutting down the Manager."
 msgstr "在關閉 BOINC 管理介面時顯示訊息對話框。"
 
-#: clientgui/DlgOptions.cpp:229
+#: clientgui/DlgOptions.cpp:240
 msgid "Dial-up and Virtual Private Network settings"
 msgstr "撥接與虛擬私人網路 (VPN) 設定"
 
-#: clientgui/DlgOptions.cpp:243
+#: clientgui/DlgOptions.cpp:254
 msgid "&Set Default"
 msgstr "設為預設值 (&S)"
 
-#: clientgui/DlgOptions.cpp:248
+#: clientgui/DlgOptions.cpp:259
 msgid "&Clear Default"
 msgstr "清除預設值 (&C)"
 
-#: clientgui/DlgOptions.cpp:255
+#: clientgui/DlgOptions.cpp:266
 msgid "Default Connection:"
 msgstr "預設連線:"
 
-#: clientgui/DlgOptions.cpp:262
+#: clientgui/DlgOptions.cpp:273
 msgid "Connections"
 msgstr "連線"
 
-#: clientgui/DlgOptions.cpp:271
+#: clientgui/DlgOptions.cpp:282
 msgid "Connect via HTTP proxy server"
 msgstr "經由 HTTP Proxy 伺服器連線"
 
-#: clientgui/DlgOptions.cpp:275
+#: clientgui/DlgOptions.cpp:286
 msgid "HTTP Proxy Server Configuration"
 msgstr "HTTP Proxy 伺服器組態設定"
 
-#: clientgui/DlgOptions.cpp:283 clientgui/DlgOptions.cpp:347
+#: clientgui/DlgOptions.cpp:294 clientgui/DlgOptions.cpp:358
 msgid "Address:"
 msgstr "位址:"
 
-#: clientgui/DlgOptions.cpp:291 clientgui/DlgOptions.cpp:355
+#: clientgui/DlgOptions.cpp:302 clientgui/DlgOptions.cpp:366
+#: clientgui/ProxyPage.cpp:340 clientgui/ProxyPage.cpp:360
 msgid "Port:"
 msgstr "埠:"
 
-#: clientgui/DlgOptions.cpp:299 clientgui/DlgOptions.cpp:363
+#: clientgui/DlgOptions.cpp:310 clientgui/DlgOptions.cpp:374
 msgid "Don't use proxy for:"
 msgstr "不要使用 Proxy:"
 
-#: clientgui/DlgOptions.cpp:306 clientgui/DlgOptions.cpp:370
+#: clientgui/DlgOptions.cpp:317 clientgui/DlgOptions.cpp:381
 msgid "Leave these blank if not needed"
 msgstr "如不需要請留空"
 
-#: clientgui/DlgOptions.cpp:312 clientgui/DlgOptions.cpp:376
+#: clientgui/DlgOptions.cpp:323 clientgui/DlgOptions.cpp:387
+#: clientgui/ProxyPage.cpp:343 clientgui/ProxyPage.cpp:363
 msgid "User Name:"
 msgstr "使用者名稱:"
 
-#: clientgui/DlgOptions.cpp:320 clientgui/DlgOptions.cpp:384
-#: clientgui/DlgSelectComputer.cpp:152
+#: clientgui/DlgOptions.cpp:331 clientgui/DlgOptions.cpp:395
+#: clientgui/DlgSelectComputer.cpp:152 clientgui/ProxyPage.cpp:346
+#: clientgui/ProxyPage.cpp:366
 msgid "Password:"
 msgstr "密碼:"
 
-#: clientgui/DlgOptions.cpp:327
+#: clientgui/DlgOptions.cpp:338
 msgid "HTTP Proxy"
 msgstr "HTTP Proxy"
 
-#: clientgui/DlgOptions.cpp:335
+#: clientgui/DlgOptions.cpp:346
 msgid "Connect via SOCKS proxy server"
 msgstr "經由 SOCKS Proxy 伺服器連線"
 
-#: clientgui/DlgOptions.cpp:339
+#: clientgui/DlgOptions.cpp:350
 msgid "SOCKS Proxy Server Configuration"
 msgstr "SOCKS Proxy 伺服器組態設定"
 
-#: clientgui/DlgOptions.cpp:391
+#: clientgui/DlgOptions.cpp:402
 msgid "SOCKS Proxy"
 msgstr "SOCKS Proxy"
 
-#: clientgui/DlgOptions.cpp:589
+#: clientgui/DlgOptions.cpp:600
 msgid "always"
 msgstr "總是提醒"
 
-#: clientgui/DlgOptions.cpp:590
+#: clientgui/DlgOptions.cpp:601
 msgid "1 hour"
 msgstr "1 小時"
 
-#: clientgui/DlgOptions.cpp:591
+#: clientgui/DlgOptions.cpp:602
 msgid "6 hours"
 msgstr "6 小時"
 
-#: clientgui/DlgOptions.cpp:592
+#: clientgui/DlgOptions.cpp:603
 msgid "1 day"
 msgstr "1 天"
 
-#: clientgui/DlgOptions.cpp:593
+#: clientgui/DlgOptions.cpp:604
 msgid "1 week"
 msgstr "1 週"
 
-#: clientgui/DlgOptions.cpp:594
+#: clientgui/DlgOptions.cpp:605
 msgid "never"
 msgstr "永不"
 
-#: clientgui/DlgOptions.cpp:691
+#: clientgui/DlgOptions.cpp:703
 #, c-format
 msgid "%s - Language Selection"
 msgstr "%s - 語言選擇"
 
-#: clientgui/DlgOptions.cpp:698
+#: clientgui/DlgOptions.cpp:710
 #, c-format
 msgid ""
 "The %s's language has been changed.  In order for this change to take "
@@ -2302,6 +2393,7 @@ msgid "The home page of the GEO-600 project"
 msgstr "GEO-600 專案首頁"
 
 #: clientgui/Localization.cpp:115 clientgui/Localization.cpp:133
+#: clientgui/ViewProjects.cpp:253 clientgui/ViewStatistics.cpp:441
 msgid "Team"
 msgstr "團隊"
 
@@ -2365,201 +2457,203 @@ msgstr "研究"
 msgid "Learn about the projects hosted at World Community Grid"
 msgstr "於 World Community Grid 學習更多有關此專案資訊"
 
-#: clientgui/MainDocument.cpp:583
+#: clientgui/MainDocument.cpp:585
 msgid "Starting client"
 msgstr "正在啟動客戶端"
 
-#: clientgui/MainDocument.cpp:591
+#: clientgui/MainDocument.cpp:593
 msgid "Connecting to client"
 msgstr "重新連線用戶端中"
 
-#: clientgui/MainDocument.cpp:1205
+#: clientgui/MainDocument.cpp:1207
 msgid "Retrieving system state; please wait..."
 msgstr "取回系統狀態中;請稍候..."
 
-#: clientgui/MainDocument.cpp:1826
+#: clientgui/MainDocument.cpp:1828
 msgid "Missing application"
 msgstr "程式不存在"
 
-#: clientgui/MainDocument.cpp:1827
+#: clientgui/MainDocument.cpp:1829
 msgid ""
 "Please download and install the CoRD application from "
 "http://cord.sourceforge.net"
 msgstr "請從 http://cord.sourceforge.net 下載並安裝 CoRD 程式。"
 
-#: clientgui/MainDocument.cpp:2442
+#: clientgui/MainDocument.cpp:2443
 msgid "on batteries"
 msgstr "正以電池供電"
 
-#: clientgui/MainDocument.cpp:2443
+#: clientgui/MainDocument.cpp:2444
 msgid "computer is in use"
 msgstr "電腦正使用中"
 
-#: clientgui/MainDocument.cpp:2444
+#: clientgui/MainDocument.cpp:2445
 msgid "user request"
 msgstr "用戶的請求"
 
-#: clientgui/MainDocument.cpp:2445
+#: clientgui/MainDocument.cpp:2446
 msgid "time of day"
 msgstr "每日時段"
 
-#: clientgui/MainDocument.cpp:2446
+#: clientgui/MainDocument.cpp:2447
 msgid "CPU benchmarks in progress"
 msgstr "進行 CPU 效能測試"
 
-#: clientgui/MainDocument.cpp:2447
+#: clientgui/MainDocument.cpp:2448
 msgid "need disk space - check preferences"
 msgstr "硬碟空間不足 - 請檢查偏好設定"
 
-#: clientgui/MainDocument.cpp:2448
+#: clientgui/MainDocument.cpp:2449
 msgid "computer is not in use"
 msgstr "電腦未使用"
 
-#: clientgui/MainDocument.cpp:2449
+#: clientgui/MainDocument.cpp:2450
 msgid "starting up"
 msgstr "正在啟動中"
 
-#: clientgui/MainDocument.cpp:2450
+#: clientgui/MainDocument.cpp:2451
 msgid "an exclusive app is running"
 msgstr "有衝突的程式正在執行"
 
-#: clientgui/MainDocument.cpp:2451
+#: clientgui/MainDocument.cpp:2452
 msgid "CPU is busy"
 msgstr "CPU 忙碌中"
 
-#: clientgui/MainDocument.cpp:2452
+#: clientgui/MainDocument.cpp:2453
 msgid "network bandwidth limit exceeded"
 msgstr "網路使用量超出限制"
 
-#: clientgui/MainDocument.cpp:2453
+#: clientgui/MainDocument.cpp:2454
 msgid "requested by operating system"
 msgstr "作業系統的請求"
 
-#: clientgui/MainDocument.cpp:2455
+#: clientgui/MainDocument.cpp:2456
 msgid "unknown reason"
 msgstr "未知原因"
 
-#: clientgui/MainDocument.cpp:2477
+#: clientgui/MainDocument.cpp:2478
 msgid "GPU missing, "
 msgstr "沒有可用的 GPU,"
 
-#: clientgui/MainDocument.cpp:2484
+#: clientgui/MainDocument.cpp:2485
 msgid "New"
 msgstr "新任務"
 
-#: clientgui/MainDocument.cpp:2488
+#: clientgui/MainDocument.cpp:2489
 msgid "Download failed"
 msgstr "下載失敗"
 
-#: clientgui/MainDocument.cpp:2490
+#: clientgui/MainDocument.cpp:2491
 msgid "Downloading"
 msgstr "下載中"
 
-#: clientgui/MainDocument.cpp:2492 clientgui/MainDocument.cpp:2551
+#: clientgui/MainDocument.cpp:2493 clientgui/MainDocument.cpp:2552
 msgid " (suspended - "
 msgstr " (已暫停 - "
 
-#: clientgui/MainDocument.cpp:2500
+#: clientgui/MainDocument.cpp:2501
 msgid "Project suspended by user"
 msgstr "專案被使用者暫停"
 
-#: clientgui/MainDocument.cpp:2502
+#: clientgui/MainDocument.cpp:2503
 msgid "Task suspended by user"
 msgstr "被使用者暫停"
 
-#: clientgui/MainDocument.cpp:2507
+#. an NCI process can be running even though computation is suspended
+#. (because of <dont_suspend_nci>
+#: clientgui/MainDocument.cpp:2508
 msgid "Suspended - "
 msgstr "已暫停 -"
 
-#: clientgui/MainDocument.cpp:2510
+#: clientgui/MainDocument.cpp:2511
 msgid "GPU suspended - "
 msgstr "GPU 已暫停 -"
 
-#: clientgui/MainDocument.cpp:2514
+#: clientgui/MainDocument.cpp:2515
 msgid "Waiting for memory"
 msgstr "等待記憶體釋放"
 
-#: clientgui/MainDocument.cpp:2516
+#: clientgui/MainDocument.cpp:2517
 msgid "Waiting for shared memory"
 msgstr "等待共享記憶體釋放"
 
-#: clientgui/MainDocument.cpp:2518
+#: clientgui/MainDocument.cpp:2519
 msgid "Running"
 msgstr "執行中"
 
-#: clientgui/MainDocument.cpp:2520
+#: clientgui/MainDocument.cpp:2521
 msgid " (non-CPU-intensive)"
 msgstr " (非 CPU 密集型)"
 
-#: clientgui/MainDocument.cpp:2523
+#: clientgui/MainDocument.cpp:2524
 msgid "Waiting to run"
 msgstr "等待執行"
 
-#: clientgui/MainDocument.cpp:2525 clientgui/MainDocument.cpp:2528
+#: clientgui/MainDocument.cpp:2526 clientgui/MainDocument.cpp:2529
 msgid "Ready to start"
 msgstr "準備開始"
 
-#: clientgui/MainDocument.cpp:2532
+#: clientgui/MainDocument.cpp:2533
 msgid "Postponed: "
 msgstr "延後:"
 
-#: clientgui/MainDocument.cpp:2535
+#: clientgui/MainDocument.cpp:2536
 msgid "Postponed"
 msgstr "延後"
 
-#: clientgui/MainDocument.cpp:2539
+#: clientgui/MainDocument.cpp:2540
 msgid "Waiting for network access"
 msgstr "等待網路存取中"
 
-#: clientgui/MainDocument.cpp:2543
+#: clientgui/MainDocument.cpp:2544
 msgid "Computation error"
 msgstr "運算錯誤"
 
-#: clientgui/MainDocument.cpp:2547
+#: clientgui/MainDocument.cpp:2548
 msgid "Upload failed"
 msgstr "上傳失敗"
 
-#: clientgui/MainDocument.cpp:2549
+#: clientgui/MainDocument.cpp:2550
 msgid "Uploading"
 msgstr "上傳中"
 
-#: clientgui/MainDocument.cpp:2560
+#: clientgui/MainDocument.cpp:2561
 msgid "Aborted by user"
 msgstr "被使用者停止"
 
-#: clientgui/MainDocument.cpp:2563
+#: clientgui/MainDocument.cpp:2564
 msgid "Aborted by project"
 msgstr "被專案停止"
 
-#: clientgui/MainDocument.cpp:2566
+#: clientgui/MainDocument.cpp:2567
 msgid "Aborted: not started by deadline"
 msgstr "已停止:回報期限前尚未執行"
 
-#: clientgui/MainDocument.cpp:2569
-msgid "Aborted: disk limit exceeded"
-msgstr "已停止:硬碟配置容量不足"
+#: clientgui/MainDocument.cpp:2570
+msgid "Aborted: task disk limit exceeded"
+msgstr "已中止:任務磁碟使用超出限制"
 
-#: clientgui/MainDocument.cpp:2572
+#: clientgui/MainDocument.cpp:2573
 msgid "Aborted: run time limit exceeded"
 msgstr "已停止:超過回報期限"
 
-#: clientgui/MainDocument.cpp:2575
+#: clientgui/MainDocument.cpp:2576
 msgid "Aborted: memory limit exceeded"
 msgstr "已停止:記憶體不足"
 
-#: clientgui/MainDocument.cpp:2578
+#: clientgui/MainDocument.cpp:2579
 msgid "Aborted"
 msgstr "已停止"
 
-#: clientgui/MainDocument.cpp:2583
+#: clientgui/MainDocument.cpp:2584
 msgid "Acknowledged"
 msgstr "已認可"
 
-#: clientgui/MainDocument.cpp:2585
+#: clientgui/MainDocument.cpp:2586
 msgid "Ready to report"
 msgstr "準備回報"
 
-#: clientgui/MainDocument.cpp:2587
+#: clientgui/MainDocument.cpp:2588
 #, c-format
 msgid "Error: invalid state '%d'"
 msgstr "錯誤: 無效狀態「%d」"
@@ -2623,7 +2717,7 @@ msgstr "選擇一個專案,點選下面的名稱或在下方輸入專案的網
 msgid "Categories:"
 msgstr "分類:"
 
-#: clientgui/ProjectInfoPage.cpp:262
+#: clientgui/ProjectInfoPage.cpp:262 clientgui/sg_ProjectPanel.cpp:89
 msgid "Projects:"
 msgstr "專案:"
 
@@ -2782,637 +2876,373 @@ msgstr "自動偵測"
 msgid "SOCKS proxy"
 msgstr "SOCKS Proxy"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:166
-msgid "Skin"
-msgstr "外觀"
+#: clientgui/TermsOfUsePage.cpp:218
+msgid "Terms of Use"
+msgstr "使用條款"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:168
-msgid "Select the appearance of the user interface."
-msgstr "選擇用戶的介面外觀"
+#: clientgui/TermsOfUsePage.cpp:222
+msgid "Please read the following terms of use:"
+msgstr "請閱讀以下的使用條款:"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:179
-msgid "Display diagnostic messages."
-msgstr "顯示診斷訊息。"
+#: clientgui/TermsOfUsePage.cpp:231
+msgid "I agree to the terms of use."
+msgstr "我同意使用條款"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:184
-msgid "Advanced View...\tCtrl+Shift+A"
-msgstr "進階模式...\tCtrl+Shift+A"
+#: clientgui/TermsOfUsePage.cpp:237
+msgid "I do not agree to the terms of use."
+msgstr "我不同意使用條款。"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:185
-msgid "Display the advanced graphical interface."
-msgstr "顯示精簡 BOINC 圖形介面。"
+#: clientgui/UnavailablePage.cpp:183
+msgid "Project temporarily unavailable"
+msgstr "專案暫時無法使用"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:201
-msgid "Configure display options and proxy settings"
-msgstr "配置顯示選項和 Proxy 設定"
+#: clientgui/UnavailablePage.cpp:186
+msgid ""
+"The project is temporarily unavailable.\n"
+"\n"
+"Please try again later."
+msgstr "此專案暫時無法使用。\n\n請稍後重試。"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:222
-#, c-format
-msgid "&%s"
-msgstr "&%s"
+#: clientgui/UnavailablePage.cpp:190
+msgid "Account manager temporarily unavailable"
+msgstr "帳號管理暫時無法使用"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:396
-msgid "Default"
-msgstr "預設"
+#: clientgui/UnavailablePage.cpp:193
+msgid ""
+"The account manager is temporarily unavailable.\n"
+"\n"
+"Please try again later."
+msgstr "此帳號管理員暫時無法使用。\n\n請稍後重試。"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:838
-msgid "Suspend"
-msgstr "暫停"
+#: clientgui/ValidateAccountKey.cpp:68
+msgid "Please specify an account key to continue."
+msgstr "請輸入帳號金鑰以繼續。"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:840
-msgid "Suspend Computing"
-msgstr "暫停執行"
+#: clientgui/ValidateAccountKey.cpp:71
+msgid "Invalid Account Key; please enter a valid Account Key"
+msgstr "無效的帳號金鑰;請輸入有效的帳號金鑰"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:841
-msgid "Resume Computing"
-msgstr "繼續執行"
+#: clientgui/ValidateAccountKey.cpp:82 clientgui/ValidateEmailAddress.cpp:86
+msgid "Validation conflict"
+msgstr "驗證衝突"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:857
-msgid "Notices"
-msgstr "訊息"
+#: clientgui/ValidateEmailAddress.cpp:72
+msgid "Please specify an email address"
+msgstr "請輸入電子郵件地址"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:858
-msgid "Open a window to view notices from projects or BOINC"
-msgstr "開啟新視窗觀看來自專案或 BOINC 的訊息"
+#: clientgui/ValidateEmailAddress.cpp:75
+msgid "Invalid email address; please enter a valid email address"
+msgstr "無效的電子郵件位址;請輸入有效的電子郵件位址"
 
-#: clientgui/sg_BoincSimpleFrame.cpp:879
-#, c-format
-msgid "Get help with %s"
-msgstr "取得 %s 的幫助"
+#: clientgui/ValidateURL.cpp:69
+msgid "Missing URL"
+msgstr "缺少網址"
 
-#: clientgui/sg_DlgMessages.cpp:124
-msgid "Fetching notices; please wait..."
-msgstr "載入訊息中;請稍後..."
+#: clientgui/ValidateURL.cpp:70
+msgid ""
+"Please specify a URL.\n"
+"For example:\n"
+"http://www.example.com/"
+msgstr "請輸入網址。\n例如:\nhttp://www.example.com/"
 
-#: clientgui/sg_DlgMessages.cpp:132
-msgid "There are no notices at this time."
-msgstr "目前沒有訊息。"
+#: clientgui/ValidateURL.cpp:83 clientgui/ValidateURL.cpp:87
+#: clientgui/ValidateURL.cpp:91 clientgui/ValidateURL.cpp:103
+#: clientgui/ValidateURL.cpp:107 clientgui/ValidateURL.cpp:110
+msgid "Invalid URL"
+msgstr "無效網址"
 
-#: clientgui/sg_DlgMessages.cpp:146
-msgid "Close"
-msgstr "關閉"
+#: clientgui/ValidateURL.cpp:84 clientgui/ValidateURL.cpp:88
+#: clientgui/ValidateURL.cpp:92
+msgid ""
+"Please specify a valid URL.\n"
+"For example:\n"
+"http://boincproject.example.com"
+msgstr "請輸入有效的網址。\n例如:\nhttp://boincproject.example.com"
 
-#: clientgui/sg_DlgMessages.cpp:394
+#: clientgui/ValidateURL.cpp:104 clientgui/ValidateURL.cpp:108
 #, c-format
-msgid "%s - Notices"
-msgstr "%s - 訊息"
+msgid "'%s' does not contain a valid host name."
+msgstr "「%s」不是有效的主機名稱。"
 
-#: clientgui/sg_DlgPreferences.cpp:187
-msgid ""
-"For additional settings, select Computing Preferences in the Advanced View."
-msgstr "需要更多的偏好設定,請切換至進階模式。"
+#: clientgui/ValidateURL.cpp:111
+#, c-format
+msgid "'%s' does not contain a valid path."
+msgstr "「%s」不是有效的路徑。"
 
-#: clientgui/sg_DlgPreferences.cpp:289
-msgid "GB of disk space"
-msgstr "GB的硬碟空間"
+#. Setup View
+#: clientgui/ViewMessages.cpp:84 clientgui/ViewProjects.cpp:198
+#: clientgui/ViewStatistics.cpp:1952 clientgui/ViewTransfers.cpp:183
+#: clientgui/ViewWork.cpp:207
+msgid "Commands"
+msgstr "指令"
 
-#: clientgui/sg_DlgPreferences.cpp:980
-#, c-format
-msgid "%s - Computing Preferences"
-msgstr "%s - 運算偏好設定"
+#: clientgui/ViewMessages.cpp:88
+msgid "Copy all messages"
+msgstr "複製所有訊息"
 
-#: clientgui/sg_DlgPreferences.cpp:1061
-msgid "Discard all local preferences and use web-based preferences?"
-msgstr "放棄所有本機偏好設定改用網站偏好設定?"
+#: clientgui/ViewMessages.cpp:95
+msgid "Copy selected messages"
+msgstr "複製選取的訊息"
+
+#: clientgui/ViewMessages.cpp:106 clientgui/ViewMessages.cpp:502
+msgid "Show only this project"
+msgstr "只顯示本專案"
+
+#: clientgui/ViewMessages.cpp:107 clientgui/ViewMessages.cpp:503
+msgid "Show only the messages for the selected project."
+msgstr "僅顯示所選專案的訊息。"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:66
+#: clientgui/ViewMessages.cpp:164
+msgid "Messages"
+msgstr "訊息"
+
+#: clientgui/ViewMessages.cpp:187
+msgid "Copying all messages to the clipboard..."
+msgstr "複製全部訊息到剪貼簿..."
+
+#: clientgui/ViewMessages.cpp:223
+msgid "Copying selected messages to the clipboard..."
+msgstr "複製所選訊息到剪貼簿..."
+
+#: clientgui/ViewMessages.cpp:286
+msgid "Filtering messages..."
+msgstr "正在過濾訊息"
+
+#: clientgui/ViewMessages.cpp:494
+msgid "Show all messages"
+msgstr "顯示所有訊息"
+
+#: clientgui/ViewMessages.cpp:495
+msgid "Show messages for all projects."
+msgstr "顯示所有專案的訊息"
+
+#: clientgui/ViewNotices.cpp:58 clientgui/sg_DlgMessages.cpp:124
+msgid "Fetching notices; please wait..."
+msgstr "載入訊息中;請稍後..."
+
+#: clientgui/ViewNotices.cpp:65 clientgui/sg_DlgMessages.cpp:132
+msgid "There are no notices at this time."
+msgstr "目前沒有訊息。"
+
+#: clientgui/ViewNotices.cpp:99 clientgui/sg_BoincSimpleFrame.cpp:912
+msgid "Notices"
+msgstr "訊息"
+
+#: clientgui/ViewProjects.cpp:202 clientgui/sg_ProjectCommandPopup.cpp:66
 msgid "Update"
 msgstr "更新"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:67
+#: clientgui/ViewProjects.cpp:203 clientgui/sg_ProjectCommandPopup.cpp:67
 msgid ""
 "Report all completed tasks, get latest credit, get latest preferences, and "
 "possibly get more tasks."
 msgstr "回報所有已完成的任務;取得最新的積分與偏好設定資訊且儘可能的取得任務。"
 
+#: clientgui/ViewProjects.cpp:209 clientgui/ViewProjects.cpp:808
+#: clientgui/ViewWork.cpp:232 clientgui/ViewWork.cpp:888
+#: clientgui/sg_BoincSimpleFrame.cpp:893
+#: clientgui/sg_ProjectCommandPopup.cpp:72
+#: clientgui/sg_ProjectCommandPopup.cpp:128
+#: clientgui/sg_TaskCommandPopup.cpp:72 clientgui/sg_TaskCommandPopup.cpp:122
+msgid "Suspend"
+msgstr "暫停"
+
+#: clientgui/ViewProjects.cpp:210 clientgui/ViewProjects.cpp:808
 #: clientgui/sg_ProjectCommandPopup.cpp:73
 #: clientgui/sg_ProjectCommandPopup.cpp:129
 msgid "Suspend tasks for this project."
 msgstr "暫停此專案的任務。"
 
+#: clientgui/ViewProjects.cpp:216 clientgui/ViewProjects.cpp:827
 #: clientgui/sg_ProjectCommandPopup.cpp:78
 #: clientgui/sg_ProjectCommandPopup.cpp:136
 msgid "No new tasks"
 msgstr "拒絕新任務"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:79
+#: clientgui/ViewProjects.cpp:217 clientgui/sg_ProjectCommandPopup.cpp:79
 msgid "Don't get new tasks for this project."
 msgstr "此專案將不會取得新任務。"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:84
+#: clientgui/ViewProjects.cpp:223 clientgui/sg_ProjectCommandPopup.cpp:84
 msgid "Reset project"
 msgstr "重新開始專案"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:85
+#: clientgui/ViewProjects.cpp:224 clientgui/sg_ProjectCommandPopup.cpp:85
 msgid ""
 "Delete all files and tasks associated with this project, and get new tasks."
 "  You can update the project first to report any completed tasks."
 msgstr "刪除所有和此專案相關的檔案和任務後取得新的任務。 在重新開始之前您可以先更新專案來回報已完成的任務。"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:91
+#: clientgui/ViewProjects.cpp:231 clientgui/sg_ProjectCommandPopup.cpp:91
 msgid ""
 "Remove this project.  Tasks in progress will be lost (use 'Update' first to "
 "report any completed tasks)."
 msgstr "移除此專案。進行中的任務將會遺失。(您可以先按一下「更新」來回報已完成的任務。)"
 
+#: clientgui/ViewProjects.cpp:237 clientgui/ViewWork.cpp:246
 #: clientgui/sg_ProjectCommandPopup.cpp:96
 #: clientgui/sg_TaskCommandPopup.cpp:84
 msgid "Properties"
 msgstr "細節"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:97
+#: clientgui/ViewProjects.cpp:238 clientgui/sg_ProjectCommandPopup.cpp:97
 msgid "Show project details."
 msgstr "顯示專案細節"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:126
-msgid "Resume tasks for this project."
-msgstr "繼續此專案的任務。"
+#: clientgui/ViewProjects.cpp:252 clientgui/ViewStatistics.cpp:426
+msgid "Account"
+msgstr "帳號"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:133
-msgid "Allow new tasks"
-msgstr "允許新任務"
+#: clientgui/ViewProjects.cpp:254
+msgid "Work done"
+msgstr "總積分"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:134
-msgid "Allow fetching new tasks for this project."
-msgstr "允許此專案取得新任務。"
+#: clientgui/ViewProjects.cpp:255
+msgid "Avg. work done"
+msgstr "近期平均積分"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:137
-msgid "Don't fetch new tasks for this project."
-msgstr "此專案將不會取得新任務。"
+#: clientgui/ViewProjects.cpp:257 clientgui/ViewTransfers.cpp:215
+#: clientgui/ViewWork.cpp:262
+msgid "Status"
+msgstr "狀態"
+
+#: clientgui/ViewProjects.cpp:336
+msgid "Projects"
+msgstr "專案"
+
+#: clientgui/ViewProjects.cpp:388
+msgid "Updating project..."
+msgstr "正在更新專案..."
+
+#: clientgui/ViewProjects.cpp:430
+msgid "Resuming project..."
+msgstr "正在繼續專案..."
+
+#: clientgui/ViewProjects.cpp:434
+msgid "Suspending project..."
+msgstr "正在暫停專案..."
+
+#: clientgui/ViewProjects.cpp:471
+msgid "Telling project to allow additional task downloads..."
+msgstr "通知專案可以下載額外任務..."
+
+#: clientgui/ViewProjects.cpp:475
+msgid "Telling project to not fetch any additional tasks..."
+msgstr "通知專案不要取得額外任務..."
+
+#: clientgui/ViewProjects.cpp:511
+msgid "Resetting project..."
+msgstr "正在重新設定專案..."
 
-#: clientgui/sg_ProjectCommandPopup.cpp:229
+#: clientgui/ViewProjects.cpp:524 clientgui/sg_ProjectCommandPopup.cpp:229
 #, c-format
 msgid "Are you sure you want to reset project '%s'?"
 msgstr "您確定要重新開始專案「%s」嗎?"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:235
+#: clientgui/ViewProjects.cpp:530 clientgui/sg_ProjectCommandPopup.cpp:235
 msgid "Reset Project"
 msgstr "重新開始專案"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:266
+#: clientgui/ViewProjects.cpp:569
+msgid "Removing project..."
+msgstr "正在移除專案..."
+
+#: clientgui/ViewProjects.cpp:582 clientgui/sg_ProjectCommandPopup.cpp:266
 #, c-format
 msgid "Are you sure you want to remove project '%s'?"
 msgstr "您確定要移除「%s」專案嗎?"
 
-#: clientgui/sg_ProjectCommandPopup.cpp:272
+#: clientgui/ViewProjects.cpp:588 clientgui/sg_ProjectCommandPopup.cpp:272
 msgid "Remove Project"
 msgstr "移除專案"
 
-#: clientgui/sg_ProjectPanel.cpp:72
-msgid "Add Project"
-msgstr "新增專案"
+#: clientgui/ViewProjects.cpp:629 clientgui/ViewWork.cpp:686
+msgid "Launching browser..."
+msgstr "啟動瀏覽器..."
 
-#: clientgui/sg_ProjectPanel.cpp:73
-msgid "Synchronize"
-msgstr "同步"
+#: clientgui/ViewProjects.cpp:804 clientgui/sg_ProjectCommandPopup.cpp:126
+msgid "Resume tasks for this project."
+msgstr "繼續此專案的任務。"
 
-#: clientgui/sg_ProjectPanel.cpp:74
-msgid "Work done for this project"
-msgstr "已完成該專案任務"
+#: clientgui/ViewProjects.cpp:823 clientgui/sg_ProjectCommandPopup.cpp:133
+msgid "Allow new tasks"
+msgstr "允許新任務"
 
-#: clientgui/sg_ProjectPanel.cpp:76
-msgid "Volunteer for any or all of 30+ projects in many areas of science"
-msgstr "志願加入到任何或所有高達30+個分佈在許多不同科學領域內的專案"
+#: clientgui/ViewProjects.cpp:823 clientgui/sg_ProjectCommandPopup.cpp:134
+msgid "Allow fetching new tasks for this project."
+msgstr "允許此專案取得新任務。"
 
-#: clientgui/sg_ProjectPanel.cpp:77
-msgid "Synchronize projects with account manager system"
-msgstr "與帳號管理系統同步專案"
+#: clientgui/ViewProjects.cpp:827 clientgui/sg_ProjectCommandPopup.cpp:137
+msgid "Don't fetch new tasks for this project."
+msgstr "此專案將不會取得新任務。"
 
-#: clientgui/sg_ProjectPanel.cpp:124
-msgid "Select a project to access with the controls below"
-msgstr "選擇一個要管理的專案"
+#: clientgui/ViewProjects.cpp:1131
+msgid "Requested by user"
+msgstr "用戶的請求"
 
-#: clientgui/sg_ProjectPanel.cpp:145
-msgid "Project Web Pages"
-msgstr "專案網站"
+#: clientgui/ViewProjects.cpp:1132
+msgid "To fetch work"
+msgstr "取得任務"
 
-#: clientgui/sg_ProjectPanel.cpp:149
-msgid "Project Commands"
-msgstr "專案指令"
+#: clientgui/ViewProjects.cpp:1133
+msgid "To report completed tasks"
+msgstr "上傳已完成的任務"
 
-#: clientgui/sg_ProjectPanel.cpp:276
-#, c-format
-msgid "Pop up a menu of web sites for project %s"
-msgstr "跳出一個%s專案的網頁選單"
+#: clientgui/ViewProjects.cpp:1134
+msgid "To send trickle-up message"
+msgstr "發送上傳訊息"
 
-#: clientgui/sg_ProjectPanel.cpp:278
-#, c-format
-msgid "Pop up a menu of commands to apply to project %s"
-msgstr "跳出一個 %s 專案的指令選單"
+#: clientgui/ViewProjects.cpp:1135
+msgid "Requested by account manager"
+msgstr "帳號管理服務的請求"
 
-#: clientgui/sg_TaskCommandPopup.cpp:66
-msgid "Show graphics"
-msgstr "顯示圖形"
+#: clientgui/ViewProjects.cpp:1136
+msgid "Project initialization"
+msgstr "專案初始化"
 
-#: clientgui/sg_TaskCommandPopup.cpp:67
-msgid "Show application graphics in a window."
-msgstr "於新視窗中顯示程式的圖形。"
+#: clientgui/ViewProjects.cpp:1137
+msgid "Requested by project"
+msgstr "專案的請求"
 
-#: clientgui/sg_TaskCommandPopup.cpp:73
-msgid "Suspend this task."
-msgstr "已暫停此任務"
+#: clientgui/ViewProjects.cpp:1138
+msgid "Unknown reason"
+msgstr "未知原因"
 
-#: clientgui/sg_TaskCommandPopup.cpp:78
-msgid "Abort"
-msgstr "停止"
+#: clientgui/ViewProjects.cpp:1152
+msgid "Suspended by user"
+msgstr "被使用者暫停"
 
-#: clientgui/sg_TaskCommandPopup.cpp:79
-msgid "Abandon this task. You will get no credit for it."
-msgstr "放棄此任務。您將不會獲得任何積分。"
+#: clientgui/ViewProjects.cpp:1155
+msgid "Won't get new tasks"
+msgstr "無法取得新任務"
 
-#: clientgui/sg_TaskCommandPopup.cpp:85
-msgid "Show task details."
-msgstr "顯示任務細節"
+#: clientgui/ViewProjects.cpp:1158
+msgid "Project ended - OK to remove"
+msgstr "專案已結束 - 按 OK 移除"
 
-#: clientgui/sg_TaskCommandPopup.cpp:119
-msgid "Resume work for this task."
-msgstr "繼續此任務。"
+#: clientgui/ViewProjects.cpp:1161
+msgid "Will remove when tasks done"
+msgstr "任務完成後移除"
 
-#: clientgui/sg_TaskCommandPopup.cpp:123
-msgid "Suspend work for this task."
-msgstr "暫停此任務。"
+#: clientgui/ViewProjects.cpp:1164
+msgid "Scheduler request pending"
+msgstr "排程器請求中"
 
-#: clientgui/sg_TaskCommandPopup.cpp:267
-#, c-format
-msgid ""
-"Are you sure you want to abort this task '%s'?\n"
-"(Progress: %.1lf%%, Status: %s)"
-msgstr "您確定要停止此任務 '%s' 嗎?\n(進度: %.1lf%%,狀態: %s)"
+#: clientgui/ViewProjects.cpp:1170
+msgid "Scheduler request in progress"
+msgstr "排程器請求進行中"
 
-#: clientgui/sg_TaskCommandPopup.cpp:272
-msgid "Abort task"
-msgstr "停止任務"
+#: clientgui/ViewProjects.cpp:1173
+msgid "Trickle up message pending"
+msgstr "等待上傳訊息中"
 
-#: clientgui/sg_TaskPanel.cpp:468
-msgid "You don't have any projects.  Please Add a Project."
-msgstr "你沒有任何專案,請加入專案。"
+#: clientgui/ViewProjects.cpp:1179
+msgid "Communication deferred"
+msgstr "已擱置通訊 "
 
-#: clientgui/sg_TaskPanel.cpp:469
-msgid "Not available"
-msgstr "不可行"
-
-#: clientgui/sg_TaskPanel.cpp:480
-msgid "Tasks:"
-msgstr "任務:"
-
-#: clientgui/sg_TaskPanel.cpp:486
-msgid "Select a task to access"
-msgstr "選擇要觀看的任務"
-
-#: clientgui/sg_TaskPanel.cpp:497
-msgid "From:"
-msgstr "專案:"
-
-#: clientgui/sg_TaskPanel.cpp:551
-msgid "This task's progress"
-msgstr "此任務進度"
-
-#: clientgui/sg_TaskPanel.cpp:569
-msgid "Task Commands"
-msgstr "任務指令"
-
-#: clientgui/sg_TaskPanel.cpp:570
-msgid "Pop up a menu of commands to apply to this task"
-msgstr "跳出一個適用於目前任務的指令選單"
-
-#: clientgui/sg_TaskPanel.cpp:705
-#, c-format
-msgid "Application: %s"
-msgstr "程式: %s"
-
-#: clientgui/sg_TaskPanel.cpp:728
-#, c-format
-msgid "%.3f%%"
-msgstr "%.3f%%"
-
-#: clientgui/sg_TaskPanel.cpp:736
-msgid "Application: Not available"
-msgstr "程式:不可行"
-
-#: clientgui/sg_TaskPanel.cpp:836
-msgid "Not Available"
-msgstr "不可行"
-
-#: clientgui/sg_TaskPanel.cpp:851
-#, c-format
-msgid "Elapsed: %s"
-msgstr "執行時間:%s"
-
-#: clientgui/sg_TaskPanel.cpp:865
-#, c-format
-msgid "Remaining (estimated): %s"
-msgstr "剩餘時間:%s"
-
-#: clientgui/sg_TaskPanel.cpp:880
-#, c-format
-msgid "Status: %s"
-msgstr "狀態:%s"
-
-#: clientgui/sg_TaskPanel.cpp:1228
-msgid "Retrieving current status."
-msgstr "取回目前狀態中。"
-
-#: clientgui/sg_TaskPanel.cpp:1234
-msgid "Downloading work from the server."
-msgstr "正從伺服器下載任務。"
-
-#: clientgui/sg_TaskPanel.cpp:1239
-msgid "Processing Suspended:  Running On Batteries."
-msgstr "處理已暫停: 正以電池供電"
-
-#: clientgui/sg_TaskPanel.cpp:1241
-msgid "Processing Suspended:  User Active."
-msgstr "處理已暫停: 使用者正在操作"
-
-#: clientgui/sg_TaskPanel.cpp:1243
-msgid "Processing Suspended:  User paused processing."
-msgstr "處理已暫停: 被使用者暫停"
-
-#: clientgui/sg_TaskPanel.cpp:1245
-msgid "Processing Suspended:  Time of Day."
-msgstr "處理已暫停: 不在設定時間內"
-
-#: clientgui/sg_TaskPanel.cpp:1247
-msgid "Processing Suspended:  Benchmarks Running."
-msgstr "處理已暫停: 正在執行效能測試"
-
-#: clientgui/sg_TaskPanel.cpp:1249
-msgid "Processing Suspended."
-msgstr "已暫停處理。"
-
-#: clientgui/sg_TaskPanel.cpp:1253
-msgid "Waiting to contact project servers."
-msgstr "正在等待連到專案伺服器。"
-
-#: clientgui/sg_TaskPanel.cpp:1257 clientgui/sg_TaskPanel.cpp:1266
-msgid "Retrieving current status"
-msgstr "取回目前狀態中"
-
-#: clientgui/sg_TaskPanel.cpp:1261
-msgid "No work available to process"
-msgstr "無任務可執行"
-
-#: clientgui/sg_TaskPanel.cpp:1263
-msgid "Unable to connect to the core client"
-msgstr "無法連到核心用戶端"
-
-#: clientgui/TermsOfUsePage.cpp:218
-msgid "Terms of Use"
-msgstr "使用條款"
-
-#: clientgui/TermsOfUsePage.cpp:222
-msgid "Please read the following terms of use:"
-msgstr "請閱讀以下的使用條款:"
-
-#: clientgui/TermsOfUsePage.cpp:231
-msgid "I agree to the terms of use."
-msgstr "我同意使用條款"
-
-#: clientgui/TermsOfUsePage.cpp:237
-msgid "I do not agree to the terms of use."
-msgstr "我不同意使用條款。"
-
-#: clientgui/UnavailablePage.cpp:183
-msgid "Project temporarily unavailable"
-msgstr "專案暫時無法使用"
-
-#: clientgui/UnavailablePage.cpp:186
-msgid ""
-"The project is temporarily unavailable.\n"
-"\n"
-"Please try again later."
-msgstr "此專案暫時無法使用。\n\n請稍後重試。"
-
-#: clientgui/UnavailablePage.cpp:190
-msgid "Account manager temporarily unavailable"
-msgstr "帳號管理暫時無法使用"
-
-#: clientgui/UnavailablePage.cpp:193
-msgid ""
-"The account manager is temporarily unavailable.\n"
-"\n"
-"Please try again later."
-msgstr "此帳號管理員暫時無法使用。\n\n請稍後重試。"
-
-#: clientgui/ValidateAccountKey.cpp:68
-msgid "Please specify an account key to continue."
-msgstr "請輸入帳號金鑰以繼續。"
-
-#: clientgui/ValidateAccountKey.cpp:71
-msgid "Invalid Account Key; please enter a valid Account Key"
-msgstr "無效的帳號金鑰;請輸入有效的帳號金鑰"
-
-#: clientgui/ValidateAccountKey.cpp:82 clientgui/ValidateEmailAddress.cpp:86
-msgid "Validation conflict"
-msgstr "驗證衝突"
-
-#: clientgui/ValidateEmailAddress.cpp:72
-msgid "Please specify an email address"
-msgstr "請輸入電子郵件地址"
-
-#: clientgui/ValidateEmailAddress.cpp:75
-msgid "Invalid email address; please enter a valid email address"
-msgstr "無效的電子郵件位址;請輸入有效的電子郵件位址"
-
-#: clientgui/ValidateURL.cpp:69
-msgid "Missing URL"
-msgstr "缺少網址"
-
-#: clientgui/ValidateURL.cpp:70
-msgid ""
-"Please specify a URL.\n"
-"For example:\n"
-"http://www.example.com/"
-msgstr "請輸入網址。\n例如:\nhttp://www.example.com/"
-
-#: clientgui/ValidateURL.cpp:83 clientgui/ValidateURL.cpp:87
-#: clientgui/ValidateURL.cpp:91 clientgui/ValidateURL.cpp:103
-#: clientgui/ValidateURL.cpp:107 clientgui/ValidateURL.cpp:110
-msgid "Invalid URL"
-msgstr "無效網址"
-
-#: clientgui/ValidateURL.cpp:84 clientgui/ValidateURL.cpp:88
-#: clientgui/ValidateURL.cpp:92
-msgid ""
-"Please specify a valid URL.\n"
-"For example:\n"
-"http://boincproject.example.com"
-msgstr "請輸入有效的網址。\n例如:\nhttp://boincproject.example.com"
-
-#: clientgui/ValidateURL.cpp:104 clientgui/ValidateURL.cpp:108
-#, c-format
-msgid "'%s' does not contain a valid host name."
-msgstr "「%s」不是有效的主機名稱。"
-
-#: clientgui/ValidateURL.cpp:111
-#, c-format
-msgid "'%s' does not contain a valid path."
-msgstr "「%s」不是有效的路徑。"
-
-#: clientgui/ViewMessages.cpp:84
-msgid "Commands"
-msgstr "指令"
-
-#: clientgui/ViewMessages.cpp:88
-msgid "Copy all messages"
-msgstr "複製所有訊息"
-
-#: clientgui/ViewMessages.cpp:95
-msgid "Copy selected messages"
-msgstr "複製選取的訊息"
-
-#: clientgui/ViewMessages.cpp:106 clientgui/ViewMessages.cpp:502
-msgid "Show only this project"
-msgstr "只顯示本專案"
-
-#: clientgui/ViewMessages.cpp:107 clientgui/ViewMessages.cpp:503
-msgid "Show only the messages for the selected project."
-msgstr "僅顯示所選專案的訊息。"
-
-#: clientgui/ViewMessages.cpp:164
-msgid "Messages"
-msgstr "訊息"
-
-#: clientgui/ViewMessages.cpp:187
-msgid "Copying all messages to the clipboard..."
-msgstr "複製全部訊息到剪貼簿..."
-
-#: clientgui/ViewMessages.cpp:223
-msgid "Copying selected messages to the clipboard..."
-msgstr "複製所選訊息到剪貼簿..."
-
-#: clientgui/ViewMessages.cpp:286
-msgid "Filtering messages..."
-msgstr "正在過濾訊息"
-
-#: clientgui/ViewMessages.cpp:494
-msgid "Show all messages"
-msgstr "顯示所有訊息"
-
-#: clientgui/ViewMessages.cpp:495
-msgid "Show messages for all projects."
-msgstr "顯示所有專案的訊息"
-
-#: clientgui/ViewProjects.cpp:246 clientgui/ViewStatistics.cpp:426
-msgid "Account"
-msgstr "帳號"
-
-#: clientgui/ViewProjects.cpp:248
-msgid "Work done"
-msgstr "總積分"
-
-#: clientgui/ViewProjects.cpp:249
-msgid "Avg. work done"
-msgstr "近期平均積分"
-
-#: clientgui/ViewProjects.cpp:251 clientgui/ViewTransfers.cpp:215
-#: clientgui/ViewWork.cpp:262
-msgid "Status"
-msgstr "狀態"
-
-#: clientgui/ViewProjects.cpp:330
-msgid "Projects"
-msgstr "專案"
-
-#: clientgui/ViewProjects.cpp:382
-msgid "Updating project..."
-msgstr "正在更新專案..."
-
-#: clientgui/ViewProjects.cpp:424
-msgid "Resuming project..."
-msgstr "正在繼續專案..."
-
-#: clientgui/ViewProjects.cpp:428
-msgid "Suspending project..."
-msgstr "正在暫停專案..."
-
-#: clientgui/ViewProjects.cpp:465
-msgid "Telling project to allow additional task downloads..."
-msgstr "通知專案可以下載額外任務..."
-
-#: clientgui/ViewProjects.cpp:469
-msgid "Telling project to not fetch any additional tasks..."
-msgstr "通知專案不要取得額外任務..."
-
-#: clientgui/ViewProjects.cpp:505
-msgid "Resetting project..."
-msgstr "正在重新設定專案..."
-
-#: clientgui/ViewProjects.cpp:563
-msgid "Removing project..."
-msgstr "正在移除專案..."
-
-#: clientgui/ViewProjects.cpp:623 clientgui/ViewWork.cpp:686
-msgid "Launching browser..."
-msgstr "啟動瀏覽器..."
-
-#: clientgui/ViewProjects.cpp:1140
-msgid "Requested by user"
-msgstr "用戶的請求"
-
-#: clientgui/ViewProjects.cpp:1141
-msgid "To fetch work"
-msgstr "取得任務"
-
-#: clientgui/ViewProjects.cpp:1142
-msgid "To report completed tasks"
-msgstr "上傳已完成的任務"
-
-#: clientgui/ViewProjects.cpp:1143
-msgid "To send trickle-up message"
-msgstr "發送上傳訊息"
-
-#: clientgui/ViewProjects.cpp:1144
-msgid "Requested by account manager"
-msgstr "帳號管理服務的請求"
-
-#: clientgui/ViewProjects.cpp:1145
-msgid "Project initialization"
-msgstr "專案初始化"
-
-#: clientgui/ViewProjects.cpp:1146
-msgid "Requested by project"
-msgstr "專案的請求"
-
-#: clientgui/ViewProjects.cpp:1147
-msgid "Unknown reason"
-msgstr "未知原因"
-
-#: clientgui/ViewProjects.cpp:1161
-msgid "Suspended by user"
-msgstr "被使用者暫停"
-
-#: clientgui/ViewProjects.cpp:1164
-msgid "Won't get new tasks"
-msgstr "無法取得新任務"
-
-#: clientgui/ViewProjects.cpp:1167
-msgid "Project ended - OK to remove"
-msgstr "專案已結束 - 按 OK 移除"
-
-#: clientgui/ViewProjects.cpp:1170
-msgid "Will remove when tasks done"
-msgstr "任務完成後移除"
-
-#: clientgui/ViewProjects.cpp:1173
-msgid "Scheduler request pending"
-msgstr "排程器請求中"
-
-#: clientgui/ViewProjects.cpp:1179
-msgid "Scheduler request in progress"
-msgstr "排程器請求進行中"
-
-#: clientgui/ViewProjects.cpp:1182
-msgid "Trickle up message pending"
-msgstr "等待上傳訊息中"
-
-#: clientgui/ViewProjects.cpp:1188
-msgid "Communication deferred "
-msgstr "已擱置通訊 "
-
-#: clientgui/ViewResources.cpp:62
-msgid "Total disk usage"
-msgstr "使用的硬碟空間"
+#: clientgui/ViewResources.cpp:62
+msgid "Total disk usage"
+msgstr "使用的硬碟空間"
 
 #: clientgui/ViewResources.cpp:83
 msgid "Disk usage by BOINC projects"
@@ -3438,7 +3268,7 @@ msgstr "BOINC 不可使用的閒置空間:"
 msgid "free: "
 msgstr "閒置空間:"
 
-#: clientgui/ViewResources.cpp:299
+#: clientgui/ViewResources.cpp:298
 msgid "used by other programs: "
 msgstr "其他程式使用:"
 
@@ -3649,35 +3479,35 @@ msgstr "您確定要停止「%s」 的檔案傳輸嗎?\n提示: 終止傳輸
 msgid "Abort File Transfer"
 msgstr "停止檔案傳輸"
 
-#: clientgui/ViewTransfers.cpp:864
+#: clientgui/ViewTransfers.cpp:845
 msgid "Upload"
 msgstr "上傳"
 
-#: clientgui/ViewTransfers.cpp:864
+#: clientgui/ViewTransfers.cpp:845
 msgid "Download"
 msgstr "下載"
 
-#: clientgui/ViewTransfers.cpp:868
+#: clientgui/ViewTransfers.cpp:849
 msgid "retry in "
 msgstr "稍後重試於"
 
-#: clientgui/ViewTransfers.cpp:870
+#: clientgui/ViewTransfers.cpp:851
 msgid "failed"
 msgstr "失敗"
 
-#: clientgui/ViewTransfers.cpp:873
+#: clientgui/ViewTransfers.cpp:854
 msgid "suspended"
 msgstr "已暫停"
 
-#: clientgui/ViewTransfers.cpp:878
+#: clientgui/ViewTransfers.cpp:859
 msgid "active"
 msgstr "處理中"
 
-#: clientgui/ViewTransfers.cpp:880
+#: clientgui/ViewTransfers.cpp:861
 msgid "pending"
 msgstr "等待中"
 
-#: clientgui/ViewTransfers.cpp:887
+#: clientgui/ViewTransfers.cpp:867
 msgid " (project backoff: "
 msgstr " (專案延後: "
 
@@ -3689,6 +3519,14 @@ msgstr "顯示執行中"
 msgid "Show only active tasks."
 msgstr "只顯示執行中的任務。"
 
+#: clientgui/ViewWork.cpp:218 clientgui/sg_TaskCommandPopup.cpp:66
+msgid "Show graphics"
+msgstr "顯示圖形"
+
+#: clientgui/ViewWork.cpp:219 clientgui/sg_TaskCommandPopup.cpp:67
+msgid "Show application graphics in a window."
+msgstr "於新視窗中顯示程式的圖形。"
+
 #: clientgui/ViewWork.cpp:225
 msgid "Show VM Console"
 msgstr "顯示此主機總計"
@@ -3701,10 +3539,18 @@ msgstr "於新視窗中顯示程式的圖形。"
 msgid "Suspend work for this result."
 msgstr "暫停此任務。"
 
+#: clientgui/ViewWork.cpp:239 clientgui/sg_TaskCommandPopup.cpp:78
+msgid "Abort"
+msgstr "停止"
+
 #: clientgui/ViewWork.cpp:240
 msgid "Abandon work on the result. You will get no credit for it."
 msgstr "放棄此任務。您將不會取得任何積分。"
 
+#: clientgui/ViewWork.cpp:247 clientgui/sg_TaskCommandPopup.cpp:85
+msgid "Show task details."
+msgstr "顯示任務細節"
+
 #: clientgui/ViewWork.cpp:264
 msgid "Remaining (estimated)"
 msgstr "剩餘時間 (預估)"
@@ -3745,6 +3591,10 @@ msgstr "您確定要停止這個任務「%s」嗎?\n(進度: %s,狀態: %s)"
 msgid "Are you sure you want to abort these %d tasks?"
 msgstr "您確定您要停止 %d 這個任務嗎?"
 
+#: clientgui/ViewWork.cpp:577 clientgui/sg_TaskCommandPopup.cpp:272
+msgid "Abort task"
+msgstr "停止任務"
+
 #: clientgui/ViewWork.cpp:586
 msgid "Aborting task..."
 msgstr "停止任務中..."
@@ -3757,106 +3607,307 @@ msgstr "顯示所有任務"
 msgid "Show all tasks."
 msgstr "顯示所有任務。"
 
-#: clientgui/WelcomePage.cpp:284
-msgid "Add project or account manager"
-msgstr "新增專案或帳號管理服務"
-
-#: clientgui/WelcomePage.cpp:288
-msgid "Add project or use BOINC Account Manager"
-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 "可以的話,加入 %s 網站的專案。\n\n透過精靈加入的專案可能不會於 %s 出現或管理。"
-
-#: clientgui/WelcomePage.cpp:313
-msgid ""
-"There are over 30 BOINC-based projects\n"
-"doing research in many areas of science,\n"
-"and you can volunteer for as many of them as you like.\n"
-"You can add a project directly,\n"
-"or use an 'Account Manager' web site to select projects."
-msgstr "目前有超過 30 個基於 BOINC 的專案,\n其研究內容涉及多個科學領域,\n您可以依照您自己的喜好加入這些專案。\n您可以直接加入這些專案,或是利用\"帳戶管理服務\"網站來選擇專案。"
-
-#: clientgui/WelcomePage.cpp:325
-msgid ""
-"You have chosen to add a new volunteer computing project or change which projects\n"
-"you contribute to.\n"
-"\n"
-"Some of these projects are run and managed by World Community Grid, while others\n"
-"are run and managed by other researchers or organizations. The BOINC software\n"
-"can divide your spare processing power among any combination of projects.\n"
-"\n"
-"Alternatively, if you have registered with a BOINC Account Manager, you can use\n"
-"this to choose which projects to support.\n"
-"\n"
-"Please choose which type of change you would like to make:\n"
-msgstr "您已選擇新增一個新專案或更改專案來做出貢獻。\n\n這些專案其中是由 World Community Grid 運行和管理的,\n而其他大多由研究人員或組織來運行和管理。\nBOINC 軟體可以在您的空閒運算能力之間的自動分配專案。\n\n另外,如果您已經註冊 BOINC 的帳號管理服務,\n您能用它來選擇想支援哪些專案。\n\n你想選擇哪種類型:\n"
-
-#: clientgui/WelcomePage.cpp:339
-msgid "Use a BOINC Account Manager"
-msgstr "使用BOINC帳號管理服務"
-
-#: clientgui/WelcomePage.cpp:358
-msgid "Add or change your World Community Grid projects"
-msgstr "新增或修改 World Community Grid 專案"
+#: clientgui/ViewWork.cpp:883 clientgui/sg_TaskCommandPopup.cpp:119
+msgid "Resume work for this task."
+msgstr "繼續此任務。"
 
-#: clientgui/WelcomePage.cpp:361
-msgid "Add projects run by other researchers or organizations"
-msgstr "新增其它研究組織的專案"
+#: clientgui/ViewWork.cpp:889 clientgui/sg_TaskCommandPopup.cpp:123
+msgid "Suspend work for this task."
+msgstr "暫停此任務。"
 
-#: clientgui/WizardAttach.cpp:560
+#: clientgui/WizardAttach.cpp:571
 msgid "Do you really want to cancel?"
 msgstr "您真的要取消嗎?"
 
-#: clientgui/WizardAttach.cpp:561
+#: clientgui/WizardAttach.cpp:572
 msgid "Question"
 msgstr "問題"
 
-#: clientgui/wizardex.cpp:377 clientgui/wizardex.cpp:553
-msgid "&Next >"
-msgstr "下一步 (&N) >"
-
-#: clientgui/wizardex.cpp:383
-msgid "< &Back"
-msgstr "< 上一步 (&B)"
-
-#: clientgui/wizardex.cpp:553
-msgid "&Finish"
-msgstr "完成 (&F)"
-
-#: clientgui/common/wxPieCtrl.cpp:64
-msgid "Pie Ctrl"
-msgstr "圖表控制"
-
-#: clientgui/mac/Mac_GUI.cpp:35
+#: clientgui/mac/Mac_GUI.cpp:35 clientgui\mac/Mac_GUI.cpp:35
 msgid "Services"
 msgstr "服務"
 
-#: clientgui/mac/Mac_GUI.cpp:36
+#: clientgui/mac/Mac_GUI.cpp:36 clientgui\mac/Mac_GUI.cpp:36
 #, c-format
 msgid "Hide %s"
 msgstr "隱藏 %s"
 
-#: clientgui/mac/Mac_GUI.cpp:37
+#: clientgui/mac/Mac_GUI.cpp:37 clientgui\mac/Mac_GUI.cpp:37
 msgid "Hide Others"
 msgstr "隱藏其它"
 
-#: clientgui/mac/Mac_GUI.cpp:38
+#: clientgui/mac/Mac_GUI.cpp:38 clientgui\mac/Mac_GUI.cpp:38
 msgid "Show All"
 msgstr "顯示全部"
 
-#: clientgui/mac/Mac_GUI.cpp:39
+#: clientgui/mac/Mac_GUI.cpp:39 clientgui\mac/Mac_GUI.cpp:39
 #, c-format
 msgid "Quit %s"
 msgstr "離開 %s"
 
+#: clientgui/sg_BoincSimpleFrame.cpp:169
+msgid "Skin"
+msgstr "外觀"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:171
+msgid "Select the appearance of the user interface."
+msgstr "選擇用戶的介面外觀"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:181
+msgid "Advanced View...\tCtrl+Shift+A"
+msgstr "進階模式...\tCtrl+Shift+A"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:182
+msgid "Display the advanced graphical interface."
+msgstr "顯示精簡 BOINC 圖形介面。"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:198
+msgid "Configure display options and proxy settings"
+msgstr "配置顯示選項和 Proxy 設定"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:212
+msgid "Display diagnostic messages."
+msgstr "顯示診斷訊息。"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:233
+#, c-format
+msgid "&%s"
+msgstr "&%s"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:449
+msgid "Default"
+msgstr "預設"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:895
+msgid "Suspend Computing"
+msgstr "暫停執行"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:896
+msgid "Resume Computing"
+msgstr "繼續執行"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:913
+msgid "Open a window to view notices from projects or BOINC"
+msgstr "開啟新視窗觀看來自專案或 BOINC 的訊息"
+
+#: clientgui/sg_BoincSimpleFrame.cpp:934 clientgui/sg_DlgPreferences.cpp:366
+#, c-format
+msgid "Get help with %s"
+msgstr "取得 %s 的幫助"
+
+#: clientgui/sg_DlgMessages.cpp:146
+msgid "Close"
+msgstr "關閉"
+
+#: clientgui/sg_DlgMessages.cpp:394
+#, c-format
+msgid "%s - Notices"
+msgstr "%s - 訊息"
+
+#: clientgui/sg_DlgPreferences.cpp:208
+msgid ""
+"For additional settings, select Computing Preferences in the Advanced View."
+msgstr "需要更多的偏好設定,請切換至進階模式。"
+
+#: clientgui/sg_DlgPreferences.cpp:346
+msgid "GB of disk space"
+msgstr "GB的硬碟空間"
+
+#: clientgui/sg_DlgPreferences.cpp:1105
+#, c-format
+msgid "%s - Computing Preferences"
+msgstr "%s - 運算偏好設定"
+
+#: clientgui/sg_DlgPreferences.cpp:1186
+msgid "Discard all local preferences and use web-based preferences?"
+msgstr "放棄所有本機偏好設定改用網站偏好設定?"
+
+#: clientgui/sg_ProjectPanel.cpp:72
+msgid "Add Project"
+msgstr "新增專案"
+
+#: clientgui/sg_ProjectPanel.cpp:73
+msgid "Synchronize"
+msgstr "同步"
+
+#: clientgui/sg_ProjectPanel.cpp:74
+msgid "Work done for this project"
+msgstr "已完成該專案任務"
+
+#: clientgui/sg_ProjectPanel.cpp:76
+msgid "Volunteer for any or all of 30+ projects in many areas of science"
+msgstr "志願加入到任何或所有高達30+個分佈在許多不同科學領域內的專案"
+
+#: clientgui/sg_ProjectPanel.cpp:77
+msgid "Synchronize projects with account manager system"
+msgstr "與帳號管理系統同步專案"
+
+#. TODO: Might want better wording for Project Selection Combo Box tooltip
+#: clientgui/sg_ProjectPanel.cpp:124
+msgid "Select a project to access with the controls below"
+msgstr "選擇一個要管理的專案"
+
+#: clientgui/sg_ProjectPanel.cpp:145
+msgid "Project Web Pages"
+msgstr "專案網站"
+
+#: clientgui/sg_ProjectPanel.cpp:149
+msgid "Project Commands"
+msgstr "專案指令"
+
+#: clientgui/sg_ProjectPanel.cpp:278
+#, c-format
+msgid "Pop up a menu of web sites for project %s"
+msgstr "跳出一個%s專案的網頁選單"
+
+#: clientgui/sg_ProjectPanel.cpp:280
+#, c-format
+msgid "Pop up a menu of commands to apply to project %s"
+msgstr "跳出一個 %s 專案的指令選單"
+
+#: clientgui/sg_TaskCommandPopup.cpp:73
+msgid "Suspend this task."
+msgstr "已暫停此任務"
+
+#: clientgui/sg_TaskCommandPopup.cpp:79
+msgid "Abandon this task. You will get no credit for it."
+msgstr "放棄此任務。您將不會獲得任何積分。"
+
+#: clientgui/sg_TaskCommandPopup.cpp:267
+#, c-format
+msgid ""
+"Are you sure you want to abort this task '%s'?\n"
+"(Progress: %.1lf%%, Status: %s)"
+msgstr "您確定要停止此任務 '%s' 嗎?\n(進度: %.1lf%%,狀態: %s)"
+
+#: clientgui/sg_TaskPanel.cpp:468
+msgid "You don't have any projects.  Please Add a Project."
+msgstr "你沒有任何專案,請加入專案。"
+
+#: clientgui/sg_TaskPanel.cpp:469
+msgid "Not available"
+msgstr "不可行"
+
+#: clientgui/sg_TaskPanel.cpp:480
+msgid "Tasks:"
+msgstr "任務:"
+
+#. TODO: Might want better wording for Task Selection Combo Box tooltip
+#: clientgui/sg_TaskPanel.cpp:486
+msgid "Select a task to access"
+msgstr "選擇要觀看的任務"
+
+#. what project the task is from, e.g. "From: SETI at home"
+#: clientgui/sg_TaskPanel.cpp:498
+msgid "From:"
+msgstr "專案:"
+
+#: clientgui/sg_TaskPanel.cpp:552
+msgid "This task's progress"
+msgstr "此任務進度"
+
+#: clientgui/sg_TaskPanel.cpp:570
+msgid "Task Commands"
+msgstr "任務指令"
+
+#: clientgui/sg_TaskPanel.cpp:571
+msgid "Pop up a menu of commands to apply to this task"
+msgstr "跳出一個適用於目前任務的指令選單"
+
+#: clientgui/sg_TaskPanel.cpp:706
+#, c-format
+msgid "Application: %s"
+msgstr "程式: %s"
+
+#: clientgui/sg_TaskPanel.cpp:729
+#, c-format
+msgid "%.3f%%"
+msgstr "%.3f%%"
+
+#: clientgui/sg_TaskPanel.cpp:737
+msgid "Application: Not available"
+msgstr "程式:不可行"
+
+#: clientgui/sg_TaskPanel.cpp:837
+msgid "Not Available"
+msgstr "不可行"
+
+#: clientgui/sg_TaskPanel.cpp:852
+#, c-format
+msgid "Elapsed: %s"
+msgstr "執行時間:%s"
+
+#: clientgui/sg_TaskPanel.cpp:866
+#, c-format
+msgid "Remaining (estimated): %s"
+msgstr "剩餘時間:%s"
+
+#: clientgui/sg_TaskPanel.cpp:881
+#, c-format
+msgid "Status: %s"
+msgstr "狀態:%s"
+
+#: clientgui/sg_TaskPanel.cpp:1206
+msgid "Retrieving current status."
+msgstr "取回目前狀態中。"
+
+#: clientgui/sg_TaskPanel.cpp:1212
+msgid "Downloading work from the server."
+msgstr "正從伺服器下載任務。"
+
+#: clientgui/sg_TaskPanel.cpp:1217
+msgid "Processing Suspended:  Running On Batteries."
+msgstr "處理已暫停: 正以電池供電"
+
+#: clientgui/sg_TaskPanel.cpp:1219
+msgid "Processing Suspended:  User Active."
+msgstr "處理已暫停: 使用者正在操作"
+
+#: clientgui/sg_TaskPanel.cpp:1221
+msgid "Processing Suspended:  User paused processing."
+msgstr "處理已暫停: 被使用者暫停"
+
+#: clientgui/sg_TaskPanel.cpp:1223
+msgid "Processing Suspended:  Time of Day."
+msgstr "處理已暫停: 不在設定時間內"
+
+#: clientgui/sg_TaskPanel.cpp:1225
+msgid "Processing Suspended:  Benchmarks Running."
+msgstr "處理已暫停: 正在執行效能測試"
+
+#: clientgui/sg_TaskPanel.cpp:1227
+msgid "Processing Suspended."
+msgstr "已暫停處理。"
+
+#: clientgui/sg_TaskPanel.cpp:1231
+msgid "Waiting to contact project servers."
+msgstr "正在等待連到專案伺服器。"
+
+#: clientgui/sg_TaskPanel.cpp:1235 clientgui/sg_TaskPanel.cpp:1244
+msgid "Retrieving current status"
+msgstr "取回目前狀態中"
+
+#: clientgui/sg_TaskPanel.cpp:1239
+msgid "No work available to process"
+msgstr "無任務可執行"
+
+#: clientgui/sg_TaskPanel.cpp:1241
+msgid "Unable to connect to the core client"
+msgstr "無法連到核心用戶端"
+
+#: clientgui/wizardex.cpp:377 clientgui/wizardex.cpp:553
+msgid "&Next >"
+msgstr "下一步 (&N) >"
+
+#: clientgui/wizardex.cpp:383
+msgid "< &Back"
+msgstr "< 上一步 (&B)"
+
+#: clientgui/wizardex.cpp:553
+msgid "&Finish"
+msgstr "完成 (&F)"
+
+#. /////////////////////////////////////////////////////////////////////////
 #: clientgui/DlgAdvPreferencesBase.h:45
 msgid "On this day of the week, compute only during these hours."
 msgstr "僅在本日特定時段運算。"
diff --git a/locale/zh_TW/BOINC-Project-Generic.po b/locale/zh_TW/BOINC-Project-Generic.po
index c4f4c74..41f6fc5 100644
--- a/locale/zh_TW/BOINC-Project-Generic.po
+++ b/locale/zh_TW/BOINC-Project-Generic.po
@@ -6,15 +6,18 @@
 # FileID  : $Id$
 # 
 # Translators:
-# willy Wu <df910105 at yahoo.com.tw>, 2015
+# Died <doomdied at gmail.com>, 2015
+# Po-Chun Huang <aphroteus 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\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-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"
+"POT-Creation-Date: 2015-06-24 13:05 PDT\n"
+"PO-Revision-Date: 2015-11-26 20:42+0000\n"
+"Last-Translator: Mingye Wang <arthur200126 at gmail.com>\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/boinc/boinc/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -23,10 +26,101 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"
 
 msgid "LANG_NAME_NATIVE"
-msgstr "繁體中文 ( 台灣 )"
+msgstr "繁體中文 (台灣)"
 
 msgid "LANG_NAME_INTERNATIONAL"
-msgstr "Traditional Chinese ( Taiwan )"
+msgstr "Traditional Chinese (Taiwan)"
+
+#: ../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:224 ../inc/team.inc:372 ../inc/user.inc:198
+#: ../user/account_finish.php:41 ../user/team_admins.php:64
+#: ../user/team_change_founder_form.php:79 ../user/team_email_list.php:73
+#: ../user/top_users.php:49 ../user/user_search.php:124
+msgid "Name"
+msgstr "用戶名"
+
+#: ../inc/account.inc:44 ../user/account_finish.php:41
+msgid "Identifies you on our web site. Use your real name or a nickname."
+msgstr "您在我們網站上的標識,可以使用您的真實姓名或是暱稱。"
+
+#: ../inc/account.inc:48
+msgid "Email Address"
+msgstr "電子郵件地址"
+
+#: ../inc/account.inc:48
+msgid "Must be a valid address of the form 'name at domain'."
+msgstr "必須是有效的電子郵件地址,例如:用戶名@域名。"
+
+#: ../inc/account.inc:57 ../user/edit_email_form.php:47
+msgid "Password"
+msgstr "密碼"
+
+#: ../inc/account.inc:58
+msgid "Must be at least %1 characters"
+msgstr "至少必須包含 %1 個字符"
+
+#: ../inc/account.inc:61
+msgid "Confirm password"
+msgstr "確認密碼"
+
+#: ../inc/account.inc:63 ../inc/team.inc:43 ../inc/team.inc:134
+#: ../inc/team.inc:247 ../inc/team.inc:387 ../inc/team.inc:475
+#: ../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 "保持登入狀態"
+
+#. kludge
+#: ../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)"
@@ -41,323 +135,363 @@ 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]圖片網址[/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] 或 [url=連結]文字[/url] (alt+w)"
 
-#: ../inc/bbcode_html.inc:42
+#: ../inc/bbcode_html.inc:45
 msgid "Font color"
 msgstr "字體顏色"
 
-#: ../inc/bbcode_html.inc:43
+#: ../inc/bbcode_html.inc:46
 msgid ""
 "Font color: [color=red]text[/color]  Tip: you can also use color=#FF0000"
 msgstr "字體顏色:[color=red]文字[/color] 訣竅:你也可以用 #FF0000 來表示紅色"
 
-#: ../inc/bbcode_html.inc:44 ../inc/bbcode_html.inc:59 ../inc/prefs.inc:638
+#: ../inc/bbcode_html.inc:47 ../inc/bbcode_html.inc:62
+#: ../inc/prefs_util.inc:546
 msgid "Default"
 msgstr "預設"
 
-#: ../inc/bbcode_html.inc:45
+#: ../inc/bbcode_html.inc:48
 msgid "Dark Red"
 msgstr "深紅"
 
-#: ../inc/bbcode_html.inc:46
+#: ../inc/bbcode_html.inc:49
 msgid "Red"
 msgstr "紅"
 
-#: ../inc/bbcode_html.inc:47
+#: ../inc/bbcode_html.inc:50
 msgid "Orange"
 msgstr "橙"
 
-#: ../inc/bbcode_html.inc:48
+#: ../inc/bbcode_html.inc:51
 msgid "Brown"
 msgstr "棕"
 
-#: ../inc/bbcode_html.inc:49
+#: ../inc/bbcode_html.inc:52
 msgid "Yellow"
 msgstr "黃"
 
-#: ../inc/bbcode_html.inc:50
+#: ../inc/bbcode_html.inc:53
 msgid "Green"
 msgstr "綠"
 
-#: ../inc/bbcode_html.inc:51
+#: ../inc/bbcode_html.inc:54
 msgid "Olive"
 msgstr "橄欖"
 
-#: ../inc/bbcode_html.inc:52
+#: ../inc/bbcode_html.inc:55
 msgid "Cyan"
 msgstr "藍綠"
 
-#: ../inc/bbcode_html.inc:53
+#: ../inc/bbcode_html.inc:56
 msgid "Blue"
 msgstr "藍"
 
-#: ../inc/bbcode_html.inc:54
+#: ../inc/bbcode_html.inc:57
 msgid "Dark Blue"
 msgstr "深藍"
 
-#: ../inc/bbcode_html.inc:55
+#: ../inc/bbcode_html.inc:58
 msgid "Indigo"
 msgstr "靛藍"
 
-#: ../inc/bbcode_html.inc:56
+#: ../inc/bbcode_html.inc:59
 msgid "Violet"
 msgstr "紫"
 
-#: ../inc/bbcode_html.inc:57
+#: ../inc/bbcode_html.inc:60
 msgid "Font size"
 msgstr "字體大小"
 
-#: ../inc/bbcode_html.inc:58
+#: ../inc/bbcode_html.inc:61
 msgid "Font size: [size=x-small]small text[/size]"
-msgstr "字體大小:[size=x-small]本文[/size]"
+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
+#. names for the above
+#: ../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:104
+msgid "Volunteer moderator"
+msgstr "志願者管理員"
+
+#: ../inc/forum.inc:105
+msgid "Project administrator"
+msgstr "專案主管"
+
+#: ../inc/forum.inc:106
+msgid "Project developer"
+msgstr "專案開發者"
+
+#: ../inc/forum.inc:107
+msgid "Project tester"
+msgstr "專案測試人員"
+
+#: ../inc/forum.inc:108
+msgid "Volunteer developer"
+msgstr "志願者開發人員"
+
+#: ../inc/forum.inc:109
+msgid "Volunteer tester"
+msgstr "志願者測試人員"
+
+#: ../inc/forum.inc:110
+msgid "Project scientist"
+msgstr "專案科學家"
+
+#: ../inc/forum.inc:111
+msgid "Help desk expert"
+msgstr "服務臺專家"
+
+#. Search
+#: ../inc/forum.inc:129
 msgid "Search for words in forum messages"
 msgstr "搜尋留言版中的訊息"
 
-#: ../inc/forum.inc:125
+#: ../inc/forum.inc:129
 msgid "Search forums"
 msgstr "搜尋討論版"
 
-#: ../inc/forum.inc:126
+#: ../inc/forum.inc:130
 msgid "Advanced search"
 msgstr "進階搜尋"
 
-#: ../inc/forum.inc:132 ../inc/user.inc:253 ../user/pm.php:69
-#: ../user/pm.php:133
+#: ../inc/forum.inc:136 ../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:155 ../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:155 ../inc/forum.inc:187 ../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:191 ../inc/forum.inc:199
 msgid "%1 message board"
 msgstr "%1 留言版"
 
-#: ../inc/forum.inc:245 ../inc/result.inc:695
+#: ../inc/forum.inc:249 ../inc/result.inc:717
 msgid "Previous"
 msgstr "上一個"
 
-#: ../inc/forum.inc:283 ../inc/result.inc:704
+#: ../inc/forum.inc:287 ../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:416 ../inc/forum.inc:1234 ../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:416 ../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:586
 msgid "Send message"
 msgstr "傳送 訊息"
 
-#: ../inc/forum.inc:580
+#: ../inc/forum.inc:586
 msgid "Send %1 a private message"
 msgstr "傳送私人訊息給 %1"
 
-#: ../inc/forum.inc:581
+#: ../inc/forum.inc:587
 msgid "Joined: %1"
-msgstr "已加入:%1"
+msgstr "加入時間:%1"
 
-#: ../inc/forum.inc:590
+#: ../inc/forum.inc:596
 msgid "Posts: %1"
 msgstr "文章:%1"
 
-#: ../inc/forum.inc:596
+#: ../inc/forum.inc:602
 msgid "Credit: %1"
 msgstr "積分:%1"
 
-#: ../inc/forum.inc:597
+#: ../inc/forum.inc:603
 msgid "RAC: %1"
 msgstr "近期平均績分:%1"
 
-#: ../inc/forum.inc:620
+#: ../inc/forum.inc:627
 msgid "You haven't read this message yet"
 msgstr "您尚未閱讀此訊息"
 
-#: ../inc/forum.inc:620
+#: ../inc/forum.inc:627
 msgid "Unread"
 msgstr "未讀"
 
-#: ../inc/forum.inc:623 ../inc/forum.inc:628 ../inc/forum.inc:727
+#: ../inc/forum.inc:630 ../inc/forum.inc:635 ../inc/forum.inc:736
 msgid "Message %1"
 msgstr "訊息%1"
 
-#: ../inc/forum.inc:624 ../inc/user.inc:331 ../user/forum_forum.php:174
+#: ../inc/forum.inc:631 ../inc/user.inc:409 ../user/forum_forum.php:178
 msgid "hidden"
 msgstr "隱藏"
 
-#: ../inc/forum.inc:625
+#: ../inc/forum.inc:632
 msgid "Posted: %1"
 msgstr "發表於:%1"
 
-#: ../inc/forum.inc:628
+#: ../inc/forum.inc:635
 msgid " - in response to "
 msgstr " - 回應於 "
 
-#: ../inc/forum.inc:631 ../inc/prefs.inc:705 ../inc/prefs.inc:707
+#: ../inc/forum.inc:638
 msgid "Edit"
 msgstr "編輯"
 
-#: ../inc/forum.inc:631
+#: ../inc/forum.inc:638
 msgid "Edit this message"
 msgstr "編輯此訊息"
 
-#: ../inc/forum.inc:637
+#: ../inc/forum.inc:644
 msgid "Last modified: %1"
 msgstr "最近修改日期:%1"
 
-#: ../inc/forum.inc:640
+#: ../inc/forum.inc:647
 msgid ""
 "This post is not shown because the sender is on your 'ignore' list.  Click "
 "%1here%2 to view this post"
 msgstr "這篇文章未能顯示是因為作者將您加到忽略列表裡。點擊%1這裡%2查看"
 
-#: ../inc/forum.inc:668 ../inc/forum.inc:679
+#: ../inc/forum.inc:675 ../inc/forum.inc:686
 msgid "Report this post as offensive"
 msgstr "檢舉違規文章"
 
-#: ../inc/forum.inc:668 ../inc/forum.inc:679
+#: ../inc/forum.inc:675 ../inc/forum.inc:686
 msgid "Report as offensive"
-msgstr "檢舉違規文章"
+msgstr "檢舉違規"
 
-#: ../inc/forum.inc:672
+#: ../inc/forum.inc:679
 msgid "Rating: %1"
 msgstr "評分:%1"
 
-#: ../inc/forum.inc:672
+#: ../inc/forum.inc:679
 msgid "rate: "
 msgstr "評分:"
 
-#: ../inc/forum.inc:675
+#: ../inc/forum.inc:682
 msgid "Click if you like this message"
 msgstr "如果你喜歡此訊息請點擊"
 
-#: ../inc/forum.inc:675
+#: ../inc/forum.inc:682
 msgid "Rate +"
 msgstr "加分 +"
 
-#: ../inc/forum.inc:677
+#: ../inc/forum.inc:684
 msgid "Click if you don't like this message"
 msgstr "如果你不喜歡此訊息請點擊"
 
-#: ../inc/forum.inc:677
+#: ../inc/forum.inc:684
 msgid "Rate -"
 msgstr "扣分 -"
 
-#: ../inc/forum.inc:685 ../user/pm.php:106 ../user/pm.php:146
+#. "Reply" is used as a verb
+#: ../inc/forum.inc:693 ../user/pm.php:111 ../user/pm.php:151
 msgid "Reply"
 msgstr "回覆"
 
-#: ../inc/forum.inc:685
+#: ../inc/forum.inc:693
 msgid "Post a reply to this message"
 msgstr "回覆此訊息"
 
-#: ../inc/forum.inc:687
+#. "Quote" is used as a verb
+#: ../inc/forum.inc:696
 msgid "Quote"
 msgstr "引用"
 
-#: ../inc/forum.inc:687
+#: ../inc/forum.inc:696
 msgid "Post a reply by quoting this message"
 msgstr "回覆並引用此消息"
 
-#: ../inc/forum.inc:708
+#: ../inc/forum.inc:717
 msgid "Hidden by a moderator"
 msgstr "被管理員隱藏"
 
-#: ../inc/forum.inc:729
+#: ../inc/forum.inc:738
 msgid "Posted %1 by %2"
-msgstr "發表於:%1 作者:%2"
+msgstr "%2 發表於:%1 "
 
-#: ../inc/forum.inc:747
+#: ../inc/forum.inc:756
 msgid "You may not post or rate messages until %1"
-msgstr "你必須等到 %1後才能回覆或給帖子評分"
+msgstr "你必須等到%1後才能回覆或給帖子評分"
 
-#: ../inc/forum.inc:758
+#: ../inc/forum.inc:767
 msgid ""
 "\n"
 "        <ul>\n"
@@ -375,340 +509,350 @@ msgid ""
 "        "
 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:799
 msgid "Rules:"
 msgstr "規定:"
 
-#: ../inc/forum.inc:781
+#: ../inc/forum.inc:800
 msgid "More info"
 msgstr "更多訊息"
 
-#: ../inc/forum.inc:1055 ../user/forum_thread.php:189
+#: ../inc/forum.inc:1098 ../user/forum_thread.php:190
 msgid "Unhide"
 msgstr "取消隱藏"
 
-#: ../inc/forum.inc:1055
+#: ../inc/forum.inc:1098
 msgid "Unhide this post"
 msgstr "取消隱藏文章"
 
-#: ../inc/forum.inc:1057 ../user/forum_thread.php:195
+#: ../inc/forum.inc:1100 ../user/forum_thread.php:196
 msgid "Hide"
 msgstr "隱藏"
 
-#: ../inc/forum.inc:1057
+#: ../inc/forum.inc:1100
 msgid "Hide this post"
 msgstr "隱藏這篇文章"
 
-#: ../inc/forum.inc:1062 ../user/forum_thread.php:228
+#: ../inc/forum.inc:1105 ../user/forum_thread.php:229
 msgid "Move"
 msgstr "移動"
 
-#: ../inc/forum.inc:1062
+#: ../inc/forum.inc:1105
 msgid "Move post to a different thread"
 msgstr "移動文章到其他主題"
 
-#: ../inc/forum.inc:1067
+#: ../inc/forum.inc:1110
 msgid "Banish author"
 msgstr "封禁作者"
 
-#: ../inc/forum.inc:1074
+#: ../inc/forum.inc:1117
 msgid "Vote to banish author"
 msgstr "投票封禁作者"
 
-#: ../inc/forum.inc:1078
+#: ../inc/forum.inc:1121
 msgid "Vote not to banish author"
 msgstr "投票不要封禁作者"
 
-#: ../inc/forum.inc:1083
+#: ../inc/forum.inc:1126
 msgid "Start vote to banish author"
 msgstr "開始投票封禁作者"
 
-#: ../inc/forum.inc:1116
+#: ../inc/forum.inc:1131 ../inc/user.inc:312 ../user/forum_thread.php:243
+#: ../user/pm.php:112 ../user/pm.php:152
+msgid "Delete"
+msgstr "刪除"
+
+#: ../inc/forum.inc:1131
+msgid "Delete this post"
+msgstr "刪除文章"
+
+#: ../inc/forum.inc:1169
 msgid "Only team members can post to the team message board"
 msgstr "只有團隊成員才能在團隊的留言板中發文"
 
-#: ../inc/forum.inc:1126
+#: ../inc/forum.inc:1179
 msgid ""
 "In order to create a new thread in %1 you must have a certain amount of "
 "credit. This is to prevent and protect against abuse of the system."
 msgstr "你必須在已經獲得了一定的積分後才能在 %1 發表一個新主題。這是為了防止對論壇系統的濫用。"
 
-#: ../inc/forum.inc:1133
+#: ../inc/forum.inc:1186
 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:1193
 msgid ""
 "This thread is locked. Only forum moderators and administrators are allowed "
 "to post there."
 msgstr "此主題已被鎖定,只有論壇管理員能夠在該主題下發文。"
 
-#: ../inc/forum.inc:1145
+#: ../inc/forum.inc:1198
 msgid "Can't post to a hidden thread."
 msgstr "不能回覆隱藏主題"
 
-#: ../inc/forum.inc:1173
+#: ../inc/forum.inc:1232
 msgid "Thread"
 msgstr "主題"
 
-#: ../inc/forum.inc:1174 ../inc/team.inc:128 ../user/forum_forum.php:136
-#: ../user/forum_index.php:94
+#: ../inc/forum.inc:1233 ../inc/team.inc:140 ../user/forum_forum.php:139
+#: ../user/forum_index.php:99
 msgid "Posts"
-msgstr "投稿"
+msgstr "文章"
 
-#: ../inc/forum.inc:1176 ../user/forum_forum.php:138
+#: ../inc/forum.inc:1235 ../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:1236 ../inc/team.inc:140 ../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:1294
 msgid "New posts in the thread %1"
 msgstr "主題 %1 的新回覆"
 
-#: ../inc/forum.inc:1240
+#: ../inc/forum.inc:1299
 msgid "New posts in subscribed thread"
 msgstr "已訂閱主題的新回覆"
 
-#: ../inc/forum.inc:1241
+#: ../inc/forum.inc:1300
 msgid "There are new posts in the thread '%1'"
 msgstr "主題 “%1” 有新回覆"
 
-#: ../inc/forum.inc:1251
+#: ../inc/forum.inc:1310
 msgid "Mark all threads as read"
 msgstr "標示所有已閱讀的文章"
 
-#: ../inc/forum.inc:1252
+#: ../inc/forum.inc:1311
 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:142
 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 "UCT %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:110 ../inc/team.inc:229
+#: ../inc/team.inc:234 ../inc/team.inc:236 ../inc/team.inc:378
+#: ../inc/team.inc:383 ../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 "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 "交換區域"
 
-#: ../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/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 "未知"
 
-#: ../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
-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
-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
-msgid "While BOINC running, % of time work is allowed"
-msgstr "當 BONC 執行時,允許處理工作的時間比(%)"
+msgid "While is BOINC running, fraction of time GPU computing is allowed"
+msgstr "BOINC在執行時,允許GPU計算的時間比例"
 
 #: ../inc/host.inc:193
 msgid "Average CPU efficiency"
@@ -718,7 +862,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 "位置"
 
@@ -734,38 +878,38 @@ msgstr "合併此電腦的重覆記錄"
 msgid "Merge"
 msgstr "合併"
 
-#: ../inc/host.inc:207 ../inc/host.inc:689
+#: ../inc/host.inc:207 ../inc/host.inc:694
 msgid "Last contact"
-msgstr "最後的連接"
+msgstr "最後聯繫時間"
 
 #: ../inc/host.inc:220
 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:371
 #: ../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:111 ../inc/team.inc:230
+#: ../inc/team.inc:239 ../inc/team.inc:241 ../inc/team.inc:377
+#: ../inc/team.inc:382 ../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"
 
@@ -773,91 +917,83 @@ msgstr "GPU"
 msgid "Operating system"
 msgstr "作業系統"
 
-#: ../inc/host.inc:315
+#: ../inc/host.inc:320
 msgid "(%1 processors)"
-msgstr "(%1 處理器)"
+msgstr "(%1 核心)"
 
-#: ../inc/host.inc:335
+#: ../inc/host.inc:340
 msgid "Details"
 msgstr "細節"
 
-#: ../inc/host.inc:340
+#: ../inc/host.inc:345
 msgid "Cross-project stats:"
 msgstr "跨專案的統計訊息:"
 
-#: ../inc/host.inc:515
+#: ../inc/host.inc:520
 msgid "Host %1 has overlapping lifetime:"
 msgstr "主機 %1 的活躍期有重疊:"
 
-#: ../inc/host.inc:522
+#: ../inc/host.inc:527
 msgid "Host %1 has an incompatible OS:"
 msgstr "主機 %1 的作業系統不相容"
 
-#: ../inc/host.inc:528
+#: ../inc/host.inc:533
 msgid "Host %1 has an incompatible CPU:"
 msgstr "主機 %1 的 CPU 不相容"
 
-#: ../inc/host.inc:595
+#: ../inc/host.inc:600
 msgid "same host"
 msgstr "相同的主機"
 
-#: ../inc/host.inc:598
+#: ../inc/host.inc:603
 msgid "Can't merge host %1 into %2 - they're incompatible"
 msgstr "無法將主機 %1 合併到主機%2 - 主機不相容"
 
-#: ../inc/host.inc:601
+#: ../inc/host.inc:606
 msgid "Merging host %1 into host %2"
 msgstr "正在將主機 %1 合併到主機 %2"
 
-#: ../inc/host.inc:618
+#: ../inc/host.inc:623
 msgid "Couldn't update credit of new computer"
 msgstr "無法從新電腦更新積分"
 
-#: ../inc/host.inc:622
+#: ../inc/host.inc:627
 msgid "Couldn't update results"
 msgstr "無法上傳任務"
 
-#: ../inc/host.inc:627
+#: ../inc/host.inc:632
 msgid "Couldn't retire old computer"
 msgstr "無法移除舊電腦"
 
-#: ../inc/host.inc:629
+#: ../inc/host.inc:634
 msgid "Retired old computer %1"
 msgstr "已移除舊電腦 %1"
 
-#: ../inc/host.inc:652 ../inc/host.inc:655
+#: ../inc/host.inc:657 ../inc/host.inc:660
 msgid "Show:"
 msgstr "顯示:"
 
-#: ../inc/host.inc:652 ../inc/host.inc:655
+#: ../inc/host.inc:657 ../inc/host.inc:660
 msgid "All computers"
 msgstr "所有電腦"
 
-#: ../inc/host.inc:652 ../inc/host.inc:655
+#: ../inc/host.inc:657 ../inc/host.inc:660
 msgid "Only computers active in past 30 days"
-msgstr "只顯示過去 30 天內活躍的電腦"
+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 "瀏覽器預設值"
 
@@ -868,31 +1004,31 @@ msgstr "意見"
 #: ../inc/news.inc:111
 #, php-format
 msgid "News is available as an %sRSS feed%s"
-msgstr "新聞還可以透過 %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 "訊息不存在"
 
@@ -904,7 +1040,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 "標題"
 
@@ -912,373 +1048,505 @@ msgstr "標題"
 msgid "Send message"
 msgstr "傳送訊息"
 
-#: ../inc/pm.inc:121
+#: ../inc/pm.inc:122
 msgid "sent you a private message; subject:"
 msgstr "給你發送了一條私人訊息,標題:"
 
-#: ../inc/pm.inc:127
+#: ../inc/pm.inc:129
 msgid "Private message%1 from %2, subject:"
 msgstr "私人訊息 %1 來自 %2,標題:"
 
-#: ../inc/pm.inc:135
+#: ../inc/pm.inc:137
 msgid "Couldn't create message"
 msgstr "無法建立訊息"
 
-#: ../inc/pm.inc:166
+#: ../inc/pm.inc:168
 msgid ""
 "You are not allowed to send privates messages so often. Please wait some "
 "time before sending more messages."
 msgstr "你傳送訊息的間隔時間太短,請等待一段時間再發送更多的訊息。"
 
-#: ../inc/pm.inc:176 ../user/forum_forum.php:186
+#: ../inc/pm.inc:178 ../user/forum_forum.php:190
 msgid "unread"
 msgstr "未讀"
 
-#: ../inc/pm.inc:186
+#: ../inc/pm.inc:188
 msgid "For email notification, %1edit community prefs%2"
 msgstr "如需要電子郵件通知,請 %1 編輯社區偏好設定 %2。"
 
-#: ../inc/pm.inc:198
+#: ../inc/pm.inc:204
 msgid "Private message"
 msgstr "私人訊息"
 
-#: ../inc/prefs.inc:77
+#: ../inc/prefs.inc:45 ../inc/prefs.inc:187
+msgid "Usage limits"
+msgstr "使用限制"
+
+#: ../inc/prefs.inc:47 ../inc/prefs.inc:55
+msgid "Use at most"
+msgstr "最多只使用"
+
+#: ../inc/prefs.inc:49
+#, no-php-format
 msgid ""
-"Suspend work while computer is on battery power? %1 Matters only for "
-"portable computers %2"
-msgstr "當電腦透過電池供電時暫停運算? %1只有筆記型電腦需要設定%2"
+"Keep some CPUs free for other applications. Example: 75% means use 6 cores "
+"on an 8-core CPU."
+msgstr "保留CPU給其他程式使用。例如: 75% 表示在 8 核心系統中使用 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 "% 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 在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 秒,並重複循環。"
 
-#: ../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 佔用率高於指定值則暫止運算%10 表示不限制<br>6.10.30 之後的版本有了此設定%2"
+"Check this to suspend computing on portables when running on battery power."
+msgstr "當筆記型電腦使用電池時暫停運算。"
 
-#: ../inc/prefs.inc:122
-msgid "Do work only between the hours of %1 No restriction if equal %2"
-msgstr "運算時間段%1如果相同則表示不限制%2"
+#: ../inc/prefs.inc:70
+msgid "Suspend when computer is in use"
+msgstr "當電腦使用時暫停"
 
-#: ../inc/prefs.inc:130
+#: ../inc/prefs.inc:71
 msgid ""
-"Leave tasks in memory while suspended? %1 Suspended tasks will consume swap "
-"space if 'yes' %2"
-msgstr "暫止運算時將任務留在記憶體? %1選擇是的話,暫止的記憶體將佔用交換空間%2"
+"Check this to suspend computing and file transfers when you're using the "
+"computer."
+msgstr "當您正在使用電腦時暫停運算及檔案傳輸。"
 
-#: ../inc/prefs.inc:139
-msgid "Switch between tasks every %1 Recommended: 60 minutes %2"
-msgstr "運算任務的切換時間間隔%1推薦設定:60 分鐘%2"
+#: ../inc/prefs.inc:76
+msgid "Suspend GPU computing when computer is in use"
+msgstr "當電腦使用時暫停GPU運算"
 
-#: ../inc/prefs.inc:147
-msgid "On multiprocessors, use at most"
-msgstr "在多核心的電腦上,最多使用"
+#: ../inc/prefs.inc:77
+msgid "Check this to suspend GPU computing when you're using the computer."
+msgstr "當您正在使電腦時暫停GPU運算。"
 
-#: ../inc/prefs.inc:149
-msgid "processors"
-msgstr "處理器"
+#: ../inc/prefs.inc:82
+msgid "'In use' means mouse/keyboard input in last"
+msgstr "'使用中'代表滑鼠/鍵盤仍有操作"
 
-#: ../inc/prefs.inc:153
-msgid "On multiprocessors, use at most %1 Enforced by version 6.1+ %2"
-msgstr "在多核心的電腦上,最多使用%16.1 之後的版本有了此設定%2"
+#: ../inc/prefs.inc:83
+msgid "This determines when the computer is considered 'in use'."
+msgstr "用於判斷電腦是否於'使用中'。"
 
-#: ../inc/prefs.inc:158
-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
-msgid "% of CPU time"
-msgstr "% 的處理器時間"
+#: ../inc/prefs.inc:90
+msgid "This allows some computers to enter low-power mode when not in use."
+msgstr "這將使得一些計算機在不使用時進入低功耗模式。"
 
-#: ../inc/prefs.inc:175 ../inc/prefs.inc:189
-msgid "Disk: use at most"
-msgstr "硬碟:最多使用"
+#: ../inc/prefs.inc:95
+msgid "Suspend when non-BOINC CPU usage is above"
+msgstr "暫停當非 BOINC 的 CPU 使用率高於"
 
-#: ../inc/prefs.inc:177 ../inc/prefs.inc:186
-msgid "GB"
-msgstr "GB"
+#: ../inc/prefs.inc:96
+msgid "Suspend computing when your computer is busy running other programs."
+msgstr "當電腦正忙於其他程式時暫停運算。"
 
-#: ../inc/prefs.inc:180
-msgid "Disk: leave free at least %1 Values smaller than %2 are ignored %3"
-msgstr "硬碟:至少保留%1小於%2 的設定值將被忽略%3"
+#: ../inc/prefs.inc:101
+msgid "Compute only between"
+msgstr "運算只從"
 
-#: ../inc/prefs.inc:191 ../inc/prefs.inc:201 ../inc/prefs.inc:206
-#: ../inc/prefs.inc:211
-msgid "% of total"
-msgstr "%"
+#: ../inc/prefs.inc:102
+msgid "Compute only during a particular period each day."
+msgstr "僅在每天特定時段運算。"
 
-#: ../inc/prefs.inc:194
-msgid "Tasks checkpoint to disk at most every"
-msgstr "運算任務最小的硬碟時間間隔"
+#: ../inc/prefs.inc:105 ../inc/prefs.inc:214
+#: ../user/forum_banishment_vote.php:70
+#: ../user/forum_banishment_vote_action.php:65
+#: ../user/forum_moderate_post.php:63 ../user/forum_moderate_thread.php:61
+msgid "Other"
+msgstr "其他"
 
-#: ../inc/prefs.inc:196
-msgid "seconds"
-msgstr "秒"
+#: ../inc/prefs.inc:107
+msgid "Store at least"
+msgstr "儲存至少"
 
-#: ../inc/prefs.inc:199
-msgid "Swap space: use at most"
-msgstr "交換空間:最多使用"
+#: ../inc/prefs.inc:108
+msgid "Store at least enough tasks to keep the computer busy for this long."
+msgstr "預先下載足夠的任務以保持電腦持續運算。"
 
-#: ../inc/prefs.inc:204
-msgid "Memory: when computer is in use, use at most"
-msgstr "記憶體:如果電腦正在使用,最多使用"
+#: ../inc/prefs.inc:110 ../inc/prefs.inc:116
+msgid "days of work"
+msgstr "天的任務"
 
-#: ../inc/prefs.inc:209
-msgid "Memory: when computer is not in use, use at most"
-msgstr "記憶體:如果電腦未使用,最多使用"
+#: ../inc/prefs.inc:113
+msgid "Store up to an additional"
+msgstr "儲存多於"
 
-#: ../inc/prefs.inc:218
-msgid "Maintain enough tasks to keep busy for at least%1(max 10 days).%2"
-msgstr "維持至少%1工作 (最大10天)。%2"
+#: ../inc/prefs.inc:114
+msgid ""
+"Store additional tasks above the minimum level.  Determines how much work is"
+" requested when contacting a project."
+msgstr "儲存高於設定最小值的任務。用於判斷每次聯繫專案取得任務的多寡。"
 
-#: ../inc/prefs.inc:223 ../inc/prefs.inc:228 ../inc/prefs.inc:270
-#: ../inc/util.inc:274
-msgid "days"
-msgstr "天"
+#: ../inc/prefs.inc:119
+msgid "Switch between tasks about every"
+msgstr "切換任務每"
 
-#: ../inc/prefs.inc:226
-msgid "... and up to an additional"
-msgstr "...和額外最多"
+#: ../inc/prefs.inc:120
+msgid "If you run several projects, BOINC may switch between them this often."
+msgstr "如果您有參與許多專案,BOINC 可能會切換執行。"
 
-#: ../inc/prefs.inc:232
-msgid ""
-"Confirm before connecting to Internet? %1 Matters only if you have a modem, "
-"ISDN or VPN connection %2"
-msgstr "連線到網路前要求用戶確認? %1僅 Modem、ISDN 和 VPN 用戶需要使用此設定%2"
+#: ../inc/prefs.inc:125
+msgid "Request tasks to checkpoint at most every"
+msgstr "要求任務最多每"
 
-#: ../inc/prefs.inc:241
+#: ../inc/prefs.inc:126
 msgid ""
-"Disconnect when done? %1 Matters only if you have a modem, ISDN or VPN "
-"connection %2"
-msgstr "傳輸完成時斷線? %1僅 Modem、ISDN 和 VPN 用戶需要使用此設定%2"
+"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 "KB/s"
+#: ../inc/prefs.inc:128
+msgid "seconds"
+msgstr "秒"
 
-#: ../inc/prefs.inc:254
-msgid "Maximum upload rate:"
-msgstr "最快上傳速度:"
+#: ../inc/prefs.inc:136 ../inc/prefs.inc:148
+msgid "Use no more than"
+msgstr "使用不會超過"
 
-#: ../inc/prefs.inc:259
-msgid "Use network only between the hours of"
-msgstr "允許使用網路的時間"
+#: ../inc/prefs.inc:137
+msgid "Limit the total amount of disk space used by BOINC."
+msgstr "限制 BOINC 使用硬碟空間。"
 
-#: ../inc/prefs.inc:263
-msgid "Transfer at most %1 Enforced by version 6.10.46+ %2"
-msgstr "最多傳輸%16.10.46 之後的版本有了此設定%2"
+#: ../inc/prefs.inc:139
+msgid "GB"
+msgstr "GB"
 
-#: ../inc/prefs.inc:269
-msgid "Mbytes every"
-msgstr "MB/每"
+#: ../inc/prefs.inc:142
+msgid "Leave at least"
+msgstr "留下至少"
 
-#: ../inc/prefs.inc:274
+#: ../inc/prefs.inc:143
 msgid ""
-"Skip image file verification? %1 Check this ONLY if your Internet provider "
-"modifies image files (UMTS does this, for example). %2 Skipping verification"
-" reduces the security of BOINC. %3"
-msgstr "跳過映像文件驗證? %1僅在你的 ISP 會修改映像文件的情況下(比如 UMTS 就會這樣)需要選中這個。 %2跳過驗證會影響 BOINC 的安全性。 %3"
+"Limit disk usage to leave this much free space on the volume where BOINC "
+"stores data."
+msgstr "限制 BOINC 儲存資料並保留可用空間。"
+
+#: ../inc/prefs.inc:145
+msgid "GB free"
+msgstr "GB 的空間"
 
-#: ../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 "資源分享%1此設定決定你的電腦分配給本專案的資源比例。舉例:你參加了兩個專案,其資源分享率分別是100 和200,則第一個專案將得到 1/3 的運算資源,第二個專案將得到 2/3。 %2"
+"Limit the percentage of disk space used by BOINC on the volume where it "
+"stores data."
+msgstr "限制 BOINC 儲存資料所佔用硬碟空間百分比。"
 
-#: ../inc/prefs.inc:298
-msgid "Accelerate GPU tasks by dedicating a CPU to each one?"
-msgstr "給每個 GPU 任務保留一個 CPU 內核?"
+#: ../inc/prefs.inc:152
+#, no-php-format
+msgid "% of total"
+msgstr "%"
 
-#: ../inc/prefs.inc:308
-msgid "Use CPU %1 Enforced by version 6.10+ %2"
-msgstr "使用 CPU%16.10 之後的版本有了此設定%2"
+#: ../inc/prefs.inc:158
+msgid "When computer is in use, use at most"
+msgstr "當電腦使用時,最多占用"
+
+#: ../inc/prefs.inc:159
+msgid "Limit the memory used by BOINC when you're using the computer."
+msgstr "當您使用電腦時限制 BOINC 記憶體使用量。"
 
-#: ../inc/prefs.inc:320
-msgid "Use ATI GPU %1 Enforced by version 6.10+ %2"
-msgstr "使用 ATI GPU%16.10 之後的版本有了此設定%2"
+#: ../inc/prefs.inc:162 ../inc/prefs.inc:169 ../inc/prefs.inc:182
+#, no-php-format
+msgid "%"
+msgstr "%"
 
-#: ../inc/prefs.inc:332
-msgid "Use NVIDIA GPU %1 Enforced by version 6.10+ %2"
-msgstr "使用 NVIDIA GPU%16.10 之後的版本有了此設定%2"
+#: ../inc/prefs.inc:165
+msgid "When computer is not in use, use at most"
+msgstr "當電腦閒置時,最多占用"
 
-#: ../inc/prefs.inc:344
-msgid "Use Intel GPU %1 Enforced by version 7.2+ %2"
-msgstr "使用 Intel GPU%17.2 之後的版本有了此設定%2"
+#: ../inc/prefs.inc:166
+msgid "Limit the memory used by BOINC when you're not using the computer."
+msgstr "限制電腦閒置時 BOINC 記憶體使用量。"
 
-#: ../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: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 "電子郵件將從 %1 發送,請確保您的垃圾郵件過濾器不會過濾這個地址。"
+"If checked, suspended tasks stay in memory, and resume with no work lost. If"
+" unchecked, suspended tasks are removed from memory, and resume from their "
+"last checkpoint."
+msgstr "勾選後暫停時將保留任務於記憶體中,並不會遺失進度。非勾選則暫停時將會從記憶體消除,只保留進度到最新的檢查點。"
 
-#: ../inc/prefs.inc:374
-msgid "Is it OK for %1 and your team (if any) to email you?"
-msgstr "是否允許 %1 和您所在的團隊傳送電子郵件給您?"
+#: ../inc/prefs.inc:178
+msgid "Page/swap file: use at most"
+msgstr "分頁/交換檔:最多使用"
 
-#: ../inc/prefs.inc:380
-msgid "Should %1 show your computers on its web site?"
-msgstr "%1 是否可以將您的電腦顯示在它的網站上?"
+#: ../inc/prefs.inc:179
+msgid "Limit the swap space (page file) used by BOINC."
+msgstr "限制 BOINC 使用的交換空間(分頁檔)"
 
-#: ../inc/prefs.inc:387
-msgid "Disk and memory usage"
-msgstr "硬碟和記憶體使用"
+#: ../inc/prefs.inc:189
+msgid "Limit download rate to"
+msgstr "限制下載速率"
 
-#: ../inc/prefs.inc:388
-msgid "Processor usage"
-msgstr "處理器使用"
+#: ../inc/prefs.inc:190
+msgid "Limit the download rate of file transfers."
+msgstr "限制檔案下載速率。"
 
-#: ../inc/prefs.inc:389
-msgid "Network usage"
-msgstr "網路使用"
+#: ../inc/prefs.inc:192 ../inc/prefs.inc:198
+msgid "KB/second"
+msgstr "Kb/s"
 
-#: ../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: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:812 ../user/explain_state.php:94
+#: ../inc/prefs.inc:235 ../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 "網路"
+
+#. These texts are used in multiple places in prefs_edit.php and add_venue.php
+#: ../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:472
+msgid "computing"
+msgstr "計算中"
+
+#: ../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)"
-msgstr "(切換視圖)"
+#: ../inc/prefs.inc:506
+msgid "These settings apply to all computers using this account except"
+msgstr "這些設定適用於所有使用此帳戶的計算機,除非"
 
-#: ../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 "計算機設定了本地BOINC管理器的首選項"
+
+#: ../inc/prefs.inc:510
+msgid "Android devices"
+msgstr "Android裝置"
+
+#: ../inc/prefs.inc:513
+msgid "(Switch view)"
+msgstr "(切換顯示)"
+
+#: ../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 "這些偏好設定不適用於 Android 裝置。"
-
-#: ../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
-msgid "Default computer location"
-msgstr "預設的電腦位置"
+#: ../inc/prefs.inc:628 ../project.sample/project_specific_prefs.inc:84
+#: ../project.sample/project_specific_prefs.inc:224
+msgid "yes"
+msgstr "是"
+
+#: ../inc/prefs.inc:630 ../project.sample/project_specific_prefs.inc:86
+#: ../project.sample/project_specific_prefs.inc:224
+msgid "no"
+msgstr "否"
+
+#. TODO: make this a subclass of PREF
+#: ../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_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,則第一個專案將得到 1/3 的計算資源,第二個專案將得到 2/3。"
+
+#: ../inc/prefs_project.inc:61
+msgid "Accelerate GPU tasks by dedicating a CPU to each one?"
+msgstr "給每個 GPU 任務保留一個 CPU 內核?"
+
+#: ../inc/prefs_project.inc:70
+msgid "Use CPU"
+msgstr "使用CPU"
+
+#: ../inc/prefs_project.inc:79
+msgid "Use ATI GPU"
+msgstr "使用ATI GPU"
+
+#: ../inc/prefs_project.inc:88
+msgid "Use NVIDIA GPU"
+msgstr "使用NVIDIA GPU"
+
+#: ../inc/prefs_project.inc:97
+msgid "Use Intel GPU"
+msgstr "使用Intel GPU"
+
+#: ../inc/prefs_project.inc:107
+msgid "Run test applications?"
+msgstr "允許執行測試版程式?"
+
+#: ../inc/prefs_project.inc:108
+msgid ""
+"This helps us develop applications, but may cause jobs to fail on your "
+"computer"
+msgstr "這能幫助我們開發程式,但可能造成您電腦上的任務失敗"
+
+#: ../inc/prefs_project.inc:115
+msgid ""
+"Emails will be sent from %1; make sure your spam filter accepts this "
+"address."
+msgstr "電子郵件將從 %1 發送,請確保您的垃圾郵件過濾器不會過濾這個地址。"
+
+#: ../inc/prefs_project.inc:123
+msgid "Is it OK for %1 and your team (if any) to email you?"
+msgstr "是否允許 %1 和您所在的團隊傳送電子郵件給您?"
+
+#: ../inc/prefs_project.inc:130
+msgid "Should %1 show your computers on its web site?"
+msgstr "%1 是否可以將您的電腦顯示在它的網站上?"
+
+#: ../inc/prefs_project.inc:270
+msgid "(Switch View)"
+msgstr "(切換視圖)"
+
+#: ../inc/prefs_project.inc:276
+msgid "Project specific settings"
+msgstr "專案特定的偏好設定"
+
+#: ../inc/prefs_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 "和"
 
@@ -1294,7 +1562,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 "資料庫錯誤"
 
@@ -1312,7 +1580,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:317
 msgid "Edit your profile"
 msgstr "編輯您的用戶檔案"
 
@@ -1322,7 +1590,7 @@ 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"
@@ -1360,11 +1628,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:167
 msgid "In progress"
 msgstr "運算中"
 
@@ -1374,7 +1643,7 @@ msgstr "等待驗證中"
 
 #: ../inc/result.inc:117
 msgid "Validation inconclusive"
-msgstr "驗證尚無確定"
+msgstr "驗證待確定"
 
 #: ../inc/result.inc:118 ../inc/result.inc:268
 msgid "Valid"
@@ -1393,6 +1662,7 @@ msgid "Inactive"
 msgstr "不活躍的"
 
 #: ../inc/result.inc:175 ../inc/result.inc:222 ../user/explain_state.php:37
+#: ../user/server_status.php:167
 msgid "Unsent"
 msgstr "未傳送的"
 
@@ -1450,7 +1720,7 @@ msgstr "上傳過程錯誤"
 
 #: ../inc/result.inc:206 ../inc/result.inc:259
 msgid "Aborted by user"
-msgstr "被用戶中止"
+msgstr "被用戶停止"
 
 #: ../inc/result.inc:207 ../inc/result.inc:260
 msgid "Upload failed"
@@ -1557,127 +1827,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 ../user/result.php:36
 msgid "Task"
 msgstr "任務"
 
-#: ../inc/result.inc:360
+#: ../inc/result.inc:364
 msgid "Work unit"
 msgstr "任務單元"
 
-#: ../inc/result.inc:369
+#: ../inc/result.inc:373
 msgid "Computer"
 msgstr "電腦"
 
-#: ../inc/result.inc:372 ../inc/result.inc:631
+#: ../inc/result.inc:376 ../inc/result.inc:635
 msgid "Sent"
 msgstr "傳送時間"
 
-#: ../inc/result.inc:373
+#: ../inc/result.inc:377
 msgid "Time reported<br />or deadline"
 msgstr "上傳時間<br />或者上傳期限"
 
-#: ../inc/result.inc:374
+#: ../inc/result.inc:378
 msgid "explain"
 msgstr "說明"
 
-#: ../inc/result.inc:376 ../user/server_status.php:241
+#: ../inc/result.inc:380 ../user/server_status.php:113
 msgid "Status"
 msgstr "狀態"
 
-#: ../inc/result.inc:377
+#: ../inc/result.inc:381
 msgid "Run time<br />(sec)"
 msgstr "執行時間<br /> (秒)"
 
-#: ../inc/result.inc:378
+#: ../inc/result.inc:382
 msgid "CPU time<br />(sec)"
 msgstr "CPU 時間<br /> (秒)"
 
-#: ../inc/result.inc:379 ../inc/result.inc:642
+#: ../inc/result.inc:383 ../inc/result.inc:646
 msgid "Credit"
 msgstr "積分"
 
-#: ../inc/result.inc:380 ../inc/result.inc:724
+#: ../inc/result.inc:384 ../inc/result.inc:746 ../user/server_status.php:167
 msgid "Application"
 msgstr "程式"
 
-#: ../inc/result.inc:629
+#: ../inc/result.inc:633
 msgid "Workunit"
 msgstr "任務單元"
 
-#: ../inc/result.inc:632
+#: ../inc/result.inc:636
+msgid "Report deadline"
+msgstr "上傳期限"
+
+#: ../inc/result.inc:637
 msgid "Received"
 msgstr "接收時間"
 
-#: ../inc/result.inc:633
+#: ../inc/result.inc:638
 msgid "Server state"
 msgstr "伺服器狀態"
 
-#: ../inc/result.inc:634
+#: ../inc/result.inc:639
 msgid "Outcome"
 msgstr "結果"
 
-#: ../inc/result.inc:635
+#: ../inc/result.inc:640
 msgid "Client state"
 msgstr "客戶端狀態"
 
-#: ../inc/result.inc:636
+#: ../inc/result.inc:641
 msgid "Exit status"
 msgstr "離開狀態"
 
-#: ../inc/result.inc:638
-msgid "Report deadline"
-msgstr "上傳期限"
-
-#: ../inc/result.inc:639
+#: ../inc/result.inc:643
 msgid "Run time"
 msgstr "執行時間"
 
-#: ../inc/result.inc:640
+#: ../inc/result.inc:644
 msgid "CPU time"
 msgstr "CPU 時間"
 
-#: ../inc/result.inc:641
+#: ../inc/result.inc:645
 msgid "Validate state"
 msgstr "驗證狀態"
 
-#: ../inc/result.inc:643
+#: ../inc/result.inc:647
+msgid "Device peak FLOPS"
+msgstr "裝置的 FLOPS 峰值"
+
+#: ../inc/result.inc:648
 msgid "Application version"
 msgstr "程式版本"
 
-#: ../inc/result.inc:656
+#: ../inc/result.inc:673
 msgid "Output files"
 msgstr "檔案輸出"
 
-#: ../inc/result.inc:659
+#: ../inc/result.inc:676
 msgid "Stderr output"
 msgstr "標準錯誤輸出"
 
-#: ../inc/result.inc:706
+#: ../inc/result.inc:728
 msgid "State"
 msgstr "狀態"
 
-#: ../inc/result.inc:747
+#: ../inc/result.inc:769
 msgid "Task name:"
 msgstr "任務名稱:"
 
@@ -1693,17 +1971,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:473
 msgid "Type of team"
 msgstr "團隊類型"
 
@@ -1711,7 +1979,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 "搜尋"
 
@@ -1731,8 +1999,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:575 ../inc/user.inc:358
+#: ../inc/user.inc:449
 msgid "None"
 msgstr "未加入團隊"
 
@@ -1744,490 +2012,483 @@ msgstr "發起請求"
 msgid "Deferred"
 msgstr "延期處理中"
 
-#: ../inc/team.inc:87
+#: ../inc/team.inc:91
 msgid "Team info"
 msgstr "團隊訊息"
 
-#: ../inc/team.inc:89 ../user/team_forum.php:70 ../user/team_search.php:69
+#: ../inc/team.inc:93 ../user/team_forum.php:72 ../user/team_search.php:82
 msgid "Description"
 msgstr "描述"
 
-#: ../inc/team.inc:97
+#: ../inc/team.inc:106
 msgid "Web site"
 msgstr "網站"
 
-#: ../inc/team.inc:120
+#: ../inc/team.inc:132
 msgid "Cross-project stats"
 msgstr "跨專案的統計網站"
 
-#: ../inc/team.inc:123 ../inc/team.inc:374 ../user/team_search.php:71
+#: ../inc/team.inc:135 ../inc/team.inc:388 ../user/team_search.php:84
 msgid "Type"
 msgstr "類型"
 
-#: ../inc/team.inc:127 ../user/team_manage.php:63
+#: ../inc/team.inc:139 ../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:140 ../user/forum_forum.php:138 ../user/forum_index.php:98
 msgid "Threads"
 msgstr "主題"
 
-#: ../inc/team.inc:136
+#: ../inc/team.inc:148
 msgid "Join this team"
 msgstr "加入此團隊"
 
-#: ../inc/team.inc:137
+#: ../inc/team.inc:149
 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:152
 msgid "Not accepting new members"
 msgstr "不接受新成員加入"
 
-#: ../inc/team.inc:147
+#: ../inc/team.inc:159
 msgid "Foundership change requested"
 msgstr "創始人改變請求"
 
-#: ../inc/team.inc:148
+#: ../inc/team.inc:160
 msgid "Respond by %1"
 msgstr "回覆期限 %1"
 
-#: ../inc/team.inc:152
+#: ../inc/team.inc:164
 msgid "Team foundership change"
 msgstr "團隊創始人改變"
 
-#: ../inc/team.inc:156 ../inc/team.inc:359
+#: ../inc/team.inc:168 ../inc/team.inc:373
 msgid "Members"
 msgstr "成員"
 
-#: ../inc/team.inc:157 ../inc/team.inc:254
+#: ../inc/team.inc:169 ../inc/team.inc:268
 msgid "Founder"
 msgstr "創始人"
 
-#: ../inc/team.inc:169
+#: ../inc/team.inc:183
 msgid "Admins"
 msgstr "管理員"
 
-#: ../inc/team.inc:184
+#: ../inc/team.inc:198
 msgid "New members in last day"
 msgstr "昨天新加入的成員"
 
-#: ../inc/team.inc:185
+#: ../inc/team.inc:199
 msgid "Total members"
 msgstr "所有成員"
 
-#: ../inc/team.inc:185 ../inc/team.inc:186 ../inc/team.inc:187
+#: ../inc/team.inc:199 ../inc/team.inc:200 ../inc/team.inc:201
 msgid "view"
 msgstr "查看"
 
-#: ../inc/team.inc:186
+#: ../inc/team.inc:200
 msgid "Active members"
 msgstr "活躍的成員"
 
-#: ../inc/team.inc:187
+#: ../inc/team.inc:201
 msgid "Members with credit"
 msgstr "有積分的成員"
 
-#: ../inc/team.inc:256
+#: ../inc/team.inc:270
 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:291 ../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:295 ../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:303
 msgid "No such team."
 msgstr "沒有這個團隊。"
 
-#: ../inc/team.inc:302
+#: ../inc/team.inc:316
 msgid "This operation requires foundership."
 msgstr "本操作需要創始人權限。"
 
-#: ../inc/team.inc:326
+#: ../inc/team.inc:340
 msgid "This operation requires team admin privileges"
 msgstr "本操作需要團隊創始人的權限"
 
-#: ../inc/team.inc:422
+#: ../inc/team.inc:442
 msgid ""
 "WARNING: this is a BOINC-wide team. If you make changes here, they will soon"
 " be overwritten. Edit the %1BOINC-wide team%2 instead."
 msgstr "警告:這是一個 BOINC 自動建立的團隊,您在此處做出的修改將很快會被覆蓋,請直接在 %1這裡%2 進行編輯。"
 
-#: ../inc/team.inc:428
+#: ../inc/team.inc:448
 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:452
 msgid "Team name, text version"
 msgstr "團隊名稱,文字版本"
 
-#: ../inc/team.inc:433
+#: ../inc/team.inc:453
 msgid "Don't use HTML tags."
 msgstr "請不要使用 HTML 標籤。"
 
-#: ../inc/team.inc:436
+#: ../inc/team.inc:456
 msgid "Team name, HTML version"
 msgstr "團隊名稱,HTML 版本"
 
-#: ../inc/team.inc:438 ../inc/team.inc:448
+#: ../inc/team.inc:458 ../inc/team.inc:468
 msgid "You may use %1limited HTML tags%2."
 msgstr "您可以使用 %1有限的 HTML 標籤%2。"
 
-#: ../inc/team.inc:439
+#: ../inc/team.inc:459
 msgid "If you don't know HTML, leave this box blank."
 msgstr "如果您不了解 HTML,請保持本編輯框為空。"
 
-#: ../inc/team.inc:442
+#: ../inc/team.inc:462
 msgid "URL of team web page, if any"
 msgstr "團隊的網站 (如果有的話);"
 
-#: ../inc/team.inc:442
+#: ../inc/team.inc:462
 msgid "without \"http://\""
 msgstr "不含 “ http:// ”"
 
-#: ../inc/team.inc:443
+#: ../inc/team.inc:463
 msgid "This URL will be linked to from the team's page on this site."
 msgstr "這個網址將會從這個網頁連到團隊網站"
 
-#: ../inc/team.inc:446
+#: ../inc/team.inc:466
 msgid "Description of team"
 msgstr "團隊描述"
 
-#: ../inc/team.inc:462
+#: ../inc/team.inc:482
 msgid "Accept new members?"
 msgstr "是否接受新隊員加入?"
 
-#: ../inc/uotd.inc:28
+#: ../inc/uotd.inc:30
 msgid "User profile"
 msgstr "用戶檔案"
 
-#: ../inc/user.inc:119
+#: ../inc/user.inc:120
 msgid "Projects in which you are participating"
 msgstr "您已加入的專案"
 
-#: ../inc/user.inc:121
+#: ../inc/user.inc:122
 msgid "Projects in which %1 is participating"
 msgstr "%1 已加入的專案"
 
-#: ../inc/user.inc:125
+#: ../inc/user.inc:126
 msgid "Project"
 msgstr "專案"
 
-#: ../inc/user.inc:125
+#: ../inc/user.inc:126
 msgid "Click for user page"
 msgstr "點擊進入用戶頁面"
 
-#: ../inc/user.inc:125
+#: ../inc/user.inc:126
 msgid "Since"
 msgstr "加入日期"
 
-#: ../inc/user.inc:148
+#: ../inc/user.inc:151
 msgid "Computing and credit"
 msgstr "運算和積分"
 
-#: ../inc/user.inc:151
+#: ../inc/user.inc:154
 msgid "Computers on this account"
 msgstr "本帳號所屬的電腦"
 
-#: ../inc/user.inc:151 ../inc/user.inc:152 ../inc/user.inc:217
-#: ../inc/user.inc:243 ../inc/user.inc:329 ../inc/user.inc:402
-#: ../user/view_profile.php:64
+#: ../inc/user.inc:154 ../inc/user.inc:155 ../inc/user.inc:233
+#: ../inc/user.inc:312 ../inc/user.inc:407 ../inc/user.inc:482
+#: ../user/view_profile.php:66
 msgid "View"
 msgstr "查看"
 
-#: ../inc/user.inc:161
+#: ../inc/user.inc:164
 msgid "Cross-project ID"
 msgstr "跨專案辨識碼 (CPID)"
 
-#: ../inc/user.inc:162
+#: ../inc/user.inc:165
 msgid "Cross-project statistics"
 msgstr "跨專案的統計網站"
 
-#: ../inc/user.inc:163
+#: ../inc/user.inc:166
 msgid "Account"
 msgstr "帳號"
 
-#: ../inc/user.inc:165 ../inc/user.inc:281 ../inc/user.inc:369
-#: ../inc/user.inc:371 ../user/user_search.php:139
+#: ../inc/user.inc:168 ../inc/user.inc:358 ../inc/user.inc:447
+#: ../inc/user.inc:449 ../user/user_search.php:124
 msgid "Team"
 msgstr "團隊"
 
-#: ../inc/user.inc:167
+#: ../inc/user.inc:170
 msgid "Cross-project"
 msgstr "跨專案"
 
-#: ../inc/user.inc:168 ../user/bs_sample_index.php:54
+#: ../inc/user.inc:171
 msgid "Certificate"
 msgstr "證書"
 
-#: ../inc/user.inc:169
+#: ../inc/user.inc:172
 msgid "Stats on your cell phone"
 msgstr "用手機查看您的統計訊息"
 
-#: ../inc/user.inc:183
-msgid "Unknown notification type: %1"
-msgstr "未知的通知類型:%1"
-
-#: ../inc/user.inc:198
+#: ../inc/user.inc:197
 msgid "Account information"
 msgstr "帳號資訊"
 
-#: ../inc/user.inc:200 ../user/edit_passwd_form.php:45
-#: ../user/get_passwd.php:40 ../user/team_email_list.php:64
+#: ../inc/user.inc:206 ../user/get_passwd.php:31
+#: ../user/team_email_list.php:73
 msgid "Email address"
 msgstr "電子郵件地址"
 
-#: ../inc/user.inc:203 ../inc/user.inc:322
+#: ../inc/user.inc:210 ../inc/user.inc:400
 msgid "URL"
 msgstr "網址"
 
-#: ../inc/user.inc:206
+#: ../inc/user.inc:213
 msgid "Postal code"
 msgstr "郵遞區號"
 
-#: ../inc/user.inc:207 ../inc/user.inc:316
+#: ../inc/user.inc:214 ../inc/user.inc:394
 msgid "%1 member since"
 msgstr "加入 %1 的日期"
 
-#: ../inc/user.inc:209
+#. LDAP accounts can't change email or password
+#: ../inc/user.inc:219 ../inc/user.inc:223
 msgid "Change"
 msgstr "修改"
 
-#: ../inc/user.inc:209
+#: ../inc/user.inc:224
 msgid "email address"
 msgstr "電子郵件地址"
 
-#: ../inc/user.inc:210
+#: ../inc/user.inc:225
 msgid "password"
 msgstr "密碼"
 
-#: ../inc/user.inc:211
+#: ../inc/user.inc:226
 msgid "other account info"
 msgstr "其他帳號訊息"
 
-#: ../inc/user.inc:213 ../inc/user.inc:315
+#: ../inc/user.inc:229 ../inc/user.inc:393
 msgid "User ID"
 msgstr "用戶 ID"
 
-#: ../inc/user.inc:213
+#: ../inc/user.inc:229
 msgid "Used in community functions"
 msgstr "在社群功能中使用"
 
-#: ../inc/user.inc:216 ../user/weak_auth.php:25
+#: ../inc/user.inc:232 ../user/weak_auth.php:25
 msgid "Account keys"
 msgstr "帳號鑰匙"
 
-#: ../inc/user.inc:221
+#: ../inc/user.inc:237
 msgid "Preferences"
 msgstr "偏好設定"
 
-#: ../inc/user.inc:224
+#: ../inc/user.inc:240
 msgid "When and how BOINC uses your computer"
 msgstr "BOINC 何時如何用您的電腦?"
 
-#: ../inc/user.inc:225
+#: ../inc/user.inc:241
 msgid "Computing preferences"
 msgstr "運算偏好設定"
 
-#: ../inc/user.inc:228
+#: ../inc/user.inc:244
 msgid "Message boards and private messages"
 msgstr "留言板和私人訊息"
 
-#: ../inc/user.inc:229 ../user/edit_forum_preferences_form.php:31
+#: ../inc/user.inc:245 ../user/edit_forum_preferences_form.php:31
 msgid "Community preferences"
 msgstr "社群偏好設定"
 
-#: ../inc/user.inc:232
+#: ../inc/user.inc:248
 msgid "Preferences for this project"
 msgstr "本專案的偏好設定"
 
-#: ../inc/user.inc:233 ../user/prefs.php:29
+#: ../inc/user.inc:249 ../user/prefs.php:30
 msgid "%1 preferences"
 msgstr "%1 偏好設定"
 
-#: ../inc/user.inc:239 ../user/bs_sample_index.php:59
-#: ../user/sample_index.php:125
+#: ../inc/user.inc:266
+msgid "View the profile of %1"
+msgstr "查看 %1 的用戶檔案"
+
+#: ../inc/user.inc:267 ../inc/user.inc:316 ../inc/user.inc:482
+msgid "Profile"
+msgstr "用戶檔案"
+
+#: ../inc/user.inc:307 ../user/sample_index.php:114
 msgid "Community"
 msgstr "社群"
 
-#: ../inc/user.inc:243 ../user/pm.php:107 ../user/pm.php:147
-msgid "Delete"
-msgstr "刪除"
-
-#: ../inc/user.inc:245
+#: ../inc/user.inc:314
 msgid "Create"
 msgstr "建立"
 
-#: ../inc/user.inc:247 ../inc/user.inc:402 ../inc/util.inc:514
-msgid "Profile"
-msgstr "用戶檔案"
-
-#: ../inc/user.inc:250 ../inc/user.inc:375
+#: ../inc/user.inc:321 ../inc/user.inc:454
 msgid "%1 posts"
 msgstr "%1 個文章"
 
-#: ../inc/user.inc:262 ../user/edit_forum_preferences_form.php:51
+#. ------------ Notification -----------
+#: ../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:157
 msgid "Computers"
 msgstr "電腦"
 
-#: ../inc/user.inc:338
+#: ../inc/user.inc:415
 msgid "Donor"
 msgstr "贊助者"
 
-#: ../inc/user.inc:378
+#: ../inc/user.inc:458
 msgid "Contact"
 msgstr "聯繫"
 
-#: ../inc/user.inc:381
+#: ../inc/user.inc:461
 msgid "This person is a friend"
 msgstr "這是一位好友"
 
-#: ../inc/user.inc:382 ../user/friend.php:238
+#: ../inc/user.inc:462 ../user/friend.php:240
 msgid "Cancel friendship"
 msgstr "刪除此好友"
 
-#: ../inc/user.inc:385 ../user/friend.php:37
+#: ../inc/user.inc:465 ../user/friend.php:39
 msgid "Request pending"
 msgstr "請求待處理"
 
-#: ../inc/user.inc:387
+#: ../inc/user.inc:467
 msgid "Add as friend"
 msgstr "新增為好友"
 
-#: ../inc/user.inc:446
+#: ../inc/user.inc:526
 msgid "user name cannot have leading or trailing white space"
 msgstr "使用者名稱前後不能使用空白建"
 
-#: ../inc/user.inc:450
+#: ../inc/user.inc:530
 msgid "user name must be nonempty"
 msgstr "使用者名稱不能留白"
 
-#: ../inc/user.inc:454
+#: ../inc/user.inc:534
 msgid "user name may not contain HTML tags"
 msgstr "使用者名稱不能包含HTML標籤"
 
-#: ../inc/util.inc:131
+#: ../inc/util.inc:161
 msgid "log out"
 msgstr "登出"
 
-#: ../inc/util.inc:133
+#: ../inc/util.inc:163
 msgid "log in"
 msgstr "登入"
 
-#: ../inc/util.inc:204 ../user/login_form.php:30 ../user/login_form.php:66
-msgid "Log in"
-msgstr "登入"
-
-#: ../inc/util.inc:205 ../user/create_account_form.php:40
+#: ../inc/util.inc:239 ../user/create_account_form.php:41
 msgid "Create an account"
 msgstr "建立一個帳號"
 
-#: ../inc/util.inc:206
+#: ../inc/util.inc:240
 msgid "Server status page"
 msgstr "伺服器狀態頁"
 
-#: ../inc/util.inc:248
+#: ../inc/util.inc:277
 msgid ""
 "A database error occurred while handling your request; please try again "
 "later."
 msgstr "資料庫在處理你的請求過程中發生一次資料庫錯誤,請稍後重試。"
 
-#: ../inc/util.inc:257
+#: ../inc/util.inc:286
 msgid "Unable to handle request"
 msgstr "無法處理請求"
 
-#: ../inc/util.inc:277
+#: ../inc/util.inc:306
 msgid "hours"
 msgstr "小時"
 
-#: ../inc/util.inc:280
+#: ../inc/util.inc:309
 msgid "min"
 msgstr "分鐘"
 
-#: ../inc/util.inc:283
+#: ../inc/util.inc:312
 msgid "sec"
 msgstr "秒"
 
-#: ../inc/util.inc:444
+#: ../inc/util.inc:473
 msgid ""
 "Link has timed out. Please click Back, refresh the page, and try again."
 msgstr "連線已超時,請點擊返回並刷新頁面後再重試。"
 
-#: ../inc/util.inc:513
-msgid "View the profile of %1"
-msgstr "查看 %1 的用戶檔案"
-
-#: ../inc/util.inc:569
+#: ../inc/util.inc:552
 msgid "Use BBCode tags to format your text"
 msgstr "用 BBCode 代碼來格式化您的文字"
 
-#: ../inc/util.inc:796
+#: ../inc/util.inc:779
 msgid "Project down for maintenance"
 msgstr "專案已停止維護"
 
-#: ../inc/util.inc:799
+#: ../inc/util.inc:782
 msgid "%1 is temporarily shut down for maintenance.  Please try again later."
 msgstr "%1 已經臨時關閉並進行維護工作,請稍候再重試。"
 
-#: ../inc/util.inc:817
+#: ../inc/util.inc:800
 msgid "Unable to connect to database - please try again later"
 msgstr "無法連接資料庫 - 請稍候重試"
 
-#: ../inc/util.inc:821
+#: ../inc/util.inc:804
 msgid "Unable to select database - please try again later"
 msgstr "無法選擇資料庫 - 請稍候重試"
 
-#: ../inc/util_ops.inc:109 ../user/get_passwd.php:72
+#: ../inc/util.inc:976
+msgid "characters remaining"
+msgstr "剩餘字符數"
+
+#: ../inc/util_ops.inc:115 ../user/get_passwd.php:72
 msgid "Stay logged in on this computer"
 msgstr "保持這台電腦的登入狀態"
 
@@ -2235,22 +2496,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 "您必須為您的帳號取一個名字"
@@ -2259,34 +2504,38 @@ msgstr "您必須為您的帳號取一個名字"
 msgid "HTML tags not allowed in name"
 msgstr "名字中不允許使用 HTML 語法"
 
-#: ../user/add_venue.php:81
+#: ../user/add_venue.php:40 ../user/add_venue.php:64 ../user/prefs_edit.php:41
+#: ../user/prefs_edit.php:65 ../user/prefs_edit.php:93
+msgid "Edit %1 preferences"
+msgstr "編輯 %1 的偏好設定"
+
+#: ../user/add_venue.php:82
 msgid "Add %1 preferences for %2"
 msgstr "增加 %1 偏好設定(用於 %2)"
 
-#: ../user/apps.php:32 ../user/bs_sample_index.php:55
-#: ../user/sample_index.php:120
+#: ../user/apps.php:31 ../user/sample_index.php:104
 msgid "Applications"
 msgstr "程式"
 
-#: ../user/apps.php:33
+#: ../user/apps.php:32
 msgid ""
 "%1 currently has the following applications. When you participate in %1, "
-"work for one or more of these applications will be assigned to your "
+"tasks for one or more of these applications will be assigned to your "
 "computer. The current version of the application will be downloaded to your "
 "computer. This happens automatically; you don't have to do anything."
-msgstr "%1 目前有下列程式。當您參與 %1 專案時,適用於這些程式的任務將會分發給您的電腦。最新版本的程式也會下載到您的電腦上。這一切都是自動的,您不需要做任何操作。"
+msgstr "%1 專案目前有如下幾個計算程式。當你參與 %1 專案時,適用於這些計算程式的任務包將會分發給你的計算機。當前版本的計算程式也會下載到你的計算機上。這一切都是自動的,你不需要做任何操作。"
 
-#: ../user/apps.php:50
+#: ../user/apps.php:54
 msgid "Platform"
 msgstr "平台"
 
-#: ../user/apps.php:51
+#: ../user/apps.php:55
 msgid "Version"
 msgstr "版本"
 
-#: ../user/apps.php:52
-msgid "Installation time"
-msgstr "發佈時間"
+#: ../user/apps.php:57
+msgid "Average computing"
+msgstr "平均運算"
 
 #: ../user/bbcode.php:23
 msgid "BBCode tags"
@@ -2317,153 +2566,79 @@ msgid "Underline"
 msgstr "底線"
 
 #: ../user/bbcode.php:35
+msgid "Strikethrough"
+msgstr "刪除線"
+
+#: ../user/bbcode.php:36
 msgid "Superscript"
 msgstr "上標"
 
-#: ../user/bbcode.php:36
+#: ../user/bbcode.php:37
 msgid "Big text"
 msgstr "大字體"
 
-#: ../user/bbcode.php:37
+#: ../user/bbcode.php:38
 msgid "Red text"
 msgstr "紅字"
 
-#: ../user/bbcode.php:38
+#: ../user/bbcode.php:39
 msgid "link to website"
 msgstr "超連結到網站"
 
-#: ../user/bbcode.php:39
+#: ../user/bbcode.php:40
 msgid "Quoted text"
 msgstr "引用文"
 
-#: ../user/bbcode.php:39
+#: ../user/bbcode.php:40
 msgid "use for quoted blocks of text"
 msgstr "用於文字塊的引用"
 
-#: ../user/bbcode.php:40
+#: ../user/bbcode.php:41
 msgid "use to display an image"
 msgstr "用於顯示一張圖片"
 
-#: ../user/bbcode.php:41
+#: ../user/bbcode.php:42
 msgid "Code snippet here"
 msgstr "這是代碼片段"
 
-#: ../user/bbcode.php:41
+#: ../user/bbcode.php:42
 msgid "use to display some code"
 msgstr "用於顯示一些代碼"
 
-#: ../user/bbcode.php:42
+#: ../user/bbcode.php:43
 msgid "Pre-formatted text"
 msgstr "預設文字"
 
-#: ../user/bbcode.php:42
+#: ../user/bbcode.php:43
 msgid "use to display pre-formatted (usually monospaced) text"
 msgstr "用於顯示預設文字(一般是等寬字體)"
 
-#: ../user/bbcode.php:43
+#: ../user/bbcode.php:44
 msgid "Item 1"
-msgstr "項目1"
+msgstr "專案1"
 
-#: ../user/bbcode.php:43
+#: ../user/bbcode.php:44
 msgid "Item2"
-msgstr "項目2"
+msgstr "專案2"
 
-#: ../user/bbcode.php:43
+#: ../user/bbcode.php:44
 msgid "Item 2"
-msgstr "項目2"
+msgstr "專案2"
 
-#: ../user/bbcode.php:45
+#: ../user/bbcode.php:46
 msgid "use to link to Trac ticket on BOINC website"
 msgstr "用於連接到 BOINC 網站上的 Trac 傳票"
 
-#: ../user/bbcode.php:47
+#: ../user/bbcode.php:48
 msgid "use to link to Trac Wiki on BOINC website"
 msgstr "用於連接到 BOINC 網站上的 Trac 維基"
 
-#: ../user/bbcode.php:49
-msgid "use to link to SVN changeset on BOINC website"
-msgstr "用於連接到 BOINC 網站上的 SVN 修改集"
-
-#: ../user/bbcode.php:53
+#: ../user/bbcode.php:52
 msgid ""
 "If you don't close a tag or don't specify a parameter correctly,\n"
 "the raw tag itself will display instead of the formatted text."
 msgstr "如果你沒有正確的關閉語法或者指定參數,\n語法自身將被顯示出來,而不是預設的文字。"
 
-#: ../user/bs_sample_index.php:44
-msgid "Participants"
-msgstr "參與者"
-
-#: ../user/bs_sample_index.php:46
-msgid "Do work"
-msgstr "執行運算"
-
-#: ../user/bs_sample_index.php:47 ../user/bs_sample_index.php:50
-#: ../user/home.php:49 ../project.sample/project.inc:43
-msgid "Your account"
-msgstr "您的帳號"
-
-#: ../user/bs_sample_index.php:47 ../user/bs_sample_index.php:50
-msgid "view stats, modify preferences"
-msgstr "查看統計資料,修改偏好設定"
-
-#: ../user/bs_sample_index.php:48 ../user/bs_sample_index.php:53
-#: ../user/team.php:25
-msgid "Teams"
-msgstr "團隊"
-
-#: ../user/bs_sample_index.php:48 ../user/bs_sample_index.php:53
-msgid "create or join a team"
-msgstr "建立或加入一個團隊"
-
-#: ../user/bs_sample_index.php:51 ../user/sample_index.php:191
-msgid "User of the day"
-msgstr "今日用戶"
-
-#: ../user/bs_sample_index.php:52 ../user/server_status.php:239
-msgid "Server status"
-msgstr "伺服器狀態"
-
-#: ../user/bs_sample_index.php:60 ../user/profile_menu.php:32
-#: ../user/sample_index.php:127
-msgid "Profiles"
-msgstr "用戶檔案"
-
-#: ../user/bs_sample_index.php:61
-msgid "User search"
-msgstr "搜尋使用者"
-
-#: ../user/bs_sample_index.php:64
-msgid "Statistics"
-msgstr "統計"
-
-#: ../user/bs_sample_index.php:65 ../user/stats.php:30
-#: ../user/top_users.php:116
-msgid "Top participants"
-msgstr "用戶排名"
-
-#: ../user/bs_sample_index.php:66 ../user/stats.php:31
-msgid "Top computers"
-msgstr "電腦排名"
-
-#: ../user/bs_sample_index.php:67 ../user/stats.php:32 ../user/team.php:46
-msgid "Top teams"
-msgstr "團隊排名"
-
-#: ../user/bs_sample_index.php:68 ../user/gpu_list.php:182
-#: ../user/stats.php:33
-msgid "Top GPU models"
-msgstr "GPU 型號排名"
-
-#: ../user/bs_sample_index.php:70
-msgid "Languages"
-msgstr "語言"
-
-#: ../user/bs_sample_index.php:149 ../user/info.php:24
-#: ../user/sample_index.php:79
-msgid "Read our rules and policies"
-msgstr "閱讀規定和政策"
-
 #: ../user/create_account_action.php:26
 msgid "Can't create account"
 msgstr "無法建立帳號"
@@ -2472,192 +2647,152 @@ msgstr "無法建立帳號"
 msgid "Click your browser's <b>Back</b> button to try again."
 msgstr "點擊瀏覽器的<b>返回</b>按鈕來重試。"
 
-#: ../user/create_account_action.php:47
+#: ../user/create_account_action.php:46
 msgid "Your reCAPTCHA response was not correct. Please try again."
 msgstr "您輸入的驗證字不符,請重試。"
 
-#: ../user/create_account_action.php:70
+#: ../user/create_account_action.php:69
 msgid "You must supply an invitation code to create an account."
 msgstr "您必須提供一個邀請碼才能建立帳號。"
 
-#: ../user/create_account_action.php:73
+#: ../user/create_account_action.php:72
 msgid "The invitation code you gave is not valid."
 msgstr "您提供的邀請碼是錯誤的。"
 
-#: ../user/create_account_action.php:84
+#: ../user/create_account_action.php:83
 msgid ""
 "Invalid email address: you must enter a valid address of the form "
 "name at domain"
 msgstr "電子郵件地址錯誤:您必須輸入一個合法的地址,例如 用戶名@域名"
 
-#: ../user/create_account_action.php:88
+#: ../user/create_account_action.php:87
 msgid "There's already an account with that email address."
 msgstr "已有帳號連結至此電子郵件地址。"
 
-#: ../user/create_account_action.php:94 ../user/edit_passwd_action.php:33
+#: ../user/create_account_action.php:93 ../user/edit_passwd_action.php:32
 msgid "New passwords are different"
 msgstr "新密碼不符"
 
-#: ../user/create_account_action.php:101 ../user/edit_passwd_action.php:41
+#: ../user/create_account_action.php:100 ../user/edit_passwd_action.php:40
 msgid "Passwords may only include ASCII characters."
 msgstr "登入密碼只允許包含 ASCII 字符。"
 
-#: ../user/create_account_action.php:106 ../user/edit_passwd_action.php:45
+#: ../user/create_account_action.php:105 ../user/edit_passwd_action.php:44
 msgid "New password is too short: minimum password length is %1 characters."
 msgstr "新密碼長度過短:最短的密碼長度為 %1 字符。"
 
-#: ../user/create_account_action.php:127
+#: ../user/create_account_action.php:126
 msgid "Couldn't create account"
 msgstr "無法建立帳號"
 
-#: ../user/create_account_form.php:44
+#: ../user/create_account_form.php:45
 msgid ""
 "NOTE: If you use the BOINC Manager, don't use this form. Just run BOINC, "
 "select Add Project, and enter an email address and password."
 msgstr "注意:如果您使用BOINC管理服務,不要使用此表格。只要執行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 "電子郵件地址"
-
-#: ../user/create_account_form.php:83
-msgid "Must be a valid address of the form 'name at domain'."
-msgstr "必須是有效的電子郵件地址,例如:用戶名@域名。"
-
-#: ../user/create_account_form.php:92 ../user/edit_email_form.php:47
-msgid "Password"
-msgstr "密碼"
-
-#: ../user/create_account_form.php:93
-msgid "Must be at least %1 characters"
-msgstr "至少必須包含 %1 個字符"
-
-#: ../user/create_account_form.php:96
-msgid "Confirm password"
-msgstr "確定密碼"
-
-#: ../user/create_account_form.php:113
-msgid "Please enter the words shown in the image"
-msgstr "請輸入圖片中顯示的文字"
-
-#: ../user/create_account_form.php:119
-msgid "Create account"
-msgstr "建立帳號"
-
-#: ../user/create_profile.php:50
+#: ../user/create_profile.php:52
 msgid "Picture"
 msgstr "照片"
 
-#: ../user/create_profile.php:64
+#: ../user/create_profile.php:66
 msgid "%1 Your profile picture is shown to the left."
 msgstr "%1您的用戶檔案圖片將顯示在左邊"
 
-#: ../user/create_profile.php:66
+#: ../user/create_profile.php:68
 msgid ""
 "To replace it, click the \"Browse\" button and select a JPEG or PNG file (%1"
 " or less)."
 msgstr "要變更的話,點擊 “ 瀏覽 ” 按鈕並選擇一個JPEG 或PNG 圖檔(大小不超過 %1)。"
 
-#: ../user/create_profile.php:69
+#: ../user/create_profile.php:71
 msgid "To remove it from your profile, check this box:"
 msgstr "如果想從用戶檔案中刪除它,請選擇:"
 
-#: ../user/create_profile.php:77
+#: ../user/create_profile.php:79
 msgid ""
 "If you would like include a picture with your profile, click the \"Browse\" "
 "button and select a JPEG or PNG file. Please select images of %1 or less."
 msgstr "如果您想在用戶檔案中加入一張照片,點擊 “ 瀏覽 ” 按鈕並選擇一個JPEG 或PNG 圖檔。大小不能超過 %1。"
 
-#: ../user/create_profile.php:89
+#: ../user/create_profile.php:91
 msgid "Language"
 msgstr "語言"
 
-#: ../user/create_profile.php:92
+#: ../user/create_profile.php:94
 msgid "Select the language in which your profile is written:"
 msgstr "請選擇您編輯用戶檔案的語言:"
 
-#: ../user/create_profile.php:104
+#: ../user/create_profile.php:106
 msgid "Submit profile"
 msgstr "提交用戶檔案"
 
-#: ../user/create_profile.php:110
-msgid "Please enter the words shown in the image."
-msgstr "請輸入圖片中顯示的文字。"
-
-#: ../user/create_profile.php:115
+#: ../user/create_profile.php:112
 msgid "Create/edit profile"
 msgstr "建立/編輯用戶檔案"
 
-#: ../user/create_profile.php:137
+#: ../user/create_profile.php:134
 msgid "The format of your uploaded image is not supported."
 msgstr "不支援您上傳的圖片格式。"
 
-#: ../user/create_profile.php:166
+#: ../user/create_profile.php:163
 msgid ""
 "Your %1profile%2 lets you share your opinions and background with the %3 "
 "community."
 msgstr "透過 %1用戶檔案%2,你可以和%3 社群分享您的觀點和背景。"
 
-#: ../user/create_profile.php:213
+#: ../user/create_profile.php:209
 msgid "Your ReCaptcha response was not correct.  Please try again."
 msgstr "您的驗證文字不正確,請重試。"
 
-#: ../user/create_profile.php:222
+#: ../user/create_profile.php:218
 msgid ""
 "Your first response was flagged as spam by the Akismet anti-spam system.  "
 "Please modify your text and try again."
 msgstr "您的第一次回覆已被 Akismet 防垃圾郵件系統標記為垃圾郵件,請修改您輸入的內容並重試。"
 
-#: ../user/create_profile.php:230
+#: ../user/create_profile.php:226
 msgid ""
 "Your second response was flagged as spam by the Akismet anti-spam system.  "
 "Please modify your text and try again."
 msgstr "您的第二次回覆已被 Akismet 防垃圾郵件系統標記為垃圾郵件,請修改您輸入的內容並重試。"
 
-#: ../user/create_profile.php:246
+#: ../user/create_profile.php:242
 msgid "Your profile submission was empty."
 msgstr "您提交的用戶檔案內容為空。"
 
-#: ../user/create_profile.php:285
+#: ../user/create_profile.php:283
 msgid "Could not update the profile: database error"
 msgstr "無法更新該用戶檔案:資料庫錯誤"
 
-#: ../user/create_profile.php:297
+#: ../user/create_profile.php:299
 msgid "Could not create the profile: database error"
 msgstr "無法建立該用戶檔案:資料庫錯誤"
 
-#: ../user/create_profile.php:302
+#: ../user/create_profile.php:304
 msgid "Profile saved"
 msgstr "用戶檔案已儲存"
 
-#: ../user/create_profile.php:304
+#: ../user/create_profile.php:306
 msgid ""
 "Congratulations! Your profile was successfully entered into our database."
 msgstr "恭喜!您的用戶檔案已經成功進入了我們的資料庫。"
 
-#: ../user/create_profile.php:306
-msgid "%1View your profile%2"
-msgstr "1%查看您的用戶檔案%2"
+#: ../user/create_profile.php:309
+msgid "View your profile"
+msgstr "檢視您的使用者檔案"
 
-#: ../user/create_profile.php:315
+#: ../user/create_profile.php:319
 msgid "Create a profile"
 msgstr "建立一個用戶檔案"
 
-#: ../user/create_profile.php:343
+#: ../user/create_profile.php:347
 msgid ""
 "To prevent spam, an average credit of %1 or greater is required to create or"
 " edit a profile.  We apologize for this inconvenience."
@@ -2698,9 +2833,9 @@ msgstr "該操作無法撤銷。 \n一旦帳號被刪除,將無法還原。"
 msgid "Are you sure you want to delete your account?"
 msgstr "您確定要刪除您的帳號嗎?"
 
-#: ../user/delete_account.php:79 ../user/delete_profile.php:52
-#: ../user/donations.php:322 ../user/donations.php:326 ../user/friend.php:238
-#: ../user/prefs_remove.php:52 ../user/user_search.php:59
+#: ../user/delete_account.php:79 ../user/delete_profile.php:54
+#: ../user/donations.php:322 ../user/donations.php:326 ../user/friend.php:240
+#: ../user/prefs_remove.php:53 ../user/user_search.php:59
 #: ../user/user_search.php:64
 msgid "Yes"
 msgstr "是"
@@ -2709,8 +2844,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 "否"
@@ -2719,44 +2854,44 @@ msgstr "否"
 msgid "Do not delete this account"
 msgstr "不要刪除這個帳號"
 
-#: ../user/delete_profile.php:30
+#: ../user/delete_profile.php:32
 msgid "couldn't delete profile - please try again later"
 msgstr "無法刪除用戶檔案 - 請稍候再試。"
 
-#: ../user/delete_profile.php:33
+#: ../user/delete_profile.php:35
 msgid "Delete Confirmation"
 msgstr "刪除確認"
 
-#: ../user/delete_profile.php:35
+#: ../user/delete_profile.php:37
 msgid "Your profile has been deleted."
 msgstr "您的用戶檔案已刪除。"
 
-#: ../user/delete_profile.php:40
+#: ../user/delete_profile.php:42
 msgid "Profile delete confirmation"
 msgstr "用戶檔案刪除確認"
 
-#: ../user/delete_profile.php:43
+#: ../user/delete_profile.php:45
 msgid "Are you sure?"
 msgstr "您確定嗎?"
 
-#: ../user/delete_profile.php:44
+#: ../user/delete_profile.php:46
 msgid ""
 "Deleted profiles are gone forever and cannot be recovered --\n"
 "you will have to start from scratch\n"
 "if you want another profile in the future."
 msgstr "刪除的用戶檔案將永遠無法恢復 --\n如果您以後想要重新使用用戶檔案,必須從頭開始建立。"
 
-#: ../user/delete_profile.php:48
+#: ../user/delete_profile.php:50
 msgid ""
 "If you're sure, click 'Yes'\n"
 "to remove your profile from our database."
 msgstr "如果您確定的話,請點擊 “ 是 ” \n從我們的資料庫中刪除你的用戶檔案。"
 
-#: ../user/delete_profile.php:52
+#: ../user/delete_profile.php:54
 msgid "Delete my profile"
 msgstr "刪除我的用戶檔案"
 
-#: ../user/delete_profile.php:53
+#: ../user/delete_profile.php:55
 msgid "Do not delete my profile"
 msgstr "不要刪除我的用戶檔案"
 
@@ -2937,241 +3072,204 @@ msgstr "此操作將清除您對所修改的社群偏好設定,要取消操作
 msgid "Reset preferences"
 msgstr "重設偏好設定"
 
-#: ../user/edit_forum_preferences_action.php:88
+#. Not the right kind of file
+#: ../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
-msgid "No such user: %1"
-msgstr "沒有此用戶:%1"
+#: ../user/edit_forum_preferences_action.php:139
+#: ../user/edit_forum_preferences_action.php:153
+msgid "No such user:"
+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 "格式:JPG 或 PNG。尺寸:最大 4KB,100x100像素"
 
-#: ../user/edit_forum_preferences_form.php:80
+#: ../user/edit_forum_preferences_form.php:70
 msgid "Don't use an avatar"
 msgstr "不使用大頭貼"
 
-#: ../user/edit_forum_preferences_form.php:82
+#: ../user/edit_forum_preferences_form.php:72
 msgid "Use a Globally Recognized Avatar provided by %1"
 msgstr "使用由 %1 提供的個人全球統一標識"
 
-#: ../user/edit_forum_preferences_form.php:84
+#: ../user/edit_forum_preferences_form.php:74
 msgid "Use this uploaded avatar:"
 msgstr "使用上傳的大頭貼:"
 
-#: ../user/edit_forum_preferences_form.php:87
+#: ../user/edit_forum_preferences_form.php:77
 msgid "Avatar preview"
 msgstr "預覽大頭貼"
 
-#: ../user/edit_forum_preferences_form.php:87
+#: ../user/edit_forum_preferences_form.php:77
 msgid "This is how your avatar will look"
 msgstr "您的大頭貼將顯示為"
 
-#: ../user/edit_forum_preferences_form.php:96
+#: ../user/edit_forum_preferences_form.php:86
 msgid "Signature for message board posts"
 msgstr "留言板發布簽名"
 
-#: ../user/edit_forum_preferences_form.php:99
+#: ../user/edit_forum_preferences_form.php:89
 msgid ""
 "Check out %1various free services%2\n"
 "<br> providing dynamic 'signature images'\n"
 "<br> showing your latest credit info, project news, etc."
 msgstr "查看 %1所有的免費服務%2\n<br> 提供動態簽名圖片\n<br> 顯示你最新的積分訊息,專案新聞等。"
 
-#: ../user/edit_forum_preferences_form.php:104
-msgid "characters remaining"
-msgstr "剩餘字符數"
-
-#: ../user/edit_forum_preferences_form.php:105
+#: ../user/edit_forum_preferences_form.php:93
 msgid "Attach signature by default"
 msgstr "默認使用簽名"
 
-#: ../user/edit_forum_preferences_form.php:108
+#: ../user/edit_forum_preferences_form.php:96
 msgid "Signature preview"
 msgstr "預覽簽名"
 
-#: ../user/edit_forum_preferences_form.php:109
+#: ../user/edit_forum_preferences_form.php:97
 msgid "This is how your signature will look in the forums"
 msgstr "你的簽名將在論壇中顯示為"
 
-#: ../user/edit_forum_preferences_form.php:127
+#: ../user/edit_forum_preferences_form.php:115
 msgid "Message display"
 msgstr "顯示訊息"
 
-#: ../user/edit_forum_preferences_form.php:129
+#: ../user/edit_forum_preferences_form.php:117
 msgid "What to display"
 msgstr "顯示內容"
 
-#: ../user/edit_forum_preferences_form.php:130
+#: ../user/edit_forum_preferences_form.php:118
 msgid "Hide avatar images"
 msgstr "隱藏大頭貼"
 
-#: ../user/edit_forum_preferences_form.php:131
+#: ../user/edit_forum_preferences_form.php:119
 msgid "Hide signatures"
 msgstr "隱藏簽名"
 
-#: ../user/edit_forum_preferences_form.php:132
+#: ../user/edit_forum_preferences_form.php:120
 msgid "Show images as links"
 msgstr "將圖片顯示為連結"
 
-#: ../user/edit_forum_preferences_form.php:133
+#: ../user/edit_forum_preferences_form.php:121
 msgid "Open links in new window/tab"
 msgstr "在新視窗/分頁中打開連結"
 
-#: ../user/edit_forum_preferences_form.php:134
+#: ../user/edit_forum_preferences_form.php:122
 msgid "Highlight special users"
 msgstr "高亮指定用戶"
 
-#: ../user/edit_forum_preferences_form.php:135
+#: ../user/edit_forum_preferences_form.php:123
 msgid "Display this many messages per page"
 msgstr "在每頁顯示更多留言"
 
-#: ../user/edit_forum_preferences_form.php:139
+#: ../user/edit_forum_preferences_form.php:127
 msgid "How to sort"
 msgstr "如何排序"
 
-#: ../user/edit_forum_preferences_form.php:140
+#: ../user/edit_forum_preferences_form.php:128
 msgid "Threads:"
 msgstr "主題:"
 
-#: ../user/edit_forum_preferences_form.php:140
+#: ../user/edit_forum_preferences_form.php:128
 msgid "Posts:"
 msgstr "文章:"
 
-#: ../user/edit_forum_preferences_form.php:141
+#: ../user/edit_forum_preferences_form.php:129
 msgid "Jump to first new post in thread automatically"
 msgstr "自動跳轉到第一篇未讀的文章"
 
-#: ../user/edit_forum_preferences_form.php:142
+#: ../user/edit_forum_preferences_form.php:130
 msgid "Don't move sticky posts to top"
 msgstr "不要移動置頂文章到頂部"
 
-#: ../user/edit_forum_preferences_form.php:148
+#. DISABLE_FORUMS
+#. ------------ Message filtering  -----------
+#: ../user/edit_forum_preferences_form.php:137
 msgid "Message filtering"
 msgstr "過濾訊息"
 
-#: ../user/edit_forum_preferences_form.php:164
+#: ../user/edit_forum_preferences_form.php:153
 msgid "Filtered users"
 msgstr "已過濾的用戶"
 
-#: ../user/edit_forum_preferences_form.php:165
+#: ../user/edit_forum_preferences_form.php:154
 msgid "Ignore message board posts and private messages from these users."
 msgstr "忽略這些用戶在留言板中的文章和私人訊息。"
 
-#: ../user/edit_forum_preferences_form.php:167
+#: ../user/edit_forum_preferences_form.php:156
 msgid "User ID (For instance: 123456789)"
 msgstr "用戶 ID(例如:123456789)"
 
-#: ../user/edit_forum_preferences_form.php:168 ../user/pm.php:251
+#: ../user/edit_forum_preferences_form.php:157 ../user/pm.php:256
 msgid "Add user to filter"
 msgstr "新增用戶到過濾器"
 
-#: ../user/edit_forum_preferences_form.php:173
+#: ../user/edit_forum_preferences_form.php:162
 msgid "Click here to update preferences"
 msgstr "點擊這裡更新偏好設定"
 
-#: ../user/edit_forum_preferences_form.php:175
-#: ../user/edit_forum_preferences_form.php:177
+#: ../user/edit_forum_preferences_form.php:164
+#: ../user/edit_forum_preferences_form.php:166
 msgid "Reset"
 msgstr "重設"
 
-#: ../user/edit_forum_preferences_form.php:176
+#: ../user/edit_forum_preferences_form.php:165
 msgid "Or click here to reset preferences to the defaults"
 msgstr "或者點擊這裡將所有偏好設定重設為預設"
 
 #: ../user/edit_passwd_action.php:50
-msgid "Invalid account key"
-msgstr "帳號不正確"
-
-#: ../user/edit_passwd_action.php:55
-msgid "No account with that email address was found"
-msgstr "沒有帳號連結至該電子郵件地址"
-
-#: ../user/edit_passwd_action.php:59
-msgid "Invalid password"
-msgstr "密碼不正確"
-
-#: ../user/edit_passwd_action.php:63 ../user/edit_passwd_form.php:25
-#: ../user/edit_passwd_form.php:55
-msgid "Change password"
-msgstr "修改密碼"
-
-#: ../user/edit_passwd_action.php:67
-msgid "Your password has been changed."
-msgstr "您的密碼已修改。"
-
-#: ../user/edit_passwd_action.php:69
 msgid ""
 "We can't update your password due to a database problem. Please try again "
 "later."
 msgstr "因為資料庫的問題,我們目前無法更新您的密碼,請稍後重試。"
 
-#: ../user/edit_passwd_form.php:39
-msgid "You can identify yourself using either"
-msgstr "您可以用以下方式驗證身份"
-
-#: ../user/edit_passwd_form.php:41
-msgid "your email address and old password"
-msgstr "您的電子郵件地址和舊的密碼"
-
-#: ../user/edit_passwd_form.php:42
-msgid "your account key"
-msgstr "您的帳號密碼"
-
-#: ../user/edit_passwd_form.php:46
-msgid "Current password"
-msgstr "目前的密碼"
-
-#: ../user/edit_passwd_form.php:48
-msgid "<b>OR</b>: Account key"
-msgstr "<b>或者</ b>:帳號金鑰"
+#: ../user/edit_passwd_action.php:53 ../user/edit_passwd_form.php:25
+#: ../user/edit_passwd_form.php:34
+msgid "Change password"
+msgstr "修改密碼"
 
-#: ../user/edit_passwd_form.php:49
-msgid "Get account key by email"
-msgstr "通過電子郵件取得帳戶密碼"
+#: ../user/edit_passwd_action.php:54
+msgid "Your password has been changed."
+msgstr "您的密碼已修改。"
 
-#: ../user/edit_passwd_form.php:53
+#: ../user/edit_passwd_form.php:32
 msgid "New password"
 msgstr "新密碼"
 
-#: ../user/edit_passwd_form.php:54
+#: ../user/edit_passwd_form.php:33
 msgid "New password, again"
 msgstr "再次輸入新密碼"
 
@@ -3216,17 +3314,17 @@ 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."
-msgstr "該工作已經準備分發,但還沒有分發。"
+msgstr "該任務已經準備分發,但還沒有分發。"
 
 #: ../user/explain_state.php:40
 msgid "In Progress"
@@ -3234,13 +3332,13 @@ msgstr "運算中"
 
 #: ../user/explain_state.php:41
 msgid "The task has been sent; waiting for completion."
-msgstr "工作已發送,等待完成。"
+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 "該工作已經分發給一台電腦,其結果或者是處理超時,或者是處理完成並正確回報。"
+msgstr "該任務已經分發給一台電腦,其結果或者是處理超時,或者是處理完成並正確回報。"
 
 #: ../user/explain_state.php:49
 msgid "Outcomes"
@@ -3250,23 +3348,23 @@ 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."
-msgstr "該工作已由一台電腦完成並且成功的回報結果。"
+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 "伺服器無法分發該工作(可能因為需要的運算資源過大)"
+msgstr "伺服器無法分發該任務(可能因為需要的運算資源過大)"
 
 #: ../user/explain_state.php:65
 msgid "Client error"
@@ -3274,25 +3372,25 @@ msgstr "客戶端錯誤"
 
 #: ../user/explain_state.php:66
 msgid "The task was sent to a computer and an error occurred."
-msgstr "該工作已分發給一台電腦,但在處理過程中產生了錯誤。"
+msgstr "該任務已分發給一台電腦,但在處理過程中產生了錯誤。"
 
 #: ../user/explain_state.php:69
 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 "該工作未分發到電腦,因為所屬的工作包已經完成了足夠數量的運算工作。"
+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"
@@ -3302,15 +3400,15 @@ msgstr "客戶端狀態"
 msgid ""
 "A result's <b>client state</b> indicates the stage of processing at which an"
 " error occurred."
-msgstr "運算結果的<b>客戶端狀態</b>表示運算工作在電腦上的處理階段,例如 發生錯誤的時候。"
+msgstr "運算結果的<b>客戶端狀態</b>表示運算任務在電腦上的處理階段,例如 發生錯誤的時候。"
 
 #: ../user/explain_state.php:86
 msgid "The computer has not yet completed the task."
-msgstr "電腦尚未完成該工作的處理。"
+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."
@@ -3332,7 +3430,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"
@@ -3382,19 +3480,19 @@ msgstr "使用瀏覽器的返回按鈕退到訊息表單頁面"
 msgid "Sending emails"
 msgstr "傳送電子郵件"
 
-#: ../user/ffmail_action.php:84
+#: ../user/ffmail_action.php:82
 msgid "email sent successfully to %1"
 msgstr "電子郵件已成功傳送給 %1"
 
-#: ../user/ffmail_action.php:86
+#: ../user/ffmail_action.php:84
 msgid "failed to send email to %1: %2"
 msgstr "無法傳送電子郵件給 %1:%2"
 
-#: ../user/ffmail_action.php:92
+#: ../user/ffmail_action.php:90
 msgid "Thanks for telling your friends about %1"
 msgstr "感謝您向好友們介紹了 %1"
 
-#: ../user/ffmail_action.php:94
+#: ../user/ffmail_action.php:92
 msgid ""
 "You forgot to enter your friends' names and/or email addresses; Please "
 "%1return to the form%2 and enter them."
@@ -3445,79 +3543,74 @@ msgstr "額外訊息 (可選)"
 msgid "Send"
 msgstr "傳送"
 
-#: ../user/forum_banishment_vote.php:35
-#: ../user/forum_banishment_vote_action.php:33
+#. Can't moderate without being moderator
+#: ../user/forum_banishment_vote.php:37
+#: ../user/forum_banishment_vote_action.php:35
 msgid "You are not authorized to banish users."
 msgstr "您沒有權限封鎖用戶。"
 
-#: ../user/forum_banishment_vote.php:41 ../user/forum_banishment_vote.php:46
+#: ../user/forum_banishment_vote.php:43 ../user/forum_banishment_vote.php:48
 msgid "Banishment Vote"
 msgstr "封鎖投票"
 
-#: ../user/forum_banishment_vote.php:50
+#: ../user/forum_banishment_vote.php:52
 msgid "No user with this ID found."
 msgstr "找不到符合 ID 的用戶"
 
-#: ../user/forum_banishment_vote.php:54 ../user/forum_moderate_post.php:76
+#: ../user/forum_banishment_vote.php:57 ../user/forum_moderate_post.php:79
 msgid "User is already banished"
 msgstr "用戶已被封鎖"
 
-#: ../user/forum_banishment_vote.php:59 ../user/forum_moderate_post.php:79
+#: ../user/forum_banishment_vote.php:62 ../user/forum_moderate_post.php:82
 msgid ""
 "Are you sure you want to banish %1?<br/>This will prevent %1 from posting "
 "for chosen time period.<br/>It should be done only if %1 has consistently "
 "exhibited trollish behavior."
 msgstr "您確定要封鎖 %1 嗎?<br/>該操作將在設定的時間期限內禁止 %1 發帖。 <br/>該操作只用在 %1 有連續的違規行為時被使用。"
 
-#: ../user/forum_banishment_vote.php:61
+#: ../user/forum_banishment_vote.php:64
 msgid ""
 "Select the reason category, optionally write a longer description of why the"
 " user should be banished."
 msgstr "選擇原因分類,並附上為什麼要封鎖此用戶的原因。"
 
-#: ../user/forum_banishment_vote.php:62 ../user/forum_moderate_thread.php:50
+#: ../user/forum_banishment_vote.php:65 ../user/forum_moderate_thread.php:56
 msgid "Category"
 msgstr "分類"
 
-#: ../user/forum_banishment_vote.php:64
-#: ../user/forum_banishment_vote_action.php:57
-#: ../user/forum_moderate_post.php:55 ../user/forum_moderate_thread.php:52
+#: ../user/forum_banishment_vote.php:67
+#: ../user/forum_banishment_vote_action.php:59
+#: ../user/forum_moderate_post.php:58 ../user/forum_moderate_thread.php:58
 msgid "Obscene"
 msgstr "猥褻"
 
-#: ../user/forum_banishment_vote.php:65
-#: ../user/forum_banishment_vote_action.php:59
-#: ../user/forum_moderate_post.php:56 ../user/forum_moderate_thread.php:53
+#: ../user/forum_banishment_vote.php:68
+#: ../user/forum_banishment_vote_action.php:61
+#: ../user/forum_moderate_post.php:59 ../user/forum_moderate_thread.php:59
 msgid "Flame/Hate mail"
 msgstr "侮辱"
 
-#: ../user/forum_banishment_vote.php:66
-#: ../user/forum_banishment_vote_action.php:61
-#: ../user/forum_moderate_post.php:59
+#: ../user/forum_banishment_vote.php:69
+#: ../user/forum_banishment_vote_action.php:63
+#: ../user/forum_moderate_post.php:62
 msgid "User Request"
 msgstr "用戶請求"
 
-#: ../user/forum_banishment_vote.php:67
-#: ../user/forum_banishment_vote_action.php:63
-#: ../user/forum_moderate_post.php:60 ../user/forum_moderate_thread.php:55
-msgid "Other"
-msgstr "其他"
-
-#: ../user/forum_banishment_vote.php:69 ../user/forum_moderate_post.php:53
-#: ../user/forum_moderate_thread.php:85
+#: ../user/forum_banishment_vote.php:72 ../user/forum_moderate_post.php:56
+#: ../user/forum_moderate_thread.php:100
 msgid "Reason"
 msgstr "原因"
 
-#: ../user/forum_banishment_vote.php:69 ../user/forum_moderate_thread.php:85
+#: ../user/forum_banishment_vote.php:72 ../user/forum_moderate_thread.php:100
 msgid "Mailed if nonempty"
 msgstr "如果空白請填電子郵件"
 
-#: ../user/forum_banishment_vote.php:74
+#: ../user/forum_banishment_vote.php:77
 msgid "Proceed with vote"
 msgstr "繼續投票"
 
-#: ../user/forum_banishment_vote_action.php:39
-#: ../user/forum_moderate_post_action.php:63
+#: ../user/forum_banishment_vote_action.php:41
+#: ../user/forum_moderate_post_action.php:66
 msgid "You must specify an action..."
 msgstr "您必須指定一個操作..."
 
@@ -3531,7 +3624,7 @@ msgstr "你將無法再編輯此文張。<br/>文章只能發佈後的 %1 分
 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 "論壇"
 
@@ -3540,828 +3633,829 @@ msgid "Edit your message"
 msgstr "編輯您的訊息"
 
 #: ../user/forum_edit.php:115 ../user/forum_edit.php:120
-#: ../user/forum_post.php:109 ../user/forum_post.php:111
-#: ../user/team_forum.php:69
+#: ../user/forum_post.php:113 ../user/forum_post.php:115
+#: ../user/team_forum.php:71
 msgid "Title"
 msgstr "標題"
 
-#: ../user/forum_edit.php:144 ../user/forum_post.php:129
+#: ../user/forum_edit.php:144 ../user/forum_post.php:133
 msgid "Add my signature to this post"
 msgstr "在文章中加入我的簽名"
 
-#: ../user/forum_forum.php:41
+#: ../user/forum_forum.php:46
 msgid "Not visible to you"
 msgstr "對您不可見"
 
-#: ../user/forum_forum.php:80
+#: ../user/forum_forum.php:83
 msgid "Team message board for %1"
 msgstr "%1 的團隊留言板"
 
-#: ../user/forum_forum.php:96
+#: ../user/forum_forum.php:99
 msgid "New thread"
 msgstr "新主題"
 
-#: ../user/forum_forum.php:96
+#: ../user/forum_forum.php:99
 msgid "Add a new thread to this forum"
 msgstr "在論壇發佈一個新主題"
 
-#: ../user/forum_forum.php:116
+#: ../user/forum_forum.php:119
 msgid "This message board is available as an %1RSS feed%2"
-msgstr "留言板的更新還可以通過 %sRSS%s 來取得"
+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."
 msgstr "通過Skype和志工線上交流,支持多種語言,請到 %1BOINC 線上幫助%2。"
 
-#: ../user/forum_help_desk.php:44 ../user/forum_index.php:92
+#: ../user/forum_help_desk.php:46 ../user/forum_index.php:97
 msgid "Topic"
 msgstr "主題"
 
-#: ../user/forum_help_desk.php:45
+#: ../user/forum_help_desk.php:47
 msgid "Questions"
 msgstr "問題"
 
-#: ../user/forum_index.php:53 ../user/team_forum.php:68
+#: ../user/forum_index.php:58 ../user/team_forum.php:70
 msgid "Discussion among members of %1"
 msgstr "%1 成員間的討論"
 
-#: ../user/forum_index.php:69
+#: ../user/forum_index.php:74
 msgid "%1 Message boards"
 msgstr "%1 留言板"
 
-#: ../user/forum_index.php:78
+#: ../user/forum_index.php:83
 msgid ""
 "If you have a question or problem, please use the %1Questions & Answers%2 "
 "section of the message boards."
 msgstr "如果你有問題希望得到解答,請使用留言板中的 %1問題解答%2 區。"
 
-#: ../user/forum_index.php:123
+#: ../user/forum_index.php:128
 msgid "Subscribed threads"
 msgstr "已訂閱的主題"
 
-#: ../user/forum_moderate_post.php:43
+#: ../user/forum_moderate_post.php:45
 msgid "Moderate post"
 msgstr "處理文章"
 
-#: ../user/forum_moderate_post.php:52
+#: ../user/forum_moderate_post.php:55
 msgid "Hide post"
 msgstr "隱藏文章"
 
-#: ../user/forum_moderate_post.php:57 ../user/forum_moderate_thread.php:54
+#: ../user/forum_moderate_post.php:60 ../user/forum_moderate_thread.php:60
 msgid "Commercial spam"
 msgstr "垃圾廣告"
 
-#: ../user/forum_moderate_post.php:58
+#: ../user/forum_moderate_post.php:61
 msgid "Doublepost"
 msgstr "重覆發文"
 
-#: ../user/forum_moderate_post.php:63
+#: ../user/forum_moderate_post.php:66
 msgid "Move post"
 msgstr "移動文章"
 
-#: ../user/forum_moderate_post.php:65
+#: ../user/forum_moderate_post.php:68
 msgid "Destination thread ID:"
 msgstr "目標主題ID:"
 
-#: ../user/forum_moderate_post.php:78
+#: ../user/forum_moderate_post.php:81
 msgid "Banish user"
 msgstr "封鎖用戶"
 
-#: ../user/forum_moderate_post.php:80
+#: ../user/forum_moderate_post.php:83
 msgid "Ban duration"
 msgstr "禁用時間"
 
-#: ../user/forum_moderate_post.php:81
+#: ../user/forum_moderate_post.php:84
 msgid "4 hours"
 msgstr "4小時"
 
-#: ../user/forum_moderate_post.php:82 ../user/forum_search.php:45
+#: ../user/forum_moderate_post.php:85 ../user/forum_search.php:47
 msgid "1 day"
 msgstr "1天"
 
-#: ../user/forum_moderate_post.php:83
+#: ../user/forum_moderate_post.php:86
 msgid "1 week"
 msgstr "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 客戶端的通知"
+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 "僅在所有參與者都可能對該項目感興趣的時候使用"
+msgstr "僅在所有參與者都可能對該專案感興趣的時候使用"
 
-#: ../user/forum_rate.php:26
+#: ../user/forum_rate.php:28
 msgid "Rating offline"
 msgstr "評分功能離線"
 
-#: ../user/forum_rate.php:27
+#: ../user/forum_rate.php:29
 msgid "This function is turned off by the project"
 msgstr "此功能已被專案關閉"
 
-#: ../user/forum_rate.php:58
+#: ../user/forum_rate.php:60
 msgid "You need more average or total credit to rate a post."
 msgstr "您需要更高的平均積分或總積分才能對文章進行評分。"
 
-#: ../user/forum_rate.php:62
+#: ../user/forum_rate.php:64
 msgid "You have already rated this post."
 msgstr "您已經評價過此文章。"
 
-#: ../user/forum_rate.php:62 ../user/forum_rate.php:78
-#: ../user/forum_rate.php:83 ../user/forum_report_post.php:69
-#: ../user/forum_report_post.php:94 ../user/forum_subscribe.php:54
-#: ../user/forum_subscribe.php:69 ../user/forum_thread_status.php:51
+#: ../user/forum_rate.php:64 ../user/forum_rate.php:80
+#: ../user/forum_rate.php:85 ../user/forum_report_post.php:72
+#: ../user/forum_report_post.php:97 ../user/forum_subscribe.php:56
+#: ../user/forum_subscribe.php:71 ../user/forum_thread_status.php:56
 msgid "Return to thread"
 msgstr "返回主題"
 
-#: ../user/forum_rate.php:72
+#: ../user/forum_rate.php:74
 msgid "Input Recorded"
 msgstr "輸入已紀錄"
 
-#: ../user/forum_rate.php:73
+#: ../user/forum_rate.php:75
 msgid "Your input has been recorded. Thanks for your help."
 msgstr "輸入已經被記錄下來,感謝您的幫助。"
 
-#: ../user/forum_rate.php:75
+#: ../user/forum_rate.php:77
 msgid "Vote Registered"
 msgstr "投票已登記"
 
-#: ../user/forum_rate.php:76
+#: ../user/forum_rate.php:78
 msgid "Your rating has been recorded. Thanks for your input."
 msgstr "評分已經被記錄下來,感謝您的參與。"
 
-#: ../user/forum_rate.php:80
+#: ../user/forum_rate.php:82
 msgid "Vote Submission Problem"
 msgstr "投票提交故障"
 
-#: ../user/forum_reply.php:73
+#: ../user/forum_reply.php:76
 msgid ""
 "Your post has been flagged as spam by the Akismet anti-spam system. Please "
 "modify your text and try again."
 msgstr "你的文章已被 Akismet 防垃圾郵件系統標記為垃圾訊息,請修改你輸入的內容並重試。"
 
-#: ../user/forum_reply.php:88 ../user/forum_thread.php:158
-#: ../user/forum_thread.php:274
+#: ../user/forum_reply.php:91 ../user/forum_thread.php:159
+#: ../user/forum_thread.php:284
 msgid "Post to thread"
 msgstr "回覆此主題"
 
-#: ../user/forum_reply.php:137
+#: ../user/forum_reply.php:143
 msgid "Message:"
 msgstr "訊息:"
 
-#: ../user/forum_reply.php:140
+#: ../user/forum_reply.php:146
 msgid "reply to %1Message ID%2:"
 msgstr "回覆%1訊息 ID%2:"
 
-#: ../user/forum_reply.php:166
+#: ../user/forum_reply.php:172
 msgid "Post reply"
 msgstr "發表回覆"
 
-#: ../user/forum_reply.php:169
+#: ../user/forum_reply.php:175
 msgid "Add my signature to this reply"
 msgstr "在回覆中附上我的簽名"
 
-#: ../user/forum_report_post.php:45
+#: ../user/forum_report_post.php:48
 msgid "You need more average or total credit to report a post."
 msgstr "您需要更高的平均積分或總積分才能舉報一個文章。"
 
-#: ../user/forum_report_post.php:65
+#: ../user/forum_report_post.php:68
 msgid "Report Registered"
 msgstr "舉報已記錄"
 
-#: ../user/forum_report_post.php:66
+#: ../user/forum_report_post.php:69
 msgid "Your report has been recorded. Thanks for your input."
 msgstr "您的回報已經記錄,感謝您的幫忙。"
 
-#: ../user/forum_report_post.php:67
+#: ../user/forum_report_post.php:70
 msgid ""
 "A moderator will now look at your report and decide what will happen - this "
 "may take a little while, so please be patient"
 msgstr "管理員將會查看您的舉報並決定如何處理 - 可能需要一些時間,請耐心等待"
 
-#: ../user/forum_report_post.php:71
+#: ../user/forum_report_post.php:74
 msgid "Report a forum post"
 msgstr "舉報論壇文章"
 
-#: ../user/forum_report_post.php:73
+#: ../user/forum_report_post.php:76
 msgid ""
 "Before reporting this post, consider using the +/- rating system instead. If"
 " enough users rate a post negatively it will eventually be hidden.<br />You "
 "can find the rating system at the bottom of the post."
 msgstr "在舉報之前,可以考慮使用+/- 評分系統。如果足夠多的用戶給一篇文章負面評價,該文章將自動隱藏。 <br />您可以在文章下方找到評分系統。"
 
-#: ../user/forum_report_post.php:80
+#: ../user/forum_report_post.php:83
 msgid "Report post"
 msgstr "舉報文章"
 
-#: ../user/forum_report_post.php:81
+#: ../user/forum_report_post.php:84
 msgid ""
 "Why do you find the post offensive: %1Please include enough information so that a person that\n"
 "has not yet read the thread will quickly be able to identify the issue.%2"
 msgstr "為什麼你認為這篇文章是令人不快的:%1請包含足夠的說明以便沒有閱讀過整個主題的人也能快速的判明問題。 %2"
 
-#: ../user/forum_report_post.php:90
+#: ../user/forum_report_post.php:93
 msgid "Report not registered"
 msgstr "舉報未記錄"
 
-#: ../user/forum_report_post.php:91
+#: ../user/forum_report_post.php:94
 msgid "Your report could not be recorded. Please wait a while and try again."
 msgstr "您的舉報未被記錄,請等待片刻後重試。"
 
-#: ../user/forum_report_post.php:92
+#: ../user/forum_report_post.php:95
 msgid ""
 "If this is not a temporary error, please report it to the project "
 "developers."
 msgstr "如果該故障無法自動恢復,請向專案開發人員報告。"
 
-#: ../user/forum_rss.php:41
+#: ../user/forum_rss.php:38
 msgid "%1 RSS feed"
 msgstr "%1 RSS訂閱"
 
-#: ../user/forum_rss.php:42
+#: ../user/forum_rss.php:39
 msgid "This message board is available as an RSS feed."
-msgstr "留言板的內容更新還可以通過 %sRSS%s 來獲取。"
+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 "只包含最近多少天內的文章(默認:30)。"
 
-#: ../user/forum_rss.php:51
-msgid "Truncate posts: %1 (Include only first 265 characters of each post)"
-msgstr "截斷文章:%1(只包含每篇文章最前面的 256 個字符)"
-
-#: ../user/forum_rss.php:53
+#: ../user/forum_rss.php:49
 msgid "Threads only: %1 (Include only the first post of every thread)"
 msgstr "僅主題:%1(只包含每個主題的第一篇文章)"
 
-#: ../user/forum_search.php:27
+#: ../user/forum_search.php:29
 msgid "Forum search"
 msgstr "搜尋論壇"
 
-#: ../user/forum_search.php:31
+#: ../user/forum_search.php:33
 msgid "Search query"
 msgstr "搜尋詢問"
 
-#: ../user/forum_search.php:32
+#: ../user/forum_search.php:34
 msgid "Search for keywords:"
 msgstr "搜尋關鍵字:"
 
-#: ../user/forum_search.php:33
+#: ../user/forum_search.php:35
 msgid "Posts that contain all the specified words will be displayed"
 msgstr "包含所有指定字詞的文章將被顯示"
 
-#: ../user/forum_search.php:35
+#: ../user/forum_search.php:37
 msgid "For example: \"screensaver freeze\""
 msgstr "舉例:“螢幕保護程式凍結”"
 
-#: ../user/forum_search.php:36
+#: ../user/forum_search.php:38
 msgid "Search for author ID:"
 msgstr "搜尋作者 ID:"
 
-#: ../user/forum_search.php:37
+#: ../user/forum_search.php:39
 msgid "Only posts by this author will be displayed"
 msgstr "僅指定作者的文章會被顯示"
 
-#: ../user/forum_search.php:39
+#: ../user/forum_search.php:41
 msgid "For example: \"43214\""
 msgstr "舉例:“43214”"
 
-#: ../user/forum_search.php:41
+#: ../user/forum_search.php:43
 msgid "Search options"
 msgstr "搜尋選項"
 
-#: ../user/forum_search.php:42
+#: ../user/forum_search.php:44
 msgid "Search limits"
 msgstr "搜尋限制"
 
-#: ../user/forum_search.php:43
+#: ../user/forum_search.php:45
 msgid "Search at most this many days back in time"
 msgstr "只搜索最近多少天內的"
 
-#: ../user/forum_search.php:50 ../user/forum_search.php:51
+#: ../user/forum_search.php:52 ../user/forum_search.php:53
 msgid "%1 months"
 msgstr "%1 月"
 
-#: ../user/forum_search.php:52
+#: ../user/forum_search.php:54
 msgid "1 year"
 msgstr "一年"
 
-#: ../user/forum_search.php:73
+#: ../user/forum_search.php:55
+msgid "no limit"
+msgstr "不限制"
+
+#: ../user/forum_search.php:75
 msgid "Only display posts from this forum"
 msgstr "只顯示指定論壇的文章"
 
-#: ../user/forum_search.php:84
+#: ../user/forum_search.php:86
 msgid "Sort by"
 msgstr "排序"
 
-#: ../user/forum_search.php:88
+#: ../user/forum_search.php:90
 msgid "Start the search"
 msgstr "開始搜尋"
 
-#: ../user/forum_search_action.php:141
+#: ../user/forum_search_action.php:143
 msgid "Forum search results"
 msgstr "論壇搜尋結果"
 
-#: ../user/forum_search_action.php:174
+#: ../user/forum_search_action.php:176
 msgid "Thread titles matching your query:"
 msgstr "符合您的查詢條件的主題:"
 
-#: ../user/forum_search_action.php:194
+#: ../user/forum_search_action.php:196
 msgid "Messages matching your query:"
 msgstr "符合你的查詢條件的消息:"
 
-#: ../user/forum_search_action.php:217
+#: ../user/forum_search_action.php:219
 msgid ""
 "Sorry, couldn't find anything matching your search query. You can try to "
 "broaden your search by using less words (or less specific words)."
 msgstr "對不起,無法根據您的查詢條件找到任何結果。您可以試著放寬查詢條件,比如使用更少的關鍵字詞或者更寬泛的字詞。"
 
-#: ../user/forum_search_action.php:219
+#: ../user/forum_search_action.php:221
 msgid "You can also %1try the same search on Google.%2"
 msgstr "你也可以%1用 Google 進行同樣的搜索。 %2"
 
-#: ../user/forum_search_action.php:224
+#: ../user/forum_search_action.php:226
 msgid "Perform another search"
 msgstr "重新搜尋"
 
-#: ../user/forum_subscribe.php:46
+#: ../user/forum_subscribe.php:48
 msgid "Subscription successful"
 msgstr "訂閱成功"
 
-#: ../user/forum_subscribe.php:49
+#: ../user/forum_subscribe.php:51
 msgid ""
 "You are now subscribed to %1. You will be notified whenever there is a new "
 "post."
 msgstr "您已經訂閱主題%1,一旦該主題有更新,您將得到通知。"
 
-#: ../user/forum_subscribe.php:51
+#: ../user/forum_subscribe.php:53
 msgid "Subscription failed"
 msgstr "訂閱失敗"
 
-#: ../user/forum_subscribe.php:52
+#: ../user/forum_subscribe.php:54
 msgid ""
 "We are currently unable to subscribe you to %1. Please try again later.."
 msgstr "我們目前無法新增您對 %1 的訂閱,請稍後再試..."
 
-#: ../user/forum_subscribe.php:61
+#: ../user/forum_subscribe.php:63
 msgid "Unsubscription successful"
 msgstr "退訂成功"
 
-#: ../user/forum_subscribe.php:64
+#: ../user/forum_subscribe.php:66
 msgid ""
 "You are no longer subscribed to %1. You will no longer receive notifications"
 " for this thread."
 msgstr "您已經退訂主題%1,您將不會再收到該主題的通知。"
 
-#: ../user/forum_subscribe.php:66
+#: ../user/forum_subscribe.php:68
 msgid "Unsubscription failed"
 msgstr "退訂失敗"
 
-#: ../user/forum_subscribe.php:67
+#: ../user/forum_subscribe.php:69
 msgid ""
 "We are currently unable to unsubscribe you from %1. Please try again later.."
 msgstr "我們目前無法解除您對 %1 的訂閱,請稍後再試..."
 
-#: ../user/forum_subscribe.php:74
+#: ../user/forum_subscribe.php:76
 msgid "Unknown subscription action"
 msgstr "未知的訂閱操作"
 
-#: ../user/forum_thread.php:61
+#: ../user/forum_thread.php:66
 msgid "This forum is not visible to you."
 msgstr "您不能查看本論壇。"
 
-#: ../user/forum_thread.php:69
+#: ../user/forum_thread.php:74
 msgid "This thread has been hidden by moderators."
 msgstr "主題已被管理員隱藏"
 
-#: ../user/forum_thread.php:128
+#: ../user/forum_thread.php:129
 msgid "My question was answered"
 msgstr "我的問題已得到解答"
 
-#: ../user/forum_thread.php:129
+#: ../user/forum_thread.php:130
 msgid "Click here if your question has been adequately answered"
 msgstr "如果您的問題已經得到充分的解答,請點擊這裡"
 
-#: ../user/forum_thread.php:137
+#: ../user/forum_thread.php:138
 msgid "I've also got this question"
 msgstr "我也有同樣的問題"
 
-#: ../user/forum_thread.php:159 ../user/forum_thread.php:275
+#: ../user/forum_thread.php:160 ../user/forum_thread.php:285
 msgid "Add a new message to this thread"
 msgstr "回覆本主題"
 
-#: ../user/forum_thread.php:171
+#: ../user/forum_thread.php:172
 msgid "Unsubscribe"
 msgstr "退訂主題"
 
-#: ../user/forum_thread.php:172
+#: ../user/forum_thread.php:173
 msgid "You are subscribed to this thread.  Click here to unsubscribe."
 msgstr "您已經訂閱了本主題。點擊這裡取消訂閱。"
 
-#: ../user/forum_thread.php:178
+#: ../user/forum_thread.php:179
 msgid "Subscribe"
 msgstr "訂閱該主題"
 
-#: ../user/forum_thread.php:179
+#: ../user/forum_thread.php:180
 msgid "Click to get email when there are new posts in this thread"
 msgstr "如果您需要在本主題中有新的回帖時通過電子郵件通知你請點擊。"
 
-#: ../user/forum_thread.php:190
+#: ../user/forum_thread.php:191
 msgid "Unhide this thread"
 msgstr "取消隱藏本主題"
 
-#: ../user/forum_thread.php:196
+#: ../user/forum_thread.php:197
 msgid "Hide this thread"
 msgstr "隱藏本主題"
 
-#: ../user/forum_thread.php:202
+#: ../user/forum_thread.php:203
 msgid "Make unsticky"
 msgstr "取消置頂"
 
-#: ../user/forum_thread.php:203
+#: ../user/forum_thread.php:204
 msgid "Make this thread not sticky"
 msgstr "取消本主題的置頂"
 
-#: ../user/forum_thread.php:208
+#: ../user/forum_thread.php:209
 msgid "Make sticky"
 msgstr "置頂"
 
-#: ../user/forum_thread.php:209
-msgid "Make this thread sticky"
-msgstr "將本主題置頂顯示"
+#: ../user/forum_thread.php:210
+msgid "Make this thread always appear at top of forum"
+msgstr "使得這個帖子總是在論壇的頂端顯示"
 
-#: ../user/forum_thread.php:215
+#: ../user/forum_thread.php:216
 msgid "Unlock"
 msgstr "解鎖"
 
-#: ../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 "不要將新聞項目匯出通知"
+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的帖子"
+msgstr "%1的文章"
 
-#: ../user/friend.php:33
+#: ../user/friend.php:35
 msgid "Already friends"
 msgstr "已經是好友"
 
-#: ../user/friend.php:39
+#: ../user/friend.php:41
 msgid "You requested friendship with %1 on %2."
 msgstr "您已經給 %1 發送過好友請求(%2)。"
 
-#: ../user/friend.php:41
+#: ../user/friend.php:43
 msgid "This request is still pending confirmation."
 msgstr "請求仍在等待對方確認。"
 
-#: ../user/friend.php:52
+#: ../user/friend.php:54
 msgid "%1 is not accepting friendship requests from you"
 msgstr "%1 沒有接受您的好友請求"
 
-#: ../user/friend.php:61
+#: ../user/friend.php:63
 msgid "You can't be friends with yourself"
 msgstr "您不能加自己為好友"
 
-#: ../user/friend.php:69
+#: ../user/friend.php:71
 msgid "Add friend"
 msgstr "新增好友"
 
-#: ../user/friend.php:74
+#: ../user/friend.php:76
 msgid ""
 "You have asked to add %1 as a friend. We will notify %1 and will ask him/her"
 " to confirm that you are friends."
 msgstr "您已經要求將 %1 加為好友,我們將通知 %1 並請他/她來確認你們的關係。"
 
-#: ../user/friend.php:77
+#: ../user/friend.php:79
 msgid "Add an optional message here:"
 msgstr "可以在這裡添加附加訊息:"
 
-#: ../user/friend.php:115
+#: ../user/friend.php:117
 msgid "Friend request sent"
 msgstr "好友請求已發送"
 
-#: ../user/friend.php:116
+#: ../user/friend.php:118
 msgid "We have notified %1 of your request."
 msgstr "我們已經把您的好友請求通知 %1。"
 
-#: ../user/friend.php:126
+#: ../user/friend.php:128
 msgid "Please log in as %1"
 msgstr "請以 %1 的身份登入"
 
-#: ../user/friend.php:127
+#: ../user/friend.php:129
 msgid "You must log in as %1 to view this friend request"
 msgstr "您必須以 %1 的身份登入才能查看該好友請求"
 
-#: ../user/friend.php:138
+#: ../user/friend.php:140
 msgid "Friend request"
 msgstr "好友請求"
 
-#: ../user/friend.php:141
+#: ../user/friend.php:143
 msgid "%1 has requested friendship with you."
 msgstr "%1 發送了好友請求給你。"
 
-#: ../user/friend.php:143
+#: ../user/friend.php:145
 msgid "%1 says: %2"
 msgstr "%1 還說:%2"
 
-#: ../user/friend.php:146
+#: ../user/friend.php:148
 msgid "Accept friendship"
 msgstr "接受好友請求"
 
-#: ../user/friend.php:146
+#: ../user/friend.php:148
 msgid "Click accept if %1 is in fact a friend"
 msgstr "如果 %1 是你的好友請點擊接受"
 
-#: ../user/friend.php:147
+#: ../user/friend.php:149
 msgid "Decline"
 msgstr "拒絕"
 
-#: ../user/friend.php:147
+#: ../user/friend.php:149
 msgid "Click decline if %1 is not a friend"
 msgstr "如果 %1 不是你的好友請點擊拒絕"
 
-#: ../user/friend.php:186
+#: ../user/friend.php:188
 msgid "Friendship confirmed"
 msgstr "好友請求已確認"
 
-#: ../user/friend.php:187
+#: ../user/friend.php:189
 msgid "Your friendship with %1 has been confirmed."
 msgstr "你與 %1 的好友關係已經被確認。"
 
-#: ../user/friend.php:205
+#: ../user/friend.php:207
 msgid "Friendship declined"
 msgstr "好友請求被拒絕"
 
-#: ../user/friend.php:206
+#: ../user/friend.php:208
 msgid "You have declined friendship with %1"
 msgstr "你已經拒絕了與 %1 的好友關係"
 
-#: ../user/friend.php:221
+#: ../user/friend.php:223
 msgid "Notification not found"
 msgstr "無法找到通知"
 
-#: ../user/friend.php:223
+#: ../user/friend.php:225
 msgid "Friend confirmed"
 msgstr "好友已確認"
 
-#: ../user/friend.php:224
+#: ../user/friend.php:226
 msgid "You are now friends with %1."
 msgstr "你現在和 %1 是好友了。"
 
-#: ../user/friend.php:232
+#: ../user/friend.php:234
 msgid "Cancel friendship?"
 msgstr "刪除好友"
 
-#: ../user/friend.php:234
+#: ../user/friend.php:236
 msgid "Are you sure you want to cancel your friendship with %1?"
 msgstr "你確定想要取消與 %1 的好友關係嗎?"
 
-#: ../user/friend.php:239
+#: ../user/friend.php:241
 msgid "Stay friends"
 msgstr "保持好友關係"
 
-#: ../user/friend.php:249
+#: ../user/friend.php:251
 msgid "Friendship cancelled"
 msgstr "好友關係已取消"
 
-#: ../user/friend.php:250
+#: ../user/friend.php:252
 msgid "Your friendship with %1 has been cancelled."
 msgstr "你與 %1 的好友關係已經取消。"
 
-#: ../user/get_passwd.php:25
-msgid "Forgot your account info?"
-msgstr "忘記了你的帳戶資訊?"
-
-#: ../user/get_passwd.php:28
+#: ../user/get_passwd.php:27
 msgid ""
 "1) If you know your account's email address, and you can receive email "
 "there:"
 msgstr "1) 如果你知道你帳戶連結的電子郵件地址,你可以在那裡收到電子郵件:"
 
-#: ../user/get_passwd.php:29
+#: ../user/get_passwd.php:28
 msgid ""
 "Enter the email address below, and click OK. You will be sent email "
 "instructions for resetting your password."
@@ -4412,15 +4506,24 @@ msgstr "你現在將登入進自己的帳戶,可以更新你的電子郵件和
 msgid "Log in with authenticator"
 msgstr "用身份驗證碼(authenticator)來登入"
 
-#: ../user/gpu_list.php:126 ../user/gpu_list.php:152
+#: ../user/get_passwd.php:81
+msgid "Forgot your account info?"
+msgstr "忘記了你的帳戶資訊?"
+
+#: ../user/gpu_list.php:150 ../user/gpu_list.php:176
 msgid "No GPU tasks reported"
 msgstr "還沒有已上傳的 GPU 運算任務"
 
-#: ../user/gpu_list.php:183
+#: ../user/gpu_list.php:206
+msgid "Top GPU models"
+msgstr "GPU 型號排名"
+
+#: ../user/gpu_list.php:207
 msgid ""
 "The following lists show the most productive GPU models on different "
-"platforms.  Relative speeds are shown in parentheses."
-msgstr "下面的列表顯示了各個平台上效率最好的 GPU 型號,不同型號間的速度差異用百分比來表示。"
+"platforms.  Relative speeds, measured by average elapsed time of tasks, are "
+"shown in parentheses."
+msgstr "下面的列表顯示了各個平臺上效率最好的 GPU 型號,這些速度由任務平均完成時間計算得到,不同型號間的速度差異用百分比來表示。"
 
 #: ../user/home.php:42
 msgid "Welcome to %1"
@@ -4434,6 +4537,10 @@ msgstr "使用下面的連結查看及編輯你的帳戶偏好設定"
 msgid "If you have not already done so, %1download BOINC client software%2."
 msgstr "如果還沒有的話,%1下載 BOINC 的客戶端軟體%2。"
 
+#: ../user/home.php:49 ../project.sample/project.inc:70
+msgid "Your account"
+msgstr "您的帳號"
+
 #: ../user/host_app_versions.php:37
 msgid "Anonymous platform, missing app"
 msgstr "匿名平台,未知程式"
@@ -4548,10 +4655,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 "主機位置已更新"
@@ -4633,6 +4744,10 @@ msgstr "圖片,高度不能超出 450 像素,請不要在未經允許的情
 msgid "You can also use ampersand notation for special characters."
 msgstr "你也可以使用&(和號)開頭的字符實體來表示特殊字符(比如  等)。"
 
+#: ../user/info.php:24 ../user/sample_index.php:78
+msgid "Read our rules and policies"
+msgstr "閱讀規定和政策"
+
 #: ../user/info.php:35
 msgid "Run %1 only on authorized computers"
 msgstr "僅在已授權的電腦上執行 %1"
@@ -4804,29 +4919,9 @@ msgstr "使用瀏覽器的語言設置"
 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 "電子郵件地址:"
-
-#: ../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 "保持登入狀態"
+msgstr "翻譯工作都是由志工完成的,如果沒有您的語言,%1您可以自行翻譯%2。"
 
-#: ../user/login_form.php:62
+#: ../user/login_form.php:57
 msgid "or %1create an account%2."
 msgstr "或者%1創建一個新帳戶%2。"
 
@@ -4950,250 +5045,255 @@ msgstr "你目前沒有私人消息。"
 msgid "Sender and date"
 msgstr "發送人及日期"
 
-#: ../user/pm.php:106
+#: ../user/pm.php:111
 msgid "Reply to this message"
 msgstr "回覆該消息"
 
-#: ../user/pm.php:107
+#: ../user/pm.php:112
 msgid "Delete this message"
 msgstr "刪除該消息"
 
-#: ../user/pm.php:112
+#: ../user/pm.php:117
 msgid "Select all"
 msgstr "全選"
 
-#: ../user/pm.php:114
+#: ../user/pm.php:119
 msgid "Unselect all"
 msgstr "取消全選"
 
-#: ../user/pm.php:117
+#: ../user/pm.php:122
 msgid "Delete selected messages"
 msgstr "刪除選中的消息"
 
-#: ../user/pm.php:140
+#: ../user/pm.php:145
 msgid "Sender"
 msgstr "發送人"
 
-#: ../user/pm.php:143
+#: ../user/pm.php:148
 msgid "Date"
 msgstr "日期"
 
-#: ../user/pm.php:185
+#: ../user/pm.php:190
 msgid "You need to fill all fields to send a private message"
 msgstr "要發送私人消息,你必須填寫所有字段"
 
-#: ../user/pm.php:188
+#: ../user/pm.php:193
 msgid ""
 "Your message was flagged as spam\n"
 "                by the Akismet anti-spam system.\n"
 "                Please modify your text and try again."
 msgstr "你的消息已被 Akismet 防垃圾信息系統\n標記為垃圾信息,請修改你輸入的內容並重試。"
 
-#: ../user/pm.php:205
+#: ../user/pm.php:210
 msgid "Could not find user with id %1"
 msgstr "無法找到ID為 %1 的用戶"
 
-#: ../user/pm.php:210
+#: ../user/pm.php:215
 msgid "Could not find user with username %1"
 msgstr "無法找到名為 %1 的用戶"
 
-#: ../user/pm.php:212
+#. Non-unique username
+#: ../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 Manager裡的%2更新%3命令。"
 
-#: ../user/prefs.php:41
+#: ../user/prefs.php:42
 msgid ""
 "Your preferences have been reset to the defaults, and\n"
 "          will take effect when your computer communicates with %1\n"
 "          or you issue the %2Update%3 command from the BOINC Manager."
 msgstr "您的偏好設定已還原為預設值\n將在你的電腦與%1進行通訊的時候生效\n或者你也可以直接執行 BOINC 客戶端裡的%2更新%3。"
 
-#: ../user/prefs_edit.php:65 ../user/prefs_edit.php:93
+#: ../user/prefs_edit.php:66 ../user/prefs_edit.php:94
 msgid "%1 for %2"
 msgstr "%1(用於%2)"
 
-#: ../user/prefs_edit.php:110
+#: ../user/prefs_edit.php:112
 msgid "Back to preferences"
 msgstr "回到偏好設定"
 
-#: ../user/prefs_remove.php:45
+#: ../user/prefs_remove.php:46
 msgid "Confirm delete preferences"
 msgstr "確定刪除偏好設定"
 
-#: ../user/prefs_remove.php:48
+#: ../user/prefs_remove.php:49
 msgid "Are you sure you want to delete your separate %1 preferences for %2?"
 msgstr "你確定要刪除%1偏好設定(用於%2)嗎?"
 
-#: ../user/prefs_remove.php:52
+#: ../user/prefs_remove.php:53
 msgid "Remove preferences"
 msgstr "移除偏好設定"
 
-#: ../user/prefs_remove.php:54
+#: ../user/prefs_remove.php:55
 msgid "Cancel"
 msgstr "取消"
 
-#: ../user/profile_menu.php:35
+#: ../user/profile_menu.php:34 ../user/sample_index.php:119
+msgid "Profiles"
+msgstr "用戶檔案"
+
+#: ../user/profile_menu.php:37
 msgid ""
 "%1Profiles%2 let individuals share backgrounds and opinions with the %3 "
 "community."
 msgstr "通過%1用戶檔案%2參與者可以和%3社區分享他的背景和觀點。"
 
-#: ../user/profile_menu.php:36
+#: ../user/profile_menu.php:38
 msgid ""
 "Explore the diversity of your fellow volunteers, and contribute your own "
 "views for others to enjoy."
 msgstr "可以了解其他參與者的想法,也可以讓他人看到你分享的觀點。"
 
-#: ../user/profile_menu.php:37
+#: ../user/profile_menu.php:39
 msgid ""
 "If you haven't already, you can %1create your own user profile%2 for others "
 "to see!"
 msgstr "如果你還沒有用戶檔案的話,你現在就可以%1建立屬於你自己的用戶檔案了%2!"
 
-#: ../user/profile_menu.php:42
+#: ../user/profile_menu.php:44
 msgid "User of the Day"
 msgstr "每日用戶"
 
-#: ../user/profile_menu.php:57
+#: ../user/profile_menu.php:59
 msgid "User Profile Explorer"
 msgstr "使用用戶檔案瀏覽器"
 
-#: ../user/profile_menu.php:60
+#: ../user/profile_menu.php:62
 msgid "View the %1User Picture Gallery%2."
 msgstr "查看%1用戶圖片庫%2。"
 
-#: ../user/profile_menu.php:61
+#: ../user/profile_menu.php:63
 msgid "Browse profiles %1by country%2."
 msgstr "%1按國家或地區%2瀏覽用戶檔案。"
 
-#: ../user/profile_menu.php:62
+#: ../user/profile_menu.php:64
 msgid ""
 "Browse profiles %1at random%2, %3at random with pictures%2, or %4at random "
 "without pictures%2."
 msgstr "%1隨機地瀏覽所有用戶檔案%2,%3隨機地瀏覽帶圖片的用戶檔案%2,或者%4隨機地瀏覽不帶圖片%2的用戶檔案。"
 
-#: ../user/profile_menu.php:66
+#: ../user/profile_menu.php:68
 msgid "Alphabetical profile listings:"
 msgstr "按字母表順序的用戶檔案列表:"
 
-#: ../user/profile_menu.php:72
+#: ../user/profile_menu.php:74
 msgid "Search profile text"
 msgstr "搜索用戶檔案文件"
 
-#: ../user/profile_menu.php:98
+#: ../user/profile_menu.php:100
 msgid "No profiles"
 msgstr "沒有用戶檔案"
 
-#: ../user/profile_menu.php:99
+#: ../user/profile_menu.php:101
 msgid "No profiles matched your query."
 msgstr "沒有用戶檔案符合你的查詢條件。"
 
-#: ../user/profile_rate.php:29
+#: ../user/profile_rate.php:31
 msgid "Invalid vote type:"
 msgstr "錯誤的投票類型:"
 
-#: ../user/profile_rate.php:34
+#: ../user/profile_rate.php:36
 msgid "Vote Recorded"
 msgstr "投票已記錄"
 
-#: ../user/profile_rate.php:38
+#: ../user/profile_rate.php:40
 msgid "Thank you"
 msgstr "非常感謝"
 
-#: ../user/profile_rate.php:41
+#: ../user/profile_rate.php:43
 msgid "Your recommendation has been recorded."
 msgstr "你的推薦已經被記錄下來。"
 
-#: ../user/profile_rate.php:43
+#: ../user/profile_rate.php:45
 msgid "Your vote to reject this profile has been recorded."
 msgstr "你對該用戶檔案的反感已經被記錄下來。"
 
-#: ../user/profile_rate.php:46
+#: ../user/profile_rate.php:48
 msgid "Return to profile."
 msgstr "返回用戶檔案。"
 
-#: ../user/profile_search_action.php:36
+#: ../user/profile_search_action.php:38
 msgid "Profiles containing '%1'"
 msgstr "包含'%1'的個人檔案"
 
-#: ../user/profile_search_action.php:40
+#: ../user/profile_search_action.php:42
 msgid "User name"
 msgstr "用戶名稱"
 
-#: ../user/profile_search_action.php:41
+#: ../user/profile_search_action.php:43
 msgid "Joined project"
 msgstr "加入的專案"
 
-#: ../user/profile_search_action.php:44
+#: ../user/profile_search_action.php:46
 msgid "Recent credit"
 msgstr "近期平均積分"
 
-#: ../user/profile_search_action.php:54
+#: ../user/profile_search_action.php:56
 msgid "No profiles found containing '%1'"
 msgstr "沒有找到包含'%1'的個人檔案"
 
-#: ../user/result.php:35
-msgid "Task %1"
-msgstr "任務 %1"
+#: ../user/result.php:33
+msgid "No such task:"
+msgstr "此任務不存在:"
 
 #: ../user/results.php:29
 msgid "This feature is turned off temporarily"
@@ -5213,151 +5313,63 @@ msgstr "用戶 ID 或 主機 ID 丟失"
 
 #: ../user/results.php:107
 msgid "No tasks to display"
-msgstr "沒有任務可以顯示"
+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:125
+msgid "Database schema version: "
+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
+#: ../user/server_status.php:138
 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:153
 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:165
 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:168
+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:169
+msgid "Users in last 24 hours"
+msgstr "最近24小時的用戶"
 
 #: ../user/show_host_detail.php:40
 msgid "Computer %1"
@@ -5367,679 +5379,702 @@ 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
+#. Now display what we've got (either gotten from cache or from DB)
+#: ../user/stats.php:32 ../user/top_users.php:117
+msgid "Top participants"
+msgstr "用戶排名"
+
+#: ../user/stats.php:40 ../user/team.php:48
+msgid "Top teams"
+msgstr "團隊排名"
+
+#: ../user/stats.php:47
+msgid "Top computers"
+msgstr "電腦排名"
+
+#: ../user/stats.php:48
+msgid "GPU models"
+msgstr "GPU型號"
+
+#: ../user/stats.php:49
+msgid "CPU models"
+msgstr "CPU型號"
+
+#: ../user/stats.php:53
 msgid ""
 "More detailed statistics for %1 and other BOINC-based projects are available"
 " at several web sites:"
 msgstr "下列幾個網站可以查詢到關於 %1 和其它 BOINC 專案的更詳細的統計訊息:"
 
-#: ../user/stats.php:40
+#: ../user/stats.php:56
 msgid ""
 "You can also get your current statistics in the form of a \"signature "
 "image\":"
 msgstr "你還可以通過“簽名圖片”的形式得到你當前的統計訊息:"
 
-#: ../user/stats.php:43
+#: ../user/stats.php:59
 msgid ""
 "Additionally you can get your individual statistics summed across all BOINC "
 "projects from several sites; see your %1home page%2."
-msgstr "另外,你還可以在你的 %1帳戶主頁面%2 中查看所有你參加的 BOINC 專案中的個人統計訊息。"
+msgstr "另外,你還可以在你的%1帳戶頁面%2中查看所有你參加 BOINC 專案中的個人統計訊息。"
 
 #: ../user/team.php:27
+msgid "Teams"
+msgstr "團隊"
+
+#: ../user/team.php:29
 msgid "%1 participants may form %2teams%3."
 msgstr "%1 的用戶可以組成 %2團隊%3"
 
-#: ../user/team.php:29
+#: ../user/team.php:31
 msgid ""
 "You may belong to only one team. You can join or quit a team at any time."
 msgstr "你最多只能加入一個團隊。你可以在任何時候加入或退出一個團隊。"
 
-#: ../user/team.php:31
+#: ../user/team.php:33
 msgid "Each team has a %1founder%2 who may:"
 msgstr "每個團隊都有一個%1創始人%2,他可以:"
 
-#: ../user/team.php:33
+#: ../user/team.php:35
 msgid "access team members' email addresses"
 msgstr "造訪團隊成員的電子郵件地址"
 
-#: ../user/team.php:34
+#: ../user/team.php:36
 msgid "edit the team's name and description"
 msgstr "編輯團隊的名稱及描述"
 
-#: ../user/team.php:35
+#: ../user/team.php:37
 msgid "add or remove team admins"
 msgstr "增加或移除團隊管理員"
 
-#: ../user/team.php:36
+#: ../user/team.php:38
 msgid "remove members from the team"
 msgstr "移除團隊中的成員"
 
-#: ../user/team.php:37
+#: ../user/team.php:39
 msgid "disband a team if it has no members"
 msgstr "解散沒有成員的團隊"
 
-#: ../user/team.php:40
+#: ../user/team.php:42
 msgid "To join a team, visit its team page and click %1Join this team%2."
 msgstr "要加入一個團隊,請訪問該團隊頁面並點擊 %1加入該團隊%2。"
 
-#: ../user/team.php:41 ../user/team_search.php:180
+#: ../user/team.php:43 ../user/team_search.php:201
 msgid "Find a team"
 msgstr "尋找團隊"
 
-#: ../user/team.php:48
+#: ../user/team.php:50
 msgid "All teams"
 msgstr "所有團隊"
 
-#: ../user/team.php:52
+#: ../user/team.php:54
 msgid "%1 teams"
 msgstr "%1 團隊"
 
-#: ../user/team.php:58
+#: ../user/team.php:60
 msgid "Create a new team"
 msgstr "建立新團隊"
 
-#: ../user/team.php:59
+#: ../user/team.php:61
 msgid ""
 "If you cannot find a team that is right for you, you can %1create a team%2."
 msgstr "如果你找不到適合你的團隊,你可以 %1創建一個團隊%2。"
 
-#: ../user/team_admins.php:34
+#: ../user/team_admins.php:36
 msgid "Remove Team Admin status from this member"
 msgstr "從該成員移除團隊管理員狀態"
 
-#: ../user/team_admins.php:40 ../user/team_admins.php:51
+#: ../user/team_admins.php:42 ../user/team_admins.php:53
 msgid "Add or remove Team Admins"
 msgstr "增加或移除團隊管理員"
 
-#: ../user/team_admins.php:41
+#: ../user/team_admins.php:43
 msgid "You can select team members as 'Team Admins'. Team Admins can:"
 msgstr "你可以將部分團隊成員設置為“團隊管理員”,團隊管理員可以:"
 
-#: ../user/team_admins.php:43
+#: ../user/team_admins.php:45
 msgid "Edit team information (name, URL, description, country)"
 msgstr "編輯團隊資訊(名稱,網址,描述,國家)"
 
-#: ../user/team_admins.php:44
+#: ../user/team_admins.php:46
 msgid "View the team's join/quit history"
 msgstr "查看團隊的成員加入/退出歷史"
 
-#: ../user/team_admins.php:45
+#: ../user/team_admins.php:47
 msgid ""
 "Moderate the team forum, if any (admins get email notification of moderation"
 " events and red X reports)"
 msgstr "管理團隊論壇(團隊管理員會得到管理事件和報告的電子郵件通知)"
 
-#: ../user/team_admins.php:47
+#: ../user/team_admins.php:49
 msgid "Team Admins cannot:"
 msgstr "團隊管理員不可以:"
 
-#: ../user/team_admins.php:49
+#: ../user/team_admins.php:51
 msgid "Change the team founder"
 msgstr "改變團隊創始人"
 
-#: ../user/team_admins.php:50 ../user/team_manage.php:54
+#: ../user/team_admins.php:52 ../user/team_manage.php:56
 msgid "Remove members"
 msgstr "移除團隊成員"
 
-#: ../user/team_admins.php:53
+#: ../user/team_admins.php:55
 msgid "If a Team Admin quits the team, they cease to be a Team Admin."
 msgstr "如果團隊管理員退出團隊,其團隊管理員的角色同時取消。"
 
-#: ../user/team_admins.php:54
+#: ../user/team_admins.php:56
 msgid ""
 "We recommend that you select only people you know and trust very well as "
 "Team Admins."
 msgstr "我們建議你只選擇自己了解或信任的成員作為團隊管理員。"
 
-#: ../user/team_admins.php:59
+#: ../user/team_admins.php:61
 msgid "There are currently no Team Admins"
 msgstr "目前沒有團隊管理員"
 
-#: ../user/team_admins.php:61
+#: ../user/team_admins.php:63
 msgid "Current Team Admins"
 msgstr "目前的團隊管理員"
 
-#: ../user/team_admins.php:62
+#: ../user/team_admins.php:64
 msgid "Became Team Admin on"
 msgstr "成為團隊管理員"
 
-#: ../user/team_admins.php:77
+#: ../user/team_admins.php:79
 msgid "Add Team Admin"
 msgstr "增加團隊管理員"
 
-#: ../user/team_admins.php:78
+#: ../user/team_admins.php:80
 msgid "Email address of team member:"
 msgstr "團隊成員的電子郵件地址:"
 
-#: ../user/team_admins.php:90
+#: ../user/team_admins.php:81
+msgid "Add"
+msgstr "新增"
+
+#: ../user/team_admins.php:92
 msgid "failed to remove admin"
 msgstr "移除管理員時出錯"
 
-#: ../user/team_admins.php:99
+#: ../user/team_admins.php:101
 msgid "User is not member of team"
 msgstr "用戶不是團隊成員"
 
-#: ../user/team_admins.php:101
+#: ../user/team_admins.php:103
 msgid "%1 is already an admin of %2"
 msgstr "%1 已經是 %2 的管理員"
 
-#: ../user/team_admins.php:105
+#: ../user/team_admins.php:107
 msgid "Couldn't add admin"
 msgstr "不能增加管理員"
 
-#: ../user/team_admins.php:111 ../user/team_manage.php:85
-#: ../user/team_quit_form.php:28 ../user/team_remove_inactive_action.php:28
+#: ../user/team_admins.php:113 ../user/team_manage.php:85
+#: ../user/team_quit_form.php:30 ../user/team_remove_inactive_action.php:30
 msgid "No such team"
 msgstr "沒有符合的團隊"
 
-#: ../user/team_change_founder_action.php:30
-#: ../user/team_change_founder_form.php:33 ../user/team_display.php:67
-#: ../user/team_edit_action.php:30 ../user/team_edit_form.php:29
-#: ../user/team_email_list.php:55
+#: ../user/team_change_founder_action.php:32
+#: ../user/team_change_founder_form.php:35 ../user/team_display.php:69
+#: ../user/team_edit_action.php:32 ../user/team_edit_form.php:31
+#: ../user/team_email_list.php:64
 msgid "no such team"
 msgstr "沒有符合的團隊"
 
-#: ../user/team_change_founder_action.php:38
+#: ../user/team_change_founder_action.php:40
 msgid "User is not a member of %1"
 msgstr "用戶不是 %1 的成員"
 
-#: ../user/team_change_founder_action.php:41
+#: ../user/team_change_founder_action.php:43
 msgid "Changing founder of %1"
 msgstr "正在改變 %1 的創始人"
 
-#: ../user/team_change_founder_action.php:43
+#: ../user/team_change_founder_action.php:45
 msgid "%1 is now founder of %2"
 msgstr "%1 現在是 %2 的創始人了"
 
-#: ../user/team_change_founder_form.php:37
+#: ../user/team_change_founder_form.php:39
 msgid "Change founder of %1"
 msgstr "改變 %1 的創始人"
 
-#: ../user/team_change_founder_form.php:43
+#: ../user/team_change_founder_form.php:45
 msgid ""
 "Team member %1 requested this team's foundership on %2, but left the team, "
 "thus canceling the request."
 msgstr "團隊成員 %1 在請求 %2 的創始人資格之後退出了團隊,請求自動取消。"
 
-#: ../user/team_change_founder_form.php:49
+#: ../user/team_change_founder_form.php:51
 msgid ""
 "Team member %1 has requested this team's foundership. This may be because "
 "you left the team or haven't had contact with the team for a long time."
 msgstr "團隊成員%1 請求了這個團隊的創始人資格,這可能是因為你離開過團隊或者有較長時間沒有和團隊聯繫。"
 
-#: ../user/team_change_founder_form.php:55
+#: ../user/team_change_founder_form.php:57
 msgid "decline request"
 msgstr "拒絕請求"
 
-#: ../user/team_change_founder_form.php:58
+#: ../user/team_change_founder_form.php:60
 msgid ""
 "If you don't decline the request by %1, %2 will have the option of assuming team foundership.<br /><br />\n"
 "                  To accept the request, assign foundership to %3 using the form below."
 msgstr "如果你不拒絕 %1 的請求,%2 將可以得到團隊創始人的資格。 <br /><br />\n如果要接受請求,並將創始人資格授予 %3,請使用下面的表格。"
 
-#: ../user/team_change_founder_form.php:66
+#: ../user/team_change_founder_form.php:68
 msgid "No transfer request is pending."
 msgstr "目前沒有等待處理的轉換請求。"
 
-#: ../user/team_change_founder_form.php:69
+#: ../user/team_change_founder_form.php:71
 msgid ""
 "To assign foundership of this team to another member, check the box next to "
 "member name and click <strong>Change founder</strong> below."
 msgstr "要將團隊的創始人資格授予另一位成員,請先選中成員名旁邊的選擇框,然後點擊下面的<strong>更改創始人</strong>。"
 
-#: ../user/team_change_founder_form.php:76
+#: ../user/team_change_founder_form.php:78
 msgid "New founder?"
 msgstr "新的團隊創始人?"
 
-#: ../user/team_change_founder_form.php:105 ../user/team_manage.php:56
+#: ../user/team_change_founder_form.php:107 ../user/team_manage.php:58
 msgid "Change founder"
 msgstr "更改團隊創始人"
 
-#: ../user/team_change_founder_form.php:108
+#: ../user/team_change_founder_form.php:110
 msgid "There are no users to transfer team to."
 msgstr "目前沒有用戶變更團隊。"
 
-#: ../user/team_create_action.php:29
+#: ../user/team_create_action.php:31
 msgid "You must choose a non-blank team name"
 msgstr "你必須選擇一個非空的團隊名稱"
 
-#: ../user/team_create_action.php:34
+#: ../user/team_create_action.php:36
 msgid "A team named %1 already exists - try another name"
 msgstr "名為 %1 的團隊已經存在 - 請嘗試其它的名稱"
 
-#: ../user/team_create_action.php:54
+#: ../user/team_create_action.php:56
 msgid "Could not create team - please try later."
 msgstr "無法建立團隊 - 請稍後再試。"
 
-#: ../user/team_create_form.php:27 ../user/team_create_form.php:32
+#: ../user/team_create_form.php:29 ../user/team_create_form.php:34
 msgid "Create a team"
 msgstr "建立團隊"
 
-#: ../user/team_create_form.php:30
+#: ../user/team_create_form.php:32
 msgid ""
 "You belong to %1. You must %2quit this team%3 before creating a new one."
 msgstr "你已加入了 %1,你在建立新團隊之前必須先 %2退出這個團隊%3。"
 
-#: ../user/team_delta.php:65
+#: ../user/team_delta.php:66
 msgid "Not founder or admin"
 msgstr "沒有創始人或團隊管理員"
 
-#: ../user/team_delta.php:72
+#: ../user/team_delta.php:73
 msgid "Team history for %1"
 msgstr "%1 的團隊歷史"
 
-#: ../user/team_delta.php:75
+#: ../user/team_delta.php:76
 msgid "When"
 msgstr "時間"
 
-#: ../user/team_delta.php:76
+#: ../user/team_delta.php:77
 msgid "User"
 msgstr "用戶"
 
-#: ../user/team_delta.php:77
+#: ../user/team_delta.php:78
 msgid "Action"
 msgstr "行為"
 
-#: ../user/team_delta.php:78
+#: ../user/team_delta.php:79
 msgid "Total credit at time of action"
 msgstr "當時的總積分"
 
-#: ../user/team_edit_action.php:53
+#: ../user/team_edit_action.php:55
 msgid "bad country"
 msgstr "國家錯誤"
 
-#: ../user/team_edit_action.php:59
+#: ../user/team_edit_action.php:61
 msgid "The name '%1' is being used by another team."
 msgstr "名稱“%1”已經被其它團隊使用。"
 
-#: ../user/team_edit_action.php:62
+#: ../user/team_edit_action.php:64
 msgid "Must specify team name"
 msgstr "必須指定團隊名稱"
 
-#: ../user/team_edit_action.php:90
+#: ../user/team_edit_action.php:92
 msgid "Could not update team - please try again later."
 msgstr "無法更新團隊 - 請稍後再試。"
 
-#: ../user/team_edit_form.php:33
+#: ../user/team_edit_form.php:35
 msgid "Edit %1"
 msgstr "編輯 %1"
 
-#: ../user/team_edit_form.php:34
+#: ../user/team_edit_form.php:36
 msgid "Update team info"
 msgstr "更新團隊資訊"
 
-#: ../user/team_email_list.php:61
+#: ../user/team_email_list.php:70
 msgid "%1 Email List"
 msgstr "%1 電子郵件列表"
 
-#: ../user/team_email_list.php:63
+#: ../user/team_email_list.php:72
 msgid "Member list of %1"
 msgstr "%1 的成員列表"
 
-#: ../user/team_email_list.php:78
+#: ../user/team_email_list.php:87
 msgid "Show as plain text"
 msgstr "顯示為純文字"
 
-#: ../user/team_forum.php:28 ../user/team_forum.php:39
+#: ../user/team_forum.php:30 ../user/team_forum.php:41
 msgid "Create Message Board"
 msgstr "建立留言版"
 
-#: ../user/team_forum.php:29
+#: ../user/team_forum.php:31
 msgid "You may create a message board for use by %1."
 msgstr "你可以建立一個僅供 %1 使用的留言板。"
 
-#: ../user/team_forum.php:31
+#: ../user/team_forum.php:33
 msgid "Only team members will be able to post."
 msgstr "只有團隊成員可以發文。"
 
-#: ../user/team_forum.php:32
+#: ../user/team_forum.php:34
 msgid "At your option, only members will be able to read."
 msgstr "還可以設置是否只允許團隊成員進行閱讀。"
 
-#: ../user/team_forum.php:33
+#: ../user/team_forum.php:35
 msgid "You and your Team Admins will have moderator privileges."
 msgstr "你和你的團隊管理員擁有管理權限。"
 
-#: ../user/team_forum.php:40
+#: ../user/team_forum.php:42
 msgid "Create a message board for %1"
 msgstr "建立一個 %1 的留言板"
 
-#: ../user/team_forum.php:48
+#: ../user/team_forum.php:50
 msgid "Team already has a message board"
 msgstr "團隊已經擁有留言板了"
 
-#: ../user/team_forum.php:59
+#: ../user/team_forum.php:61
 msgid "Team Message Board"
 msgstr "團隊留言版"
 
-#: ../user/team_forum.php:71
+#: ../user/team_forum.php:73
 msgid "Minimum time between posts (seconds)"
 msgstr "最小發文間隔(秒)"
 
-#: ../user/team_forum.php:74
+#: ../user/team_forum.php:76
 msgid "Minimum total credit to post"
 msgstr "發文要求的最低總積分"
 
-#: ../user/team_forum.php:77
+#: ../user/team_forum.php:79
 msgid "Minimum average credit to post"
 msgstr "發文要求的最低平均積分"
 
-#: ../user/team_forum.php:80
+#: ../user/team_forum.php:82
 msgid "Submit"
 msgstr "提交"
 
-#: ../user/team_forum.php:89
+#: ../user/team_forum.php:91
 msgid "Remove your team's message board."
 msgstr "移除團隊留言版"
 
-#: ../user/team_forum.php:97
+#: ../user/team_forum.php:99
 msgid "Really remove message board?"
 msgstr "確定要移除留言版嗎?"
 
-#: ../user/team_forum.php:98
+#: ../user/team_forum.php:100
 msgid ""
 "Are you sure you want to remove your team's message board? All threads and "
 "posts will be permanently removed. (You may, however, create a new message "
 "board later)."
 msgstr "你確定要移除團隊的留言板嗎?所有的主題和文章將永久刪除。 (當然,你之後還可以重新建立一個新的留言板。)"
 
-#: ../user/team_forum.php:100
+#: ../user/team_forum.php:102
 msgid "Yes - remove message board"
 msgstr "是的 - 移除留言板"
 
-#: ../user/team_forum.php:121
+#: ../user/team_forum.php:123
 msgid "Message board removed"
 msgstr "留言版已移除"
 
-#: ../user/team_forum.php:124
+#: ../user/team_forum.php:126
 msgid ""
 "Your team's message board has been removed. You may now %1create a new "
 "one%2."
 msgstr "你的團隊留言板已移除,你現在可以%1建立一個新的留言板%2。"
 
-#: ../user/team_forum.php:143
+#: ../user/team_forum.php:145
 msgid "Team Message Board Updated"
 msgstr "團隊留言版已更新"
 
-#: ../user/team_forum.php:144
+#: ../user/team_forum.php:146
 msgid "Update successful"
 msgstr "更新成功"
 
-#: ../user/team_forum.php:147
+#: ../user/team_forum.php:149
 msgid "Update failed"
 msgstr "更新失敗"
 
-#: ../user/team_forum.php:154
+#: ../user/team_forum.php:156
 msgid "Team has no forum"
 msgstr "團隊沒有論壇"
 
-#: ../user/team_founder_transfer_action.php:36
+#: ../user/team_founder_transfer_action.php:38
 msgid "You must be a member of a team to access this page."
 msgstr "只有團隊的成員可以訪問該頁面。"
 
-#: ../user/team_founder_transfer_action.php:90
+#: ../user/team_founder_transfer_action.php:92
 msgid "Requesting foundership of %1"
 msgstr "正在請求%1 的創始人資格"
 
-#: ../user/team_founder_transfer_action.php:98
+#: ../user/team_founder_transfer_action.php:100
 msgid ""
 "The current founder has been notified of your request by email and private message.<br /><br />\n"
 "                       If the founder does not respond within 60 days you will be allowed to become the founder."
 msgstr "你的請求已經通過電子郵件和私人消息通知到了當前的創始人。 <br /><br />\n如果該創始人在60 天沒有回應,你就可以成為創始人了。"
 
-#: ../user/team_founder_transfer_action.php:102
-#: ../user/team_founder_transfer_action.php:113
+#: ../user/team_founder_transfer_action.php:104
+#: ../user/team_founder_transfer_action.php:115
 msgid "Foundership request not allowed now"
 msgstr "現在不允許請求創始人資格"
 
-#: ../user/team_founder_transfer_action.php:109
+#: ../user/team_founder_transfer_action.php:111
 msgid "Assumed foundership of %1"
 msgstr "得到 %1 的創始人資格"
 
-#: ../user/team_founder_transfer_action.php:111
+#: ../user/team_founder_transfer_action.php:113
 msgid ""
 "Congratulations, you are now the founder of team %1. Go to %2Your Account "
 "page%3 to find the Team Admin options."
 msgstr "恭喜,你已經是 %1 的創始人了!請在%2你的帳戶頁面%3使用團隊管理功能。"
 
-#: ../user/team_founder_transfer_action.php:120
+#: ../user/team_founder_transfer_action.php:122
 msgid "Decline founder change request"
 msgstr "拒絕創始人更改請求"
 
-#: ../user/team_founder_transfer_action.php:127
+#: ../user/team_founder_transfer_action.php:129
 msgid "The foundership request from %1 has been declined."
 msgstr "來自 %1 的創始人請求已經被拒絕。"
 
-#: ../user/team_founder_transfer_action.php:130
+#: ../user/team_founder_transfer_action.php:132
 msgid "There were no foundership requests."
 msgstr "目前沒有創始人請求。"
 
-#: ../user/team_founder_transfer_action.php:134
+#: ../user/team_founder_transfer_action.php:136
 msgid "undefined action %1"
 msgstr "未定義行為 %1"
 
-#: ../user/team_founder_transfer_action.php:137
-#: ../user/team_founder_transfer_form.php:83
+#: ../user/team_founder_transfer_action.php:139
+#: ../user/team_founder_transfer_form.php:85
 msgid "Return to team page"
 msgstr "返回團隊頁面"
 
-#: ../user/team_founder_transfer_form.php:28
+#: ../user/team_founder_transfer_form.php:30
 msgid "You need to be a member of a team to access this page."
 msgstr "只有團隊的成員可以訪問該頁面。"
 
-#: ../user/team_founder_transfer_form.php:31
+#: ../user/team_founder_transfer_form.php:33
 msgid "Request foundership of %1"
 msgstr "請求 %1 的創始人資格"
 
-#: ../user/team_founder_transfer_form.php:38
+#: ../user/team_founder_transfer_form.php:40
 msgid "You are now founder of team %1."
 msgstr "你已經是%1 的創始人。"
 
-#: ../user/team_founder_transfer_form.php:44
+#: ../user/team_founder_transfer_form.php:46
 msgid "You requested the foundership of %1 on %2."
 msgstr "你已經請求了%1 的創始人資格(時間:%2)。"
 
-#: ../user/team_founder_transfer_form.php:47
+#: ../user/team_founder_transfer_form.php:49
 msgid ""
 "60 days have elapsed since your request, and the founder has not responded. "
 "You may now assume foundership by clicking here:"
 msgstr "原創始人在60 天內都沒有回應你的請求,你現在可以點擊這裡來得到創始人資格:"
 
-#: ../user/team_founder_transfer_form.php:50
+#: ../user/team_founder_transfer_form.php:52
 msgid "Assume foundership"
 msgstr "得到創始人資格"
 
-#: ../user/team_founder_transfer_form.php:54
+#: ../user/team_founder_transfer_form.php:56
 msgid ""
 "The founder was notified of your request. If he/she does not respond by %1 "
 "you will be given an option to become founder."
 msgstr "你的請求已經通知到了創始人,如果他/她到 %1 都沒有回應的話,你將可以選擇成為新的創始人。"
 
-#: ../user/team_founder_transfer_form.php:60
+#: ../user/team_founder_transfer_form.php:62
 msgid ""
 "If the team founder is not active and you want to assume the role of founder, click the button below. The current founder will be sent an email detailing your request, and will be able to transfer foundership to you or to decline your request. If the founder does not respond in 60 days, you will be allowed to become the founder.<br /><br />\n"
 "                       Are you sure you want to request foundership?"
 msgstr "如果你將得到團隊創始人的資格(因為當前的創建人不活躍等原因),請點擊下面的按鈕。你的請求將通過電子郵件通知到當前的創始人,他/她可以將創始人資格轉移給你或者拒絕你的請求。如果他/她在60 天內都沒有回應,你就可以得到創始人的資格。 <br /><br />\n你確定想要請求創始人資格嗎?"
 
-#: ../user/team_founder_transfer_form.php:65
+#: ../user/team_founder_transfer_form.php:67
 msgid "Request foundership"
 msgstr "請求創始人資格"
 
-#: ../user/team_founder_transfer_form.php:74
+#: ../user/team_founder_transfer_form.php:76
 msgid "Founder change has already been requested by %1 on %2."
 msgstr "%1 已經在 %2 請求了創始人更改。"
 
-#: ../user/team_founder_transfer_form.php:77
+#: ../user/team_founder_transfer_form.php:79
 msgid ""
 "A foundership change was requested during the last 90 days, so new requests "
 "are not allowed. Please try again later."
 msgstr "因為過去 90 天已經有過程創始人資格更改請求,目前不允許發起新的請求,請稍後再試。"
 
-#: ../user/team_join.php:32 ../user/team_join_action.php:32
-#: ../user/team_join_form.php:29
+#: ../user/team_join.php:34 ../user/team_join_action.php:34
+#: ../user/team_join_form.php:31
 msgid "The team %1 is not joinable."
 msgstr "團隊 %1 不允許加入。"
 
-#: ../user/team_join.php:35 ../user/team_join_action.php:35
+#: ../user/team_join.php:37 ../user/team_join_action.php:37
 msgid "Already a member"
 msgstr "已經是團隊成員"
 
-#: ../user/team_join.php:36 ../user/team_join_action.php:36
+#: ../user/team_join.php:38 ../user/team_join_action.php:38
 msgid "You are already a member of %1."
 msgstr "你已經是 %1 的成員了。"
 
-#: ../user/team_join.php:42 ../user/team_join_action.php:43
+#: ../user/team_join.php:44 ../user/team_join_action.php:45
 msgid "Couldn't join team - please try again later."
 msgstr "無法加入團隊 - 請稍後再試。"
 
-#: ../user/team_join_action.php:40
+#: ../user/team_join_action.php:42
 msgid "Joined %1"
 msgstr "已加入 %1"
 
-#: ../user/team_join_action.php:41
+#: ../user/team_join_action.php:43
 msgid "You have joined %1."
 msgstr "你已經加入了 %1。"
 
-#: ../user/team_join_form.php:32
+#: ../user/team_join_form.php:34
 msgid "Join %1"
 msgstr "加入 %1"
 
-#: ../user/team_join_form.php:33
+#: ../user/team_join_form.php:35
 msgid "Please note:"
 msgstr "請注意:"
 
-#: ../user/team_join_form.php:35
+#: ../user/team_join_form.php:37
 msgid "Joining a team gives its founder access to your email address."
 msgstr "加入團隊後,團隊的創始人將可以看到你的電子郵件地址。"
 
-#: ../user/team_join_form.php:36
+#: ../user/team_join_form.php:38
 msgid "Joining a team does not affect your account's credit."
 msgstr "加入團隊對你的帳戶積分沒有影響。"
 
-#: ../user/team_join_form.php:43
+#: ../user/team_join_form.php:45
 msgid "Join team"
 msgstr "加入團隊"
 
-#: ../user/team_lookup.php:84
+#: ../user/team_lookup.php:86
 msgid "Search Results"
 msgstr "搜尋結果"
 
-#: ../user/team_lookup.php:86
+#: ../user/team_lookup.php:88
 msgid "Search results for '%1'"
 msgstr "“%1”的搜尋結果"
 
-#: ../user/team_lookup.php:88
+#: ../user/team_lookup.php:90
 msgid "You may view these teams' members, statistics, and information."
 msgstr "你可以查看這些團隊的成員,統計以及其它資訊。"
 
-#: ../user/team_lookup.php:98
+#: ../user/team_lookup.php:100
 msgid "More than 100 teams match your search. The first 100 are shown."
 msgstr "超過 100 個的團隊符合你的搜尋條件,現在只顯示了前 100 個。"
 
-#: ../user/team_lookup.php:104
+#: ../user/team_lookup.php:106
 msgid ""
 "End of results. %1 If you cannot find the team you are looking for, you may "
 "%2create a team%3 yourself."
 msgstr "上面是所有的搜尋結果。 %1如果沒找到合適的團隊,你也可以自己%2建立一個團隊%3。"
 
-#: ../user/team_manage.php:26
+#: ../user/team_manage.php:28
 msgid "Team administration for %1"
 msgstr "%1 的團隊管理"
 
-#: ../user/team_manage.php:29
+#: ../user/team_manage.php:31
 msgid "Edit team info"
 msgstr "編輯團隊資訊"
 
-#: ../user/team_manage.php:30
+#: ../user/team_manage.php:32
 msgid "Change team name, URL, description, type, or country"
 msgstr "改變團隊名稱,網址,描述,類型或者國家"
 
-#: ../user/team_manage.php:32
+#: ../user/team_manage.php:34
 msgid "Member list:"
 msgstr "成員列表"
 
-#: ../user/team_manage.php:33 ../user/team_manage.php:37
+#: ../user/team_manage.php:35 ../user/team_manage.php:39
 msgid "HTML"
 msgstr "HTML"
 
-#: ../user/team_manage.php:34
+#: ../user/team_manage.php:36
 msgid "text"
 msgstr "文件"
 
-#: ../user/team_manage.php:35
+#: ../user/team_manage.php:37
 msgid "View member names and email addresses"
 msgstr "查看成員名稱和電子郵件地址"
 
-#: ../user/team_manage.php:36
+#: ../user/team_manage.php:38
 msgid "View change history:"
 msgstr "查看更改歷史:"
 
-#: ../user/team_manage.php:38
+#: ../user/team_manage.php:40
 msgid "XML"
 msgstr "XML"
 
-#: ../user/team_manage.php:39
+#: ../user/team_manage.php:41
 msgid "See when members joined or quit this team"
 msgstr "查看成員加入或離開團隊的時間"
 
-#: ../user/team_manage.php:50
+#: ../user/team_manage.php:52
 msgid "Respond to foundership request."
 msgstr "回應創始人資格請求。"
 
-#: ../user/team_manage.php:50
+#: ../user/team_manage.php:52
 msgid "If you don't respond by %1, %2 may assume foundership of this team."
 msgstr "如果你到 %1 都不回應,%2 將可以得到這個團隊的創始人資格"
 
-#: ../user/team_manage.php:55
+#: ../user/team_manage.php:57
 msgid "Remove inactive or unwanted members from this team"
 msgstr "從團隊中移除不活躍或不喜歡的成員"
 
-#: ../user/team_manage.php:57
+#: ../user/team_manage.php:59
 msgid "Transfer foundership to another member"
 msgstr "將創始人資格轉移給其他成員"
 
-#: ../user/team_manage.php:58
+#: ../user/team_manage.php:60
 msgid "Add/remove Team Admins"
 msgstr "增加/移除團隊管理員"
 
-#: ../user/team_manage.php:59
+#: ../user/team_manage.php:61
 msgid "Give selected team members Team Admin privileges"
 msgstr "將團隊管理員權限授予選中的團隊成員"
 
-#: ../user/team_manage.php:61
+#: ../user/team_manage.php:63
 msgid "Remove team"
 msgstr "移除團隊"
 
-#: ../user/team_manage.php:62
+#: ../user/team_manage.php:64
 msgid "Allowed only if team has no members"
 msgstr "只能在團隊沒有成員的時候進行該操作"
 
-#: ../user/team_manage.php:64
+#: ../user/team_manage.php:66
 msgid "Create or manage a team message board"
 msgstr "建立或管理團隊留言板"
 
-#: ../user/team_manage.php:71
+#: ../user/team_manage.php:73
 msgid ""
 "To have this team created on all BOINC projects (current and future) you can"
 " make it into a %1BOINC-wide team%2."
 msgstr "如果想在所有的 BOINC 專案(現有和未來的)中都建立這個團隊,你可以將它轉變為一個 %1BOINC-wide 團隊%2。"
 
-#: ../user/team_manage.php:73
+#: ../user/team_manage.php:75
 msgid ""
 "Team admins are encouraged to join and participate in the Google %1boinc-"
 "team-founders%2 group."
 msgstr "建議所有團隊管理員都加入和參加到Google 的 %1boinc-team-founders%2 討論組中。"
 
-#: ../user/team_manage.php:75
-msgid ""
-"Other resources for BOINC team admins are available from a third-party site,"
-" %1www.boincteams.com%2."
-msgstr "BOINC 團隊管理員還可以從一個第三方網站得到其它相關資源:%1www.boincteams.com%2。"
-
 #: ../user/team_manage.php:91
 msgid "Can't delete non-empty team"
 msgstr "不能刪除非空團隊"
@@ -6048,27 +6083,27 @@ msgstr "不能刪除非空團隊"
 msgid "Team %1 deleted"
 msgstr "團隊 %1 已刪除"
 
-#: ../user/team_members.php:36
+#: ../user/team_members.php:38
 msgid "Limit exceeded:  Can only display the first 1000 members."
 msgstr "超出限制:只能顯示前 1000 名成員。"
 
-#: ../user/team_members.php:49
+#: ../user/team_members.php:51
 msgid "Members of %1"
 msgstr "%1 的成員"
 
-#: ../user/team_quit_action.php:32
+#: ../user/team_quit_action.php:34
 msgid "Unable to quit team"
 msgstr "不能退出團隊"
 
-#: ../user/team_quit_action.php:33
+#: ../user/team_quit_action.php:35
 msgid "Team doesn't exist, or you don't belong to it."
 msgstr "團隊不存在,或者你屬於該團隊。"
 
-#: ../user/team_quit_form.php:31
+#: ../user/team_quit_form.php:33
 msgid "Quit %1"
 msgstr "退出 %1"
 
-#: ../user/team_quit_form.php:32
+#: ../user/team_quit_form.php:34
 msgid ""
 "<strong>Please note before quitting a team:</strong>\n"
 "         <ul>\n"
@@ -6077,97 +6112,99 @@ msgid ""
 "         </ul>"
 msgstr "<strong>退出團隊前請注意:</strong>\n<ul>\n<li>如果你退出一個團隊,你還可以重新加入,或者也可以加入其它團隊。 \n<li>退出團隊無論如何都不會影響你的個人積分。 \n</ul>"
 
-#: ../user/team_quit_form.php:40
+#: ../user/team_quit_form.php:42
 msgid "Quit Team"
 msgstr "退出團隊"
 
-#: ../user/team_remove_inactive_action.php:31
+#: ../user/team_remove_inactive_action.php:33
 msgid "Removing users from %1"
 msgstr "從 %1 中移除用戶"
 
-#: ../user/team_remove_inactive_action.php:39
+#: ../user/team_remove_inactive_action.php:41
 msgid "%1 is not a member of %2"
 msgstr "%1 不是 %2 的成員"
 
-#: ../user/team_remove_inactive_action.php:42
+#: ../user/team_remove_inactive_action.php:44
 msgid "%1 has been removed"
 msgstr "%1 已被移除"
 
-#: ../user/team_remove_inactive_form.php:32
+#: ../user/team_remove_inactive_form.php:34
 msgid "Remove members from %1"
 msgstr "從 %1 移除成員"
 
-#: ../user/team_remove_inactive_form.php:39
+#: ../user/team_remove_inactive_form.php:41
 msgid "Remove?"
 msgstr "移除?"
 
-#: ../user/team_remove_inactive_form.php:40
+#: ../user/team_remove_inactive_form.php:42
 msgid "Name (ID)"
 msgstr "名稱(ID)"
 
-#: ../user/team_remove_inactive_form.php:65
+#: ../user/team_remove_inactive_form.php:67
 msgid "No members are eligible for removal."
 msgstr "沒有任何成員符合移除的條件。"
 
-#: ../user/team_remove_inactive_form.php:68
+#: ../user/team_remove_inactive_form.php:70
 msgid "Remove users"
 msgstr "移除用戶"
 
-#: ../user/team_search.php:68
+#: ../user/team_search.php:76
 msgid "Team name"
 msgstr "團隊名稱"
 
-#: ../user/team_search.php:92
+#: ../user/team_search.php:113
 msgid "Team search results"
 msgstr "團隊搜尋結果"
 
-#: ../user/team_search.php:94
+#: ../user/team_search.php:115
 msgid "No teams were found matching your criteria. Try another search."
 msgstr "沒有任何團隊符合你的查詢條件,請試試其它查詢條件。"
 
-#: ../user/team_search.php:96
+#: ../user/team_search.php:117
 msgid "Or you can %1create a new team%2."
 msgstr "或者你也可以%1建立一個新團隊%2。"
 
-#: ../user/team_search.php:100
+#: ../user/team_search.php:121
 msgid ""
 "The following teams match one or more of your search criteria.\n"
 "            To join a team, click its name to go to the team page,\n"
 "               then click %1Join this team%2."
 msgstr "下面的團隊符合一個或多個你的查詢條件。 \n要加入一個團隊,點擊名稱後即可進入團隊頁面,\n然後點擊%1加入該團隊%2即可。"
 
-#: ../user/team_search.php:107
+#: ../user/team_search.php:128
 msgid "Change your search"
 msgstr "修改你的搜尋條件"
 
-#: ../user/team_search.php:181
+#: ../user/team_search.php:202
 msgid ""
 "You can team up with other people with similar interests, or from the same "
 "country, company, or school."
 msgstr "你可以和其他有相同興趣,或來自同一個國家地區、公司以及學校的用戶組成一個團隊。"
 
-#: ../user/team_search.php:183
+#: ../user/team_search.php:204
 msgid "Use this form to find teams that might be right for you."
 msgstr "使用該表單來尋找可能適合你的團隊。"
 
-#: ../user/team_search.php:188
+#: ../user/team_search.php:209
 msgid "%1I'm not interested%2 in joining a team right now."
 msgstr "我現在對加入團隊%1沒興趣%2。"
 
-#: ../user/top_hosts.php:67 ../user/top_teams.php:100
-#: ../user/top_users.php:112
+#: ../user/top_hosts.php:67 ../user/top_teams.php:102
+#: ../user/top_users.php:113
 msgid "Limit exceeded - Sorry, first %1 items only"
-msgstr "超出限制 - 對不起,僅顯示前 %1 個項目"
+msgstr "超出限制 - 對不起,僅顯示前 %1 個專案"
 
+#. Now display what we've got (either gotten from cache or from DB)
 #: ../user/top_hosts.php:82
 msgid "Top hosts"
 msgstr "主機排名"
 
-#: ../user/top_teams.php:105
+#. Now display what we've got (either gotten from cache or from DB)
+#: ../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 "沒有 %1 團隊"
 
@@ -6175,11 +6212,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"
 
@@ -6223,19 +6260,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 "沒有任何用戶符合你的搜尋條件。"
 
@@ -6303,15 +6340,15 @@ msgstr "驗證電子郵件地址"
 msgid "The email address of your account has been validated."
 msgstr "您的帳號所連結的電子郵件地址已通過驗證。"
 
-#: ../user/view_profile.php:36
+#: ../user/view_profile.php:38
 msgid "This user has no profile"
 msgstr "此用戶未建立檔案"
 
-#: ../user/view_profile.php:54
+#: ../user/view_profile.php:56
 msgid "Profile: %1"
 msgstr "用戶檔案:%1"
 
-#: ../user/view_profile.php:63
+#: ../user/view_profile.php:65
 msgid "Account data"
 msgstr "帳號資料"
 
@@ -6365,6 +6402,10 @@ msgstr "找不到任務單元"
 msgid "Workunit %1"
 msgstr "任務單元 %1"
 
+#: ../user/workunit.php:40
+msgid "application"
+msgstr "程式"
+
 #: ../user/workunit.php:43
 msgid "canonical result"
 msgstr "規範結果"
@@ -6374,6 +6415,10 @@ msgid "granted credit"
 msgstr "授予積分"
 
 #: ../user/workunit.php:55
+msgid "Tasks in progress"
+msgstr "任務處理中"
+
+#: ../user/workunit.php:55
 msgid "suppressed pending completion"
 msgstr "無法查看等待完成的情況"
 
@@ -6401,33 +6446,33 @@ 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 "版權所有"
 
-#: ../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"
@@ -6436,24 +6481,35 @@ msgid ""
 "    </ol>"
 msgstr "告訴我們您對 %1 的看法<ol>\n<li>您為什麼執行 %1? \n<li>您對這個專案的觀點是什麼? \n<li>有什麼建議嗎? \n</ol>"
 
-#: ../project.sample/project_specific_prefs.inc:47
+#: ../project.sample/project_specific_prefs.inc:53
 msgid "Color scheme for graphics"
 msgstr "圖形的色彩方案"
 
-#: ../project.sample/project_specific_prefs.inc:48
+#: ../project.sample/project_specific_prefs.inc:55
+#, no-php-format
 msgid "Maximum CPU % for graphics%10 ... 100%2"
 msgstr "顯示圖像時最多可以使用的CPU 資源%10 ... 100%2"
 
-#: ../project.sample/project_specific_prefs.inc:49
+#: ../project.sample/project_specific_prefs.inc:56
 msgid "Run only the selected applications"
 msgstr "僅執行選中的程式"
 
-#: ../project.sample/project_specific_prefs.inc:50
+#: ../project.sample/project_specific_prefs.inc:57
+msgid ""
+"Only get tasks for certain applications. Useful to focus on particular "
+"applications, or to exclude them."
+msgstr "只接受使用特定計算程式的任務。用於關注特定的計算程式,或者排除它們。"
+
+#: ../project.sample/project_specific_prefs.inc:58
 msgid ""
 "If no work for selected applications is available, accept work from other "
 "applications?"
 msgstr "如果選中的程式暫時沒有運算任務,是否接收其它程式的任務?"
 
-#: ../project.sample/project_specific_prefs.inc:91
+#: ../project.sample/project_specific_prefs.inc:59
+msgid "Use faster non-graphical applications if available?"
+msgstr "是否使用更快的無圖形計算程式(如果可用)?"
+
+#: ../project.sample/project_specific_prefs.inc:90
 msgid "(all applications)"
 msgstr "(所有程式)"
diff --git a/locale/zh_TW/BOINC-Web.po b/locale/zh_TW/BOINC-Web.po
index fc41d68..6c2257e 100644
--- a/locale/zh_TW/BOINC-Web.po
+++ b/locale/zh_TW/BOINC-Web.po
@@ -6,16 +6,18 @@
 # FileID  : $Id$
 # 
 # Translators:
+# Po-Chun Huang <aphroteus at gmail.com>, 2015
+# Tony Chang <Tony.TY_Chang at htc.com>, 2015
 # Willy Wu <df910105 at yahoo.com.tw>, 2015
 # Willy Wu <df910105 at yahoo.com.tw>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: BOINC\n"
 "Report-Msgid-Bugs-To: BOINC translation team <boinc_loc at ssl.berkeley.edu>\n"
-"POT-Creation-Date: 2014-02-01 00:00 PST\n"
-"PO-Revision-Date: 2015-04-22 12:56+0000\n"
-"Last-Translator: Willy Wu <df910105 at yahoo.com.tw>\n"
-"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/boinc/language/zh_TW/)\n"
+"POT-Creation-Date: 2015-07-09 18:59 PDT\n"
+"PO-Revision-Date: 2015-11-26 17:45+0000\n"
+"Last-Translator: Mingye Wang <arthur200126 at gmail.com>\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/boinc/boinc/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -36,89 +38,90 @@ msgstr "回到BOINC首頁"
 msgid "This page is %stranslatable%s."
 msgstr "網站需要您協助%s翻譯%s。"
 
-#: download.php:39
+#: download.php:42
 msgid ""
 "We recommend that you also install VirtualBox, so your computer can work on "
 "science projects that require it."
 msgstr "我們建議您安裝VirtualBox,如此您的電腦就可以在需要它的科學專案上多盡一份力。"
 
-#: download.php:41
+#: download.php:44
 msgid "Learn more about VirtualBox."
 msgstr "了解更多關於VirtualBox。"
 
-#: download.php:51
+#: download.php:52
 msgid "Download BOINC + VirtualBox"
 msgstr "下載BOINC + VirtualBox"
 
-#: download.php:54 download.php:69
+#. "for %s" identifies the operating system, e.g. "for Windows"
+#: download.php:56 download.php:71
 #, php-format
 msgid "for %s"
 msgstr "適用於 %s"
 
-#: download.php:57 download.php:72
+#: download.php:59 download.php:74
 #, php-format
-msgid "BOINC version %s"
-msgstr "BOINC 版本 %s"
+msgid "BOINC %s"
+msgstr "BOINC %s"
 
-#: download.php:59
+#: download.php:61
 #, php-format
-msgid "VirtualBox version %s"
-msgstr "VirtualBox 版本 %s"
+msgid "VirtualBox %s"
+msgstr "VirtualBox %s"
 
-#: download.php:67
+#: download.php:69
 msgid "Download BOINC"
 msgstr "下載BOINC"
 
-#: download.php:123
+#: download.php:133
 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
+#: download.php:135
 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
+#: download.php:137
 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
+#: download.php:142
 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
+#: download.php:177
 msgid "System requirements"
 msgstr "系統需求"
 
-#: download.php:168
+#: download.php:178
 msgid "Release notes"
 msgstr "版本說明"
 
-#: download.php:169 index.php:86
+#: download.php:179 index.php:93
 msgid "Help"
 msgstr "幫助"
 
-#: download.php:170
+#: download.php:180
 msgid "All versions"
 msgstr "所有版本"
 
-#: download.php:171
+#: download.php:181
 msgid "Version history"
 msgstr "版本歷史"
 
-#: download.php:172
+#: download.php:182
 msgid "GPU computing"
 msgstr "GPU運算"
 
-#: download.php:190
+#: download.php:200
 msgid "BOINC: compute for science"
 msgstr "BOINC:用電腦幫助科學"
 
@@ -172,13 +175,13 @@ msgid ""
 "If you're already a Help Volunteer: to edit your settings, %sclick here%s."
 msgstr "如果你已經是志願幫助者: 按%s這裡%s調整設定。"
 
-#: help_funcs.php:107
+#: help_funcs.php:136
 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
+#: help_funcs.php:139
 msgid "%1Never%2 give email address or password information to BOINC helpers."
 msgstr "%1請千萬不要%2將你的電子信箱或者密碼提供給BOINC幫助人員。"
 
@@ -218,204 +221,163 @@ msgstr "PFLOPS。"
 msgid "News"
 msgstr "新聞"
 
-#: index.php:83
+#. "Volunteer" is used as a verb
+#: index.php:89
 msgid "Volunteer"
 msgstr "志願者"
 
-#: index.php:85
+#: index.php:92
 msgid "Download"
 msgstr "下載"
 
-#: index.php:87 index.php:120 index.php:171
+#: index.php:94 index.php:138
 msgid "Documentation"
 msgstr "文件"
 
-#: index.php:88
+#: index.php:95
 msgid "Add-ons"
 msgstr "附加組件"
 
-#: index.php:89
+#: index.php:96
 msgid "Links"
 msgstr "連結"
 
-#: index.php:94
+#: index.php:101
 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
+#: index.php:103
 msgid "Choose projects"
 msgstr "選擇專案"
 
-#: index.php:97
+#: index.php:104
 msgid "Download BOINC software"
 msgstr "下載BOINC軟體"
 
-#: index.php:98
+#: index.php:105
 msgid "Enter an email address and password."
 msgstr "輸入電子信箱和密碼。"
 
-#: index.php:102
+#: index.php:109
 #, 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。"
 
-#: index.php:118
+#: index.php:136
 msgid "Compute with BOINC"
 msgstr "使用BOINC運算"
 
-#: index.php:121
+#: index.php:139
 msgid "Software updates"
 msgstr "軟體更新"
 
-#: index.php:128
+#: index.php:146
 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,可得到成千上萬個處理器的運算能力。"
+"%1Scientists%2: use BOINC to create a %3volunteer computing project%4, "
+"giving you the power of thousands of CPUs and GPUs."
+msgstr "%1科研人員%2:使用 BOINC 來建立%3志願計算項目%4,從而得到成千上萬個CPU和GPU的計算能力。"
 
-#: index.php:132
+#: index.php:150
 msgid ""
 "%1Universities%2: use BOINC to create a %3Virtual Campus Supercomputing "
 "Center%4."
 msgstr "%1大學院校%2:使用BOINC建立%3虛擬校園超級運算中心%4。"
 
-#: index.php:137
+#: index.php:155
 msgid "%1Companies%2: use BOINC for %3desktop Grid computing%4."
 msgstr "%1公司企業%2:將BOINC用於%3桌面網格運算%4。"
 
-#: index.php:149
-msgid "The BOINC project"
-msgstr "BOINC專案"
+#: index.php:167
+msgid "About BOINC"
+msgstr "關於 BOINC"
 
-#: index.php:155
+#: index.php:181
 msgid "Message boards"
 msgstr "留言版"
 
-#: index.php:156
+#: index.php:182
 msgid "Email lists"
 msgstr "電子信箱列表"
 
-#: index.php:157
-msgid "Personnel and contributors"
-msgstr "專案人員與貢獻者"
-
-#: index.php:158
+#: index.php:183
 msgid "Events"
 msgstr "活動"
 
-#: index.php:159
-msgid "Papers and talks"
-msgstr "論文與演講"
-
-#: index.php:160
-msgid "Research projects"
-msgstr "研究專案"
-
-#: index.php:161
-msgid "Logos and graphics"
-msgstr "標幟和圖片"
+#: index.php:184
+msgid "Source code"
+msgstr "原始碼"
 
-#: index.php:162
-msgid "and"
-msgstr "和"
-
-#: index.php:166
-msgid "Help wanted"
-msgstr "我們需要幫助!"
-
-#: index.php:168
-msgid "Programming"
-msgstr "撰寫程式"
-
-#: index.php:169
-msgid "Translation"
-msgstr "中文翻譯"
-
-#: index.php:170
-msgid "Testing"
-msgstr "測試"
-
-#: index.php:172
-msgid "Publicity"
-msgstr "宣傳推廣"
-
-#: index.php:174
-msgid "Software development"
-msgstr "軟體開發"
-
-#: index.php:175
+#: index.php:186
 msgid "APIs for add-on software"
 msgstr "APIs外掛軟體"
 
-#: index.php:217
-#, php-format
-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"
-msgstr "BOINC 發起於加州大學柏克萊分校"
+#: index.php:231
+msgid "Open-source software for volunteer computing"
+msgstr "給志願運算的開放原始碼軟體"
 
-#: projects.inc:14
+#: projects.inc:19
 msgid "Distributed sensing"
 msgstr "分散式傳感"
 
-#: projects.inc:19
+#: projects.inc:24
 msgid "Stanford University"
 msgstr "Stanford University"
 
-#: projects.inc:20
+#: projects.inc:25
 msgid "Seismology"
 msgstr "地震"
 
-#: projects.inc:21
+#: projects.inc:26
 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)正在開發世界上最大的地震網路,使用傳感器與網路連接。您必須購買一個傳感器才能參加。"
+"Quake-Catcher Network is developing the world's largest seismic network "
+"using sensors attached to computers and smartphones."
+msgstr "Quake-Catcher Network(QCN)項目致力於使用智慧手機和計算機上的感測器建立世界上最大的地震感測網路。"
 
-#: projects.inc:27
+#: projects.inc:34
 msgid "BOINC Poland Foundation"
 msgstr "BOINC Poland Foundation"
 
-#: projects.inc:28
+#: projects.inc:35
 msgid "Environmental research"
 msgstr "環境研究"
 
-#: projects.inc:29
+#: projects.inc:36
 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 "此專案正在建立在一個免費和持續更新的輻射水平地圖,透過使用傳感器連接到使用者的電腦。您必須購買一個傳感器才能參加。"
+"Radioactive at Home is creating a free and continuously updated map of "
+"radiation levels using sensors connected to volunteers' computers.  You must"
+" buy a sensor to participate."
+msgstr "Radioactive at Home項目使用志願者計算機上的感測器來建立一個免費並持續更新的輻射強度地圖。你需要購買一個感測器來加入這個項目。"
 
-#: projects.inc:33
-msgid ""
-"To participate in these projects you must buy a sensor and attach it to your"
-" computer."
-msgstr "想參加這些專案,您必須購買一個傳感器且與電腦連接"
-
-#: projects.inc:37
+#: projects.inc:45
 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:51
+msgid "Cognitive Science"
+msgstr "認知科學"
+
+#: projects.inc:52
+msgid ""
+"MindModeling at Home uses computational cognitive process modeling to better "
+"understand the human mind, and specifically to study the mechanisms and "
+"processes that enable and moderate human performance and learning."
+msgstr "MindModeling at Home 使用計算模擬認知過程模型,以更好地理解人類的思維,特別是學習那些使人類得以啟用和改變表現和學習的機制和流程。"
+
+#: projects.inc:70 projects.inc:467 projects.inc:591 projects.inc:601
+#: projects.inc:657
 msgid "Private"
 msgstr "Private"
 
-#: projects.inc:61
+#: projects.inc:71
 msgid "Artificial intelligence"
 msgstr "人工智慧"
 
-#: projects.inc:62
+#: projects.inc:72
 msgid ""
 "Parse and convert semantic nets for use in FreeHAL, an artificial "
 "intelligence that uses semantic networks, stemmers, part of speech "
@@ -423,117 +385,104 @@ msgid ""
 "conversations."
 msgstr "解析和轉換用於FreeHAL的語義網,而FreeHAL是一個利用語義網絡模仿人類的交談行為的人工智慧。"
 
-#: projects.inc:69
+#: projects.inc:82
 msgid "Biology and Medicine"
 msgstr "生物和醫藥"
 
-#: projects.inc:82
+#: projects.inc:88
+msgid "Medical physiology"
+msgstr "醫學生理學"
+
+#: projects.inc:89
+msgid ""
+"DENIS at Home does cardiac electrophysiological simulations, studying the "
+"electrical activity of the heart."
+msgstr "DENIS at Home 通過心臟電生理模擬,研究心臟的電活動。"
+
+#: projects.inc:98
+msgid "Molecular biology"
+msgstr "分子生物學"
+
+#: projects.inc:99
+msgid ""
+"RNA World seeks to identify, analyze, structurally predict and design RNA "
+"molecules on the basis of established bioinformatics software."
+msgstr "RNA World 旨在識別、 分析、 結構預測和設計建立生物資訊學軟體的 RNA 分子。"
+
+#: projects.inc:107
 msgid "University College Dublin"
 msgstr "University College Dublin"
 
-#: projects.inc:83
+#: projects.inc:108
 msgid "Antimalarial drug discovery"
 msgstr "發現抗瘧疾藥物"
 
-#: projects.inc:84
+#: projects.inc:109
 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專案就是以發現這些新的標靶為目標。"
+" 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."
+msgstr "引起瘧疾的寄生蟲正在對現有可用藥物產生新的抗藥性。因此,我們迫切需要研究針對寄生蟲中的新的蛋白質的藥物。FightNeglectedDiseases at Home項目致力於尋找這些新的可用於研發藥物的靶點。"
 
-#: projects.inc:90
+#: projects.inc:117
 msgid "University of Karlsruhe (Germany)"
 msgstr "University of Karlsruhe (Germany)"
 
-#: projects.inc:91
+#: projects.inc:118
 msgid "Protein structure prediction"
 msgstr "蛋白質結構預測"
 
-#: projects.inc:92
+#: projects.inc:119
 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 "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 的研究目標包括生物科學及電腦科學。該專案試圖了解蛋白質配體交互過程中的原子尺度的細節,並以此尋找新的藥物。"
+msgstr "POEM at HOME 透過運算途徑來預測蛋白質的生物結構、理解蛋白質之間交互的訊號傳遞機制、理解疾病相關的蛋白質變異,並根據生物學上重要的蛋白質 3D 結構來開發新藥物。"
 
-#: projects.inc:114
+#: projects.inc:147
 msgid "Barcelona Biomedical Research Park (PRBB)"
 msgstr "Barcelona Biomedical Research Park (PRBB)"
 
-#: projects.inc:115
+#: projects.inc:148
 msgid "Molecular simulations of proteins"
 msgstr "蛋白質分子結構模型"
 
-#: projects.inc:116
+#: projects.inc:149
 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 "Technion, Israel"
+msgstr "GPUGrid.net 運用 NVIDIA GPU 進行全原子的分子動力學模擬 (CellMD)。運算生物學的應用給生物醫藥學帶來新的研究方向。"
 
-#: 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幫助全世界的遺傳學家尋找會導致某些類型疾病的基因,例如糖尿病、高血壓、癌症、精神分裂...等等。"
-
-#: projects.inc:138
+#: projects.inc:175
 msgid ""
 "University of Maryland Center for Bioinformatics and Computational Biology"
 msgstr "University of Maryland Center for Bioinformatics and Computational Biology"
 
-#: projects.inc:139
+#: projects.inc:176
 msgid "Life science research"
 msgstr "生命科學研究"
 
-#: projects.inc:140
+#: projects.inc:177
 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 序列數據的進化關係,細菌、病毒蛋白質序列,還有自然界的生物多樣性。"
+"The Lattice Project, developed and administered at the University of "
+"Maryland, supplies computing power to researchers worldwide who are studying"
+" evolutionary relationships using DNA and protein sequence data."
+msgstr "The Lattice Project,由馬里蘭大學開發並管理。為使用DNA和蛋白質的序列資料的進化論研究者們提供世界範圍內的算力。"
 
-#: projects.inc:146
+#: projects.inc:185
 msgid "The Swiss Tropical Institute"
 msgstr "The Swiss Tropical Institute"
 
-#: projects.inc:147
+#: projects.inc:186
 msgid "Epidemiology"
 msgstr "流行疾病學"
 
-#: projects.inc:148
+#: projects.inc:187
 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 "
@@ -544,48 +493,37 @@ msgid ""
 "social factors that influence the distribution of the disease. "
 msgstr "模擬瘧疾的傳播動力學模型,用於對瘧疾的控制,包括如何才能對蚊帳、藥物和正在研發測試過程中的疫苗等進行最優化的分發。相關的建模過程非常耗費運算資源,除了需要模擬相當大的人群分佈,還要考慮生物學和社會學方面對疾病傳播可能有影響的相關因素。"
 
-#: projects.inc:170
+#: projects.inc:211
 msgid "University of Washington"
 msgstr "University of Washington"
 
-#: projects.inc:171 projects.inc:179
+#: projects.inc:212
 msgid "Biology"
 msgstr "生物學"
 
-#: projects.inc:172
+#: projects.inc:213
 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 "University of Vienna"
+"efforts at designing new proteins to fight diseases such as HIV, malaria, "
+"cancer, and Alzheimer's"
+msgstr "進行蛋白質的三維構造研究,並可能最終發現治癒人類幾大疾病的特效藥。通過執行 Rosetta at home,您可以幫助我們加速並拓寬研究思路。從而設計出新的蛋白質以抗擊艾滋病、瘧疾、癌症以及阿爾茨海默氏症(老年痴呆症)。"
 
-#: 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 以公共數據庫的形式發布其研究結果,該資料庫對很多生物資訊學研究項目有重要作用。"
-
-#: projects.inc:186
+#: projects.inc:231
 msgid "Earth Sciences"
 msgstr "地球科學"
 
-#: projects.inc:198
+#: projects.inc:243
 msgid "Oxford University"
 msgstr "Oxford University"
 
-#: projects.inc:199
+#: projects.inc:244
 msgid "Climate study"
 msgstr "氣候研究"
 
-#: projects.inc:200
+#: projects.inc:245
 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 "
@@ -597,83 +535,97 @@ msgid ""
 "century under a wide range of different scenarios."
 msgstr "研究最新的​​氣候模型中的近似處理。通過將模型運行數千次,我們希望能研究模型對近似處理的反應,同時還要保證模型不能脫離於實際。這能夠幫助我們加深對模型的理解,包括對二氧化碳、硫循環等的敏感程度。更進一步,這能夠幫助我們了解下一個世紀的氣候變化趨勢,包括各種不同的場景。"
 
-#: projects.inc:207
+#: projects.inc:253
 msgid "Physical Science"
 msgstr "自然科學"
 
-#: projects.inc:213
+#: projects.inc:259
 msgid "Mechanical engineering"
 msgstr "機械工程"
 
-#: projects.inc:214
+#: projects.inc:260
 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:269 projects.inc:328 projects.inc:338
 msgid "Astronomy"
 msgstr "天文學"
 
-#: projects.inc:225
+#: projects.inc:270
 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)解析每個像素測量物理參數(例如同恆星的表面密度、恆星形成的表面密度、衰減和一級恆星的形成歷史)。"
+"TheSkyNet POGS is an astronomy project studying 16 different properties of "
+"galaxies, including brightness, mass, amount of dust and how fast stars are "
+"forming. We are using your processing power to conduct pixel-by-pixel "
+"calculations on multi-wavelength (ultraviolet, optical and near-infrared "
+"light) images of galaxies to produce an atlas that will help astronomers to "
+"better understand the distant universe."
+msgstr "TheSkyNet POGS 是一個研究16種不同星系的天文學項目,包括亮度、質量、塵埃量及其形成的速度。我們使用志願者的算力從星系的影象中逐畫素地進行多種波長的計算(包括紫外線、可見光和近紅外線),從而一個能幫助天文學家更好地理解浩瀚宇宙的星圖。"
 
-#: projects.inc:247
-msgid "University of Texas at Austin"
-msgstr "University of Texas at Austin"
+#: projects.inc:280 projects.inc:366
+msgid "Astrophysics"
+msgstr "天體物理學"
 
-#: projects.inc:248 projects.inc:279
-msgid "Chemistry"
-msgstr "化學"
+#: projects.inc:281
+msgid ""
+"The aim of the project is to derive shapes and spin for a significant part "
+"of the asteroid population. As input data, we use any asteroid photometry "
+"that is available. The results are asteroid convex shape models with the "
+"direction of the spin axis and the rotation period."
+msgstr "項目的目的是要獲得對小行星總體情況重要的形狀和自旋資訊。我們使用任何可用的小行星光度作為輸入的資料。結果是帶自轉軸及自轉週期的小行星凸面形狀模型。"
 
-#: projects.inc:249
+#: projects.inc:290
+msgid "Aerospace-related science and engineering"
+msgstr "航空航天相關的科學與工程"
+
+#: projects.inc:291
 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 "理論化學、凝集態物理和材料科學中的一個常見問題是對原子尺度系統的時間演化過程比如化學反應的運算。一般來說在這些過程中讓研究人員感興趣的事件的發生概述都相當低(比原子的振動要慢好多個等級),因為即使是在目前最快的電腦上,也需要幾千年的運算時間才有可能碰到一次有研究價值的事件。我們的研究團隊就致力於對這些系統的長時動力學過程進行運算。"
+"Constellation is a platform for aerospace-related simulations, including "
+"trajectory optimization of launchers, satellites and probes, simulation of "
+"Moon's near-surface exosphere, and analysis of dynamic systems of "
+"exploration-rovers"
+msgstr "星座是一個平臺,用於航空航天相關的模擬,包括髮射器、 衛星和探測器的軌跡優化、 月球附近表面散逸,模擬和分析的動態系統的探測漫遊者"
 
-#: projects.inc:262
-msgid "University of Illinois at Urbana-Champaign"
-msgstr "University of Illinois at Urbana-Champaign"
+#: projects.inc:294
+msgid "Perform aerospace-related simulations"
+msgstr "執行航空航天相關模擬"
 
-#: projects.inc:264
+#: projects.inc:329
 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 的目標是搜索可以描述我們宇宙的最適合的模型,並研究能夠與天文觀測數據相符的模型範圍。"
+"Universe at Home aims to create the first database of the simulated stellar "
+"content of the Universe, from the earliest stars to the most exotic black "
+"hole binaries."
+msgstr "Universe at Home 的目的是創造宇宙的模擬恆星內容的第一個資料庫,從最早的恆星到最獨特的黑洞雙星。"
 
-#: projects.inc:270
+#: projects.inc:332
+msgid "Do research in physics and astronomy"
+msgstr "研究物理及天文學"
+
+#: projects.inc:337
 msgid "Rensselaer Polytechnic Institute"
 msgstr "Rensselaer Polytechnic Institute"
 
-#: projects.inc:272
+#: projects.inc:339
 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建模。"
+msgstr "Milkeyway at Home 使用 Sloan Digital Sky Survey 的數據對銀河系進行高精度的 3D 建模。"
 
-#: projects.inc:278
+#: projects.inc:342
+msgid "Study the structure of the Milky Way galaxy"
+msgstr "研究銀河系的結構"
+
+#: projects.inc:347
 msgid "Leiden University, The Netherlands"
 msgstr "Leiden University, The Netherlands"
 
-#: projects.inc:280
+#: projects.inc:348
+msgid "Chemistry"
+msgstr "化學"
+
+#: projects.inc:349
 msgid ""
 "Surface science calculations using Classical Dynamics.  Leiden Classical "
 "allows volunteers, students and other scientist to submit their personal "
@@ -683,15 +635,15 @@ msgid ""
 "simulations through the grid."
 msgstr "使用經典力學進行表面科學的運算。Leiden Classical允許參與者、學者和其它科研人員提供他們自己的運算任務,每個用戶都有他自己的經典力學任務隊列。通過這種方式,學生們可以利用網格對他們學習到的相關理論進行驗證。"
 
-#: projects.inc:294
+#: projects.inc:352
+msgid "Help students do atomic simulations"
+msgstr "幫助學生做原子模擬"
+
+#: projects.inc:365
 msgid "Univ. of Wisconsin - Milwaukee, Max Planck Institute"
 msgstr "Univ. of Wisconsin - Milwaukee, Max Planck Institute"
 
-#: projects.inc:295
-msgid "Astrophysics"
-msgstr "天體物理學"
-
-#: projects.inc:296
+#: projects.inc:367
 msgid ""
 "Search for spinning neutron stars (also called pulsars) using data from the "
 "LIGO and GEO gravitational wave detectors, and from the Arecibo radio "
@@ -700,15 +652,19 @@ msgid ""
 "international organizations."
 msgstr "分析LIGO 和GEO 引力波探測器以及阿雷西波觀測站採集到的數據,以尋找自旋中子星(也稱為脈衝星)。 Einstein at Home 是2005 世界物理學年的推介專案,由美國物理學會(APS)和一些相關的國際組織發起。"
 
-#: projects.inc:310 projects.inc:318
+#: projects.inc:370
+msgid "Help detect pulsars and gravitational waves"
+msgstr "幫助檢測脈衝星和引力波"
+
+#: projects.inc:383 projects.inc:393 projects.inc:403
 msgid "CERN (European Organization for Nuclear Research)"
 msgstr "CERN (European Organization for Nuclear Research)"
 
-#: projects.inc:311 projects.inc:319
+#: projects.inc:384 projects.inc:394 projects.inc:404
 msgid "Physics"
 msgstr "物理學"
 
-#: projects.inc:312
+#: projects.inc:385
 msgid ""
 "The Large Hadron Collider (LHC) is a particle accelerator at CERN, the "
 "European Organization for Nuclear Research, the world's largest particle "
@@ -717,84 +673,114 @@ msgid ""
 "the design of LHC and its detectors."
 msgstr "大型強子對撞機(LHC)是CERN(歐洲核研究組織)的一個粒子加速器裝置,也是世界上最大的粒子物理實驗室。它是人類現有的用於研究基本粒子特性的最強大的實驗裝置。 LHC at home 的作用主要是對加速器進行模擬,並幫助改進LHC 及其探測器的設計。"
 
-#: projects.inc:320
+#: projects.inc:388
+msgid "Improve the design of the Large Hadron Collider"
+msgstr "提高大型強子對撞機的設計"
+
+#: projects.inc:395
 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。"
+"This project uses CERN-developed virtual machine technology for LHC event "
+"physics simulation on volunteer computers.  Requires that you install "
+"VirtualBox on your computer"
+msgstr "該項目使用由CERN開發的虛擬機器技術為志願者在計算機內執行LHC事件模擬。這需要在計算機內已經安裝Virtualbox虛擬化軟體。"
 
-#: projects.inc:326
+#: projects.inc:398
+msgid "Simulate high-energy particle collisions"
+msgstr "模擬高能粒子碰撞"
+
+#: projects.inc:405
+msgid ""
+"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."
+msgstr "ATLAS at Home 使用志願計算網格來執行ATLAS模擬,一個CERN(歐洲核子研究組織)大型強子對撞機的物理學實驗。ATLAS 探測器研究使用特別的高能質子與新粒子正面碰撞的過程。"
+
+#: projects.inc:408
+msgid "Simulate high-energy particle collisions for CERN"
+msgstr "歐洲核子研究中心的高能粒子對撞模擬"
+
+#: projects.inc:413
 msgid "University of California, Berkeley"
 msgstr "University of California, Berkeley"
 
-#: projects.inc:327
+#: projects.inc:414
 msgid "Astrophysics, astrobiology"
 msgstr "天體物理學,天體生物學"
 
-#: projects.inc:328
+#: projects.inc:415
 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,使用射電望遠鏡監聽太空中的窄波射電信號。因為依照人類目前的認識,這些信號不會自然產生,因此可以作為將其地外技術文明存在的證據。"
+msgstr "SETI (搜索外星智慧)的研究領域是探測地球之外的智慧生命。探測的途徑之一,也被稱之為無線電 SETI,使用無線電望遠鏡監聽太空中的窄波無線電訊號。因為依照人類目前的認識,這些訊號不會自然產生,因此可以作為其它外星文明技術存在的證據。"
 
-#: projects.inc:342
-msgid "Bielefeld University of Applied Sciences"
-msgstr "Bielefeld University of Applied Sciences"
+#: projects.inc:418
+msgid "Search for evidence of extra-terrestrial life"
+msgstr "尋找外星生命存在的證據"
+
+#: projects.inc:442
+msgid "Multiple applications"
+msgstr "複合專案"
 
-#: projects.inc:343
-msgid "Chemical engineering and nanotechnology"
-msgstr "化學工程與奈米技術"
+#: projects.inc:448
+msgid "Molecular biology, Computer Science"
+msgstr "分子生物學,計算機科學"
 
-#: projects.inc:344
+#: projects.inc:449
 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 "研究分子磁體和奈米尺度的磁力學。這些分子磁體可用於研發微型磁性開關,適用於醫藥(比如腫瘤化療)和生物技術領域。"
+"The Citizen Science Grid is dedicated to supporting a wide range of research"
+" and educational projects using volunteer computing and citizen science."
+msgstr "公民科學網格致力於支援廣泛的研究和教育項目使用志願者計算和公民科學。"
 
-#: projects.inc:351
-msgid "Multiple applications"
-msgstr "複合專案"
+#: projects.inc:452
+msgid "Support science from the University of North Dakota"
+msgstr "支援北達科塔州大學的科學"
 
-#: projects.inc:356
+#: projects.inc:457
 msgid "Chinese Academy of Sciences"
 msgstr "Chinese Academy of Sciences"
 
-#: projects.inc:357
+#: projects.inc:458
 msgid "Physics, biochemistry, and others"
-msgstr "物理,生物化學和其他"
+msgstr "物理,生物化學和其它"
 
-#: projects.inc:358
+#: projects.inc:459
 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
+#: projects.inc:462
+msgid "Help Chinese researchers"
+msgstr "幫助來自中國的研究員"
+
+#: projects.inc:468
 msgid "Mathematics, physics, evolution"
 msgstr "數學,物理學,進化論"
 
-#: projects.inc:366
+#: projects.inc:469
 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 平台。"
+msgstr "Yoyo at home 將一些傳統的志願運算專案,包括ECM、Muon、Evolution at home 和 distributed.net 等,移植到 BOINC 平台。"
+
+#: projects.inc:472
+msgid "Do research in math, physics, and evolution"
+msgstr "研究數學、物理及演化學"
 
-#: projects.inc:371 projects.inc:527
+#: projects.inc:477 projects.inc:677
 msgid "MTA-SZTAKI Laboratory of Parallel and Distributed Systems (Hungary)"
 msgstr "MTA-SZTAKI Laboratory of Parallel and Distributed Systems (Hungary)"
 
-#: projects.inc:372
+#: projects.inc:478
 msgid "European research projects"
 msgstr "歐盟研究專案"
 
-#: projects.inc:373
+#: projects.inc:479
 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 "
@@ -802,27 +788,35 @@ msgid ""
 " by the project include math, physics, biology, etc."
 msgstr "EDGes at Home Beta 專案將志願運算融入到歐洲運算服務網格的網路,允許服務網格將運算任務分發給專案的參與者們處理。專案所涉及的科研領域包括數學、物理、生物等等。"
 
-#: projects.inc:379
+#: projects.inc:482
+msgid "Help European researchers"
+msgstr "幫助來自歐洲的研究者"
+
+#: projects.inc:487
 msgid "Spanish universities and research centers"
 msgstr "西班牙的大學和研究中心"
 
-#: projects.inc:380
+#: projects.inc:488
 msgid "Various Spanish research projects"
 msgstr "西班牙各種的研究專案"
 
-#: projects.inc:381
+#: projects.inc:489
 msgid "Research in physics, material science, and biomedicine"
 msgstr "物理學、材料科學和生物醫藥學方面的研究"
 
-#: projects.inc:387
+#: projects.inc:492
+msgid "Help Spanish researchers"
+msgstr "幫助來自西班牙的研究者"
+
+#: projects.inc:497
 msgid "IBM Corporate Citizenship"
 msgstr "IBM Corporate Citizenship"
 
-#: projects.inc:388
+#: projects.inc:498
 msgid "Medical, environmental and other humanitarian research"
-msgstr "醫療、環境和其他人道主義研究"
+msgstr "醫療、環境和其它人道主義研究"
 
-#: projects.inc:389
+#: projects.inc:499
 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"
@@ -830,50 +824,87 @@ msgid ""
 "clean water and many more."
 msgstr "透過建立世界上最大的參與者網格運算,進一步研究關鍵且非營利對於人類最緊迫的問題。研究包括愛滋病、癌症、熱帶和被忽視的各種疾病、太陽能、乾淨的水…等等。"
 
-#: projects.inc:395
+#: projects.inc:502
+msgid "Do biomedical and environmental research"
+msgstr "進行有關生物醫學和環境科學的研究"
+
+#: projects.inc:507
 msgid "Mathematics, computing, and games"
 msgstr "數學,運算和遊戲"
 
-#: projects.inc:401
+#: projects.inc:533 projects.inc:602 projects.inc:658 projects.inc:668
+#: projects.inc:678
+msgid "Mathematics"
+msgstr "數學"
+
+#: projects.inc:534
+msgid ""
+"NumberFields at home searches for fields with special properties. The primary "
+"application of this research is in the realm of algebraic number theory. "
+"Number theorists can mine the data for interesting patterns to help them "
+"formulate conjectures about number fields. Ultimately, this research will "
+"lead to a deeper understanding of the profound properties of numbers, the "
+"basic building blocks of all mathematics."
+msgstr "NumberFields at home 搜尋具有特殊性質的數域。本研究主要應用於代數數論領域。數論學家可以挖掘資料之中含有的有趣的模式,以幫助他們提出有關數論的猜想。最終,這項研究將使我們對數字,數學的最基本元素的所有屬性有更深入地瞭解。"
+
+#: projects.inc:537
+msgid "Do research in algebraic number theory"
+msgstr "代數數論的研究"
+
+#: projects.inc:553
 msgid "Computer Science"
 msgstr "電腦科學"
 
-#: projects.inc:409
-msgid "Mathematics, Physics, Artificial Intelligence"
-msgstr "數學,物理,人工智慧"
+#: projects.inc:554
+msgid ""
+"Solve hard and practically important problems (discrete functions inversion "
+"problems, discrete optimization, bioinformatics, etc.) that can be "
+"effectively reduced to Boolean satisfiability problem."
+msgstr "解決一些可以有效地減少為布爾可滿足性問題的困難和具有重要現實意義的問題 (離散函數的反演問題、 離散優化、 生物資訊學等)。"
+
+#: projects.inc:557
+msgid "Study computational complexity"
+msgstr "研究計算複雜度"
+
+#: projects.inc:582
+msgid "Cryptography and combinatorics"
+msgstr "密碼學以及組合學"
 
-#: projects.inc:410
-msgid "Simulation of quantum computing; Goldbach's conjecture."
-msgstr "模擬量子運算;哥德巴赫猜想。"
+#: projects.inc:583 projects.inc:586
+msgid "Run applications from distributed.net"
+msgstr "執行來自distributed.net的應用程式"
 
-#: projects.inc:450 projects.inc:458
+#: projects.inc:592
 msgid "Cryptography"
 msgstr "密碼學"
 
-#: projects.inc:459
+#: projects.inc:593
 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
-msgid "Mathematics"
-msgstr "數學"
+#: projects.inc:596
+msgid "Decode WWII submarine messages"
+msgstr "解碼二戰潛艇的訊息"
 
-#: projects.inc:466
+#: projects.inc:603
 msgid "Study the Collatz Conjecture, an unsolved conjecture in mathematics"
-msgstr "研究考拉茲猜想(Collat​​z conje​​cture),一個尚未被證明的數學猜想。"
+msgstr "研究考拉茲猜想 (Collatz Conjecture),一個尚未被證明的數學猜想。"
+
+#: projects.inc:606
+msgid "Study the Collatz Conjecture"
+msgstr "研究考拉茲猜想"
 
-#: projects.inc:471
+#: projects.inc:611
 msgid "California State University Fullerton"
 msgstr "California State University Fullerton"
 
-#: projects.inc:472
+#: projects.inc:612
 msgid "Factorization of large integers"
-msgstr "大整數因子分解"
+msgstr "大整數因數分解"
 
-#: projects.inc:473
+#: projects.inc:613
 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 "
@@ -881,63 +912,53 @@ 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 是一個利用通過網路互連的電腦進行大整數數域篩選分解中的格篩步驟的研究專案。當你還是一個年輕的學生時,你應該就有了分解質因數的經歷,比如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)"
-
-#: 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)和其它立陶宛的科研機構提供一個強大的分佈式運算平台。當前的應用主要涉及到基於蒙特卡羅的軟體測試研究。"
-
-#: projects.inc:503
-msgid "Mathematical Institute of Leiden University / Kennislink"
-msgstr "Mathematical Institute of Leiden University / Kennislink"
+msgstr "NFS at Home 是一個運用網路互連的電腦進行大整數數域篩選分解中的格篩步驟的研究專案。當您還是一個年輕的學生時,應該就有分解質因數的經歷,比如 15 = 3 * 5 或者 35 = 5 * 7。 NFS at Home 正是這一經歷的延續,不過卻是分解有數百位數字長的大整數。"
 
-#: 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 猜想條件的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:616
+msgid "Study the factorization of large integers"
+msgstr "研究大整數的因數分解"
 
-#: projects.inc:513
+#: projects.inc:659
 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
+#: projects.inc:662
+msgid "Search for large prime numbers"
+msgstr "尋找大質數"
+
+#: projects.inc:667
 msgid "Hochschule RheinMain University of Applied Sciences"
 msgstr "Hochschule RheinMain University of Applied Sciences"
 
-#: projects.inc:521
+#: projects.inc:669
 msgid ""
 "Search for counterexamples to two conjectures related to the identification "
 "of prime numbers"
 msgstr "尋找兩個有關質數識別的猜想的反例。"
 
-#: projects.inc:529
+#: projects.inc:672
+msgid "Study the properties of prime numbers"
+msgstr "研究質數的特性"
+
+#: projects.inc:679
 msgid ""
 "Find all the generalized binary number systems (in which bases are matrices "
 "and digits are vectors) up to dimension 11."
 msgstr "尋找所有的廣義二進制數係(基是矩陣,而位是向量),目前項目正在搜索12 維的廣義二進制數係。"
 
+#: projects.inc:682
+msgid "Study number theory"
+msgstr "研究數論"
+
+#: projects.inc:739
+msgid ""
+"Testing and comparison of heuristic methods for getting separations of "
+"parallel algorithms working in the CAD system for designing logic control "
+"systems"
+msgstr "測試並比較啟發式方法以研究用於CAD邏輯控制設計系統的分立的並行演算法"
+
 #: ../html/inc/news.inc:40
 msgid "Comment"
 msgstr "評論"
diff --git a/mac3rdParty/buildMacTravis.sh b/mac3rdParty/buildMacTravis.sh
new file mode 100755
index 0000000..e3adeb4
--- /dev/null
+++ b/mac3rdParty/buildMacTravis.sh
@@ -0,0 +1,74 @@
+#!/bin/bash
+set -x
+
+# 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/>.
+#
+
+## Travis-CI support script to build BOINC on Macintosh
+## Downloads third party libraries needed for building BOINC on Macintosh
+## if needed.
+## 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: ./mac3rdParty/buildMacTravis.sh
+cd ./mac3rdParty
+
+# if the versioning changes try to delete the old directory and change .travis.yml to cache the new directory
+
+
+if [ ! -d "c-ares-1.10.0" ]; then
+  wget http://c-ares.haxx.se/download/c-ares-1.10.0.tar.gz
+  tar -xf c-ares-1.10.0.tar.gz
+fi
+
+if [ ! -d "curl-7.39.0" ]; then
+  wget http://curl.haxx.se/download/curl-7.39.0.tar.gz
+  tar -xf curl-7.39.0.tar.gz
+fi
+
+if [ ! -d "openssl-1.0.1j" ]; then
+  wget http://www.openssl.org/source/openssl-1.0.1j.tar.gz
+  tar -xf openssl-1.0.1j.tar.gz
+fi
+
+if [ ! -d "wxWidgets-3.0.0" ]; then
+  wget http://sourceforge.net/projects/wxwindows/files/3.0.0/wxWidgets-3.0.0.tar.bz2/
+  tar -xf wxWidgets-3.0.0.tar.bz2
+fi
+
+if [ ! -d "sqlite-autoconf-3080300" ]; then
+  wget http://www.sqlite.org/2014/sqlite-autoconf-3080300.tar.gz
+  tar -xf sqlite-autoconf-3080300.tar.gz
+fi
+
+if [ ! -d "freetype-2.4.10" ]; then
+  wget http://sourceforge.net/projects/freetype/files/freetype2/2.4.10/freetype-2.4.10.tar.bz2
+  tar -xf freetype-2.4.10.tar.bz2
+fi
+
+if [ ! -d "ftgl-2.1.3~rc5" ]; then
+  wget http://sourceforge.net/projects/ftgl/files/FTGL%20Source/2.1.3%7Erc5/ftgl-2.1.3-rc5.tar.gz
+  tar -xf ftgl-2.1.3-rc5.tar.gz
+fi
+
+## This script checks if a cached version is available and builds one if not.
+cd ../mac_build
+source setupForBoinc.sh
+
+if [  $? -eq 0 ]; then
+    source BuildMacBOINC.sh
+fi
diff --git a/vda/vda.cpp b/vda/vda.cpp
index 1ab64ee..ec944bb 100644
--- a/vda/vda.cpp
+++ b/vda/vda.cpp
@@ -150,7 +150,7 @@ int handle_add(const char* path) {
 int handle_remove(const char* name) {
     DB_VDA_FILE vf;
     char buf[1024];
-    sprintf(buf, "where file_name='%s'", name);
+    snprintf(buf, sizeof(buf), "where file_name='%s'", name);
     int retval = vf.lookup(buf);
     if (retval) return retval;
 
@@ -178,7 +178,7 @@ int handle_remove(const char* name) {
 int handle_retrieve(const char* name) {
     DB_VDA_FILE vf;
     char buf[1024];
-    sprintf(buf, "where file_name='%s'", name);
+    snprintf(buf, sizeof(buf), "where file_name='%s'", name);
     int retval = vf.lookup(buf);
     if (retval) return retval;
     retval = vf.update_field("retrieving=1, need_update=1");
@@ -188,7 +188,7 @@ int handle_retrieve(const char* name) {
 int handle_status(const char* name) {
     DB_VDA_FILE dvf;
     char buf[1024];
-    sprintf(buf, "where file_name='%s'", name);
+    snprintf(buf, sizeof(buf), "where file_name='%s'", name);
     int retval = dvf.lookup(buf);
     if (retval) return retval;
 
diff --git a/version.log b/version.log
index 73a16e6..03d71dc 100644
--- a/version.log
+++ b/version.log
@@ -1 +1 @@
-7.6.17
+7.6.19

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