From 621f7a66f336327c0a100bbe5daa9115378080eb Mon Sep 17 00:00:00 2001
From: Jens Seidler <jens@planet-seidler.de>
Date: Wed, 24 Jan 2007 06:51:41 +0000
Subject: [PATCH] Localization: Web,  project-specific  and BOINC survey
 language files updated: German(de), French(fr), Slovak(sk), Chinese
 simplified(zh_CN),  Chinese Traditional(zh_TW)

svn path=/trunk/boinc/; revision=11948
---
 html/languages/translations/sk.po    |  337 ++++
 html/languages/translations/zh_TW.po |  179 +-
 languages/translations/de.po         |   23 +-
 locale/client/fr/BOINC Manager.mo    |  Bin 48532 -> 49155 bytes
 locale/client/fr/BOINC Manager.po    |   23 +-
 locale/client/zh_CN/BOINC Manager.mo |  Bin 43220 -> 44340 bytes
 locale/client/zh_CN/BOINC Manager.po | 1013 ++++++-----
 locale/client/zh_TW/Boinc Manager.mo |  Bin 37755 -> 44215 bytes
 locale/client/zh_TW/Boinc Manager.po | 2346 ++++++++++++++++----------
 9 files changed, 2486 insertions(+), 1435 deletions(-)
 create mode 100644 html/languages/translations/sk.po

diff --git a/html/languages/translations/sk.po b/html/languages/translations/sk.po
new file mode 100644
index 0000000000..87f46cb188
--- /dev/null
+++ b/html/languages/translations/sk.po
@@ -0,0 +1,337 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: boinc-html-lang\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: 2007-01-16 00:44+0100\n"
+"Last-Translator: marpes <marpes@zoznam.sk>\n"
+"Language-Team: boinc.sk\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Slovak\n"
+"X-Poedit-Country: SLOVAKIA\n"
+
+# ########################################
+# Language: Slovak (International)
+# FileID  : $Id$
+# Author  : marpes
+# Email   : marpes@zoznam.sk
+# ########################################
+# Pre viac informácií prosím pozrite:
+# http://boinc.berkeley.edu/web_translation.php
+# ########################################
+# Znaková sada použitá pre textv tomto súbore (prosím skúste použiť UTF-8 ak je možné)
+msgid "CHARSET"
+msgstr "UTF-8"
+
+# The name of this language in this language
+msgid "LANG_NAME_NATIVE"
+msgstr "Slovenčina"
+
+# The name of this language in an international language (English)
+msgid "LANG_NAME_INTERNATIONAL"
+msgstr "Slovak"
+
+# #######################################
+# Apps page (apps.php)
+# #######################################
+msgid "APPS_TITLE"
+msgstr "Aplikačné programy"
+
+msgid "APPS_DESCRIPTION"
+msgstr "$PROJECT v súčasnej dobe používa nasledujúce aplikačné programy. Ak ste zapojený v $PROJECT, práca pre jeden alebo viac z týchto aplikačných programov bude pridelená Vášmu počítaču. Aktuálna verzia aplikačného programu bude stiahnutá vaším počítačom automaticky, bez Vášho zásahu. "
+
+msgid "APPS_PLATFORM"
+msgstr "Platforma"
+
+msgid "APPS_VERSION"
+msgstr "Aktuálna verzia"
+
+msgid "APPS_INSTALLTIME"
+msgstr "Inštalovaná"
+
+# #######################################
+# Rules and Policies page (info.php)
+# #######################################
+msgid "RULES_TITLE"
+msgstr "Prečítajte si pravidlá a zásady"
+
+msgid "RULES_ONLY_AUTH"
+msgstr "$PROJECT počítajte len na autorizovaných počítačoch"
+
+msgid "RULES_ONLY_AUTH_TEXT"
+msgstr "$PROJECT počítajte len na počítačoch, ktoré vlastníte, alebo pre ktoré máte povolenie vlastníka. Niektoré firmy a školy majú predpisy, ktoré zakazujú používanie ich počítačov pre projekty ako je $PROJECT ."
+
+msgid "RULES_COMPUTER_USE"
+msgstr "Ako bude $PROJECT využívať Váš počítač"
+
+msgid "RULES_COMPUTER_USE_TEXT_A"
+msgstr "Keď budete na Vašom počítači počítať $PROJECT, bude tento využívať časť výpočtového výkonu, miesta na disku a sieťového pripojenia Vášho počítača. Môžete ovládať, aký podiel výkonu bude $PROJECT využívať, a tiež kedy."
+
+msgid "RULES_COMPUTER_USE_TEXT_B"
+msgstr "Práca vykonaná Vaším počítačom prispeje k dosiahnutiu cieľov $PROJECT, tak, ako je písané na stránkach projektu. Ciele projektu sa môžu z času na čas meniť."
+
+msgid "RULES_PRIVACY"
+msgstr "Ochrana súkromia"
+
+msgid "RULES_PRIVACY_TEXT_A"
+msgstr "Vaše konto na $PROJECT bude identifikované menom, ktoré si zvolíte. Toto meno môže byť ukázané na $PROJECT web stránkach, spoločne s množstvom práce vykonanej Vaším počítačom pre $PROJECT. Ak chcete zostať v anonymite, zvoľte si meno, ktoré neodhalí Vašu pravú identitu."
+
+msgid "RULES_PRIVACY_TEXT_B"
+msgstr "Ak sa zapojíte do $PROJECT, informácie o Vašom počítači (ako typ procesora, veľkosť pamäte, atď.) budú zaznamenané v $PROJECT a použité na určenie, aký typ práce priodeliť pre Váš počítač. Tieto informácie budú tiež ukázané na web stránkach $PROJECT. Nič, čo by odhaľovalo umiestnenie Vášho počítača (napr. názov jeho domény alebo sieťová adresa) nebude ukázané."
+
+msgid "RULES_PRIVACY_TEXT_C"
+msgstr "Pre zapojenie sa do $PROJECT, musíte poskytnúť adresu, na ktorej prijímate e-maily. Táto adresa nebude ukázaná na web stránkach $PROJECT, ani zdieľaná s inými organizáciami. $PROJECT Vám môže posielať nové informácie, ktorých prijímanie môžete kedykoľvek zrušiť."
+
+msgid "RULES_SAFE"
+msgstr "Je bezpečné počítať $PROJECT ?"
+
+msgid "RULES_SAFE_TEXT_A"
+msgstr "Pri sťahovaní programov cez Internet beriete na seba riziko: program by mohol mať závažné chyby, alebo server, z ktorého sťahujete by mohol byť napadnutý útočníkom. $PROJECT má urobené opatrenia na minimalizáciu týchto rizík. Máme starostlivo testované naše aplikácie. Naše servery sú za bezpečnostnou bránou a sú nastavené na vysokú úroveň zabezpečenia. Pre zaistenie integrity sťahovaných programov sú všetky spustiteľné súbory digitálne pospísané na bezpečnom počítači, nepripojenom k Internetu."
+
+msgid "RULES_SAFE_TEXT_B"
+msgstr "Činnosť aplikačných programov $PROJECT môže na niektorých počítačoch spôsobovať prehrievanie. Ak sa to stane, zastavte výpočet $PROJECT, alebo použite %s ktoré obmedzujú využitie procesora."
+
+msgid "RULES_UTILITY_PROGRAM"
+msgstr "pomocné programy"
+
+msgid "RULES_SAFE_TEXT_C"
+msgstr "$PROJECT bol vyvinutý v %s. BOINC bol vyvinutý na University of California v Berkeley."
+
+msgid "RULES_LIABILITY"
+msgstr "Zodpovednosť"
+
+msgid "RULES_LIABILITY_TEXT"
+msgstr "$PROJECT a %s nenesú žiadnu zodpovednosť za poškodenie ášho počítača, stratu údajov, alebo akékoľvek iné udalosti alebo stavy, ktoré môžu nastať ako dôsledok  účasti v $PROJECT."
+
+msgid "RULES_OTHER"
+msgstr "Iné BOINC projekty"
+
+msgid "RULES_OTHER_TEXT_A"
+msgstr "Tak ako $PROJECT, aj ďalšie projekty využívajú rovnakú platformu - BOINC. Môžete uvážiť účasť v jednom, alebo viacerých z týchto projektov. Ak tak urobíte, Vášr počítač bude užitočne pracovať, i keď $PROJECT nebude mať žiadnu prácu."
+
+msgid "RULES_OTHER_TEXT_B"
+msgstr "Tieto ďalšie projekty nie sú združené s $PROJECT, a teda sa nemôžeme zaručiť za ich bezpečnostnú praxani za predmet ich výskumu. Pripojte sa k nim na vlastné riziko."
+
+# #######################################
+# Create account form (create_account_form.php)
+# #######################################
+msgid "CREATE_AC_TITLE"
+msgstr "Vytvorenie konta"
+
+msgid "CREATE_AC_READ_RULES"
+msgstr "Prečítajte si %s pred vytvorením konta."
+
+msgid "CREATE_AC_ALREADY_GOT"
+msgstr "Ak ste už obdržali kľúč konta, nevypĺňajte tento formulár. %s namiesto toho."
+
+msgid "CREATE_AC_NAME"
+msgstr "Meno"
+
+msgid "CREATE_AC_NAME_DESC"
+msgstr "Identifikáciana stránke Vášho konta v našej sieti. Použite Vaše skutočné meno, alebo prezývku."
+
+msgid "CREATE_AC_EMAIL"
+msgstr "Emailová adresa"
+
+msgid "CREATE_AC_EMAIL_DESC"
+msgstr "Musí byť platná adresa tvaru 'meno@domena'."
+
+msgid "CREATE_AC_COUNTRY"
+msgstr "Krajina"
+
+msgid "CREATE_AC_COUNTRY_DESC"
+msgstr "Vyberte krajinu, ktorú chcete reprezentovať."
+
+msgid "CREATE_AC_ZIP"
+msgstr "Poštové smerovacie číslo"
+
+msgid "CREATE_AC_CREATE"
+msgstr "Vytvoriť konto"
+
+msgid "CREATE_AC_DISABLED"
+msgstr "Vytváranie konta je zablokované"
+
+msgid "CREATE_AC_DISABLED_TEXT"
+msgstr "Vytváranie konta je v $PROJECT dočasne zablokované. Prosím skúste znova neskôr."
+
+msgid "CREATE_AC_TEAM"
+msgstr "Toto konto bude náležať k tímu %s a bude mať preferencie projektu podľa jeho zakladateľa."
+
+msgid "CREATE_AC_USE_CLIENT"
+msgstr "POZNÁMKA: Ak používate BOINC verziu 5.2 a vyššiu s BOINC Manažérom, nepoužívajte tento formulár. Iba spustite BOINC, vyberte Attach Project (Pripojiť k projektu), a vložte emailovú adresu a heslo. "
+
+msgid "CREATE_AC_PASSWORD"
+msgstr "Heslo"
+
+msgid "CREATE_AC_PASSWORD_DESC"
+msgstr "Musí mať minimálne %s znakov"
+
+msgid "CREATE_AC_CONFIRM_PASSWORD"
+msgstr "Potvrdenie hesla"
+
+msgid "AC_INVITE_REQUIRED"
+msgstr "Musíte vložiť pozvánkový kód pre vytvorenie konta."
+
+msgid "AC_INVITE_INVALID"
+msgstr "Pozvánkový kód Vami vložený nie je správnyThe invitation code you gave is not valid."
+
+# #######################################
+# Forum sample index page
+# #######################################
+msgid "FORUM_TITLE"
+msgstr "$PROJECT Diskusné fórum"
+
+msgid "FORUM_TITLE_SHORT"
+msgstr "Diskusné fórum"
+
+# #######################################
+# General stuff (create_account_form.php and others)
+# #######################################
+msgid "OPTIONAL"
+msgstr "Nepovinné"
+
+# #######################################
+# Various top table pages (top users, computers, teams)
+# #######################################
+msgid "TOP_PARTICIPANT_TITLE"
+msgstr "Najlepší účastníci"
+
+msgid "USER_TABLE_RANK"
+msgstr "Poradie"
+
+msgid "USER_TABLE_NAME"
+msgstr "Meno"
+
+msgid "TOTAL_CREDIT"
+msgstr "Celkový kredit"
+
+msgid "EXPAVG_CREDIT"
+msgstr "Súčasný priemerný kredit (RAC)"
+
+msgid "USER_TABLE_COUNTRY"
+msgstr "Krajina"
+
+msgid "USER_TABLE_PTIME"
+msgstr "Účastník od"
+
+msgid "TOP_TEAMS_TITLE"
+msgstr "Najlepšie %s tímy"
+
+msgid "TEAM_TABLE_MEMBERS"
+msgstr "Členov"
+
+# #######################################
+# Forum
+# #######################################
+msgid "FORUM_POSTS"
+msgstr "Príspevkov"
+
+msgid "FORUM_TOPIC"
+msgstr "Téma"
+
+msgid "FORUM_THREADS"
+msgstr "Vlákna"
+
+msgid "FORUM_LAST_POST"
+msgstr "Najnovší príspevok"
+
+msgid "FORUM_AUTHOR"
+msgstr "Autor"
+
+msgid "FORUM_VIEWS"
+msgstr "Náhľady"
+
+msgid "FORUM_ERR_NOT_FOUND"
+msgstr "Žiadne také fórum nenájdené"
+
+msgid "FORUM_ERR_EXPAVG"
+msgstr "Pre vytvorenie nového vlákna v %s musíte mať istý  kredit.Toto je na prevenciu a ochranu pred zneužitím systému."
+
+msgid "FORUM_ERR_INTERVAL"
+msgstr "Práve teraz nemôžete vytvoriť žiadne nové vlákna. Prosím počkajte chvíľu než skúsite znova.Toto zdržanie bola vložené ako ochrana proti zneužitiu systému."
+
+msgid "FORUM_QA_POST_MESSAGE"
+msgstr "Oblasť %s Vám umožňuje získať pomoc od iných užívateľov. Ak máte otázku alebo problém:"
+
+msgid "FORUM_QA_POST_MESSAGE2"
+msgstr "Prečítajte si existujúci zoznam otázok. Ak už obsahuje Vašu otázku, kliknite na %s tlačidlo. Ak odpovede na otázku boli vložené, prečítajte si ich. Ak niektorá z nich odpovedá na Vašu otázku, kliknite na %s tlačidlo."
+
+msgid "FORUM_QA_POST_MESSAGE3"
+msgstr "Ak Vaša otázka zatiaľ nebola zodpovedaná, položte ju pomocou tohoto formulára."
+
+msgid "FORUM_QA_POST_MESSAGE4"
+msgstr "Tým sa predíde kladeniu duplicitných otázok."
+
+msgid "FORUM_QA_SUBMIT_NEW"
+msgstr "Vložiť novú otázku/problém"
+
+msgid "FORUM_SUBMIT_NEW"
+msgstr "Vytvoriť nové vlákno"
+
+msgid "FORUM_SUBMIT_NEW_TITLE"
+msgstr "Názov"
+
+msgid "FORUM_QA_SUBMIT_NEW_HELP"
+msgstr "Formulujte Vašu otázku niekoľkými slovami. Stručné a jasné zhrnutie pomôže ostatným s rovnakou otázkou (alebo odpoveďou) ju nájsť."
+
+msgid "FORUM_QA_SUBMIT_NEW_BODY_HELP"
+msgstr "Ak máte softvérové problemy, uveďte verziu softvéru, typ Vášho počítača a operačný systém."
+
+msgid "FORUM_ADD_MY_SIG"
+msgstr "Pridať môj podpis k tomuto príspevku"
+
+msgid "FORUM_MESSAGE"
+msgstr "Správa"
+
+msgid "FORUM_QA_GOT_PROBLEM_TOO"
+msgstr "Mám tiež tento problém"
+
+msgid "FORUM_QA_QUESTION_ANSWERED"
+msgstr "Toto odpovedá na moju otázku"
+
+msgid "FORUM_HTML_INFO"
+msgstr "Používajte  BBCode tagy na formátovanie Vášho textu"
+
+# #######################################
+# Forum thread
+# #######################################
+msgid "FORUM_THREAD_HIDDEN"
+msgstr "Toto vlákno bolo schované z administratívnych dôvodov"
+
+msgid "FORUM_THREAD_REPLY"
+msgstr "Reagovať na toto vlákno"
+
+msgid "FORUM_THREAD_SUBSCRIBED"
+msgstr "Ste zapísaný do tohoto vlákna."
+
+msgid "FORUM_THREAD_UNSUBSCRIBE"
+msgstr "Kliknúť sem pre zrušenie zápisu"
+
+msgid "FORUM_THREAD_SUBSCRIBE"
+msgstr "Zapísať sa do tohoto vlákna"
+
+# #######################################
+# Forum search features
+# #######################################
+msgid "FORUM_SEARCH"
+msgstr "Hľadať na fóre"
+
+msgid "FORUM_SEARCH_TITLES"
+msgstr "Nadpisy obsahujúce '%s'"
+
+msgid "FORUM_SEARCH_BODIES"
+msgstr "Príspevky obsahujúce '%s'"
+
+msgid "FORUM_SEARCH_TITLES_NO"
+msgstr "Žiadne nadpisy obsahujúce '%s' neboli nájdené."
+
+msgid "FORUM_SEARCH_BODIES_NO"
+msgstr "Žiadne príspevky obsahujúce '%s' neboli nájdené."
+
+# #######################################
+# Links from the main page
+# #######################################
+msgid "LINKS_QA"
+msgstr "Otázky a odpovede"
+
diff --git a/html/languages/translations/zh_TW.po b/html/languages/translations/zh_TW.po
index 046e12f273..3544b3d375 100644
--- a/html/languages/translations/zh_TW.po
+++ b/html/languages/translations/zh_TW.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2005-11-15 10:57+0800\n"
+"PO-Revision-Date: 2007-01-19 17:29+0800\n"
 "Last-Translator: Jose Sun <josesun@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -158,112 +158,20 @@ msgstr "這個帳號屬於 %s  團隊並且有團隊創立者自己的專案偏
 msgid "CREATE_AC_USE_CLIENT"
 msgstr "備註：從 BOINC 5.2 版開始，你不再需要填寫此表單，可以直接從 BOINC 程式裡建立新帳號。只要執行 BOINC，選擇「加入專案」後，輸入你的電子郵件地址和密碼即可。"
 
-# ########################################
-# Account created page (account_created.php)
-# ########################################
-msgid "AC_READY_TITLE"
-msgstr "帳號已建立。"
+msgid "CREATE_AC_PASSWORD"
+msgstr "密碼"
 
-msgid "AC_READY_WELCOME"
-msgstr "恭喜你 - 你的 $PROJECT 帳號已經建立"
+msgid "CREATE_AC_PASSWORD_DESC"
+msgstr "必須大於 %s 個字元"
 
-msgid "AC_READY_PASTE"
-msgstr "請在這裡貼上你的帳號金鑰以繼續下一步："
+msgid "CREATE_AC_CONFIRM_PASSWORD"
+msgstr "密碼確認"
 
-msgid "AC_READY_CLICK"
-msgstr "然後按一下"
+msgid "AC_INVITE_REQUIRED"
+msgstr "你必須輸入邀請碼才能建立帳號。"
 
-# ########################################
-# Account setup page (account_setuo.php)
-# ########################################
-# also used in account_setup_nonfirst.php:
-msgid "AC_SETUP_TITLE"
-msgstr "帳號設定"
-
-msgid "AC_SETUP_USES_BOINC"
-msgstr "$PROJECT 使用 BOINC 軟體系統。"
-
-msgid "AC_SETUP_DIVISION"
-msgstr "BOINC 可以讓你自行分配你電腦的運算時間給數個分散式運算專案。"
-
-msgid "AC_SETUP_ISFIRST"
-msgstr "這是你的第一個 BOINC 專案嗎？"
-
-msgid "AC_SETUP_FIRST"
-msgstr "是的 - 這是我的第一個 BONIC 專案"
-
-msgid "AC_SETUP_NONFIRST"
-msgstr "不是 - 我已經參與了一個以上它的 BOINC 專案"
-
-# ########################################
-# First Account setup page (account_setup_first.php)
-# ########################################
-msgid "AC_FIRST_TITLE"
-msgstr "帳號偏好設定"
-
-msgid "AC_FIRST_CONTROL"
-msgstr "你可以控制 $PROJECT 運用你電腦的時間和方式"
-
-msgid "AC_FIRST_DEFAULT"
-msgstr "如果要套用預設的設定值，請捲動頁面到最底端並按一下 OK。"
-
-# ########################################
-# First Account setup done page (account_setup_first_done.php)
-# and (account_setup_nonfirst_done.php
-# ########################################
-msgid "AC_DONE_TITLE"
-msgstr "帳號設定：完成"
-
-msgid "AC_DONE_COMPLETE"
-msgstr "你的帳號設定已經完成。"
-
-msgid "AC_DONE_BOINC"
-msgstr "下一步你必須下載和安裝 BOINC 軟體，然後告訴你的電腦使用這個帳號。"
-
-msgid "AC_DONE_URL"
-msgstr "當 BOINC 軟體第一次執行時，它會詢問你 <b>專案網址</b> 和 <b>帳號金鑰</b> 。"
-
-msgid "AC_DONE_COPYPASTE"
-msgstr "複製下面的訊息並貼上到軟體中："
-
-msgid "AC_DONE_GETDOWNLOAD"
-msgstr "你現在可以 %s 以完成 $PROJECT 的安裝。"
-
-msgid "AC_DONE_DL_BOINC"
-msgstr "下載 BOINC 軟體"
-
-msgid "AC_DONE_THANKS"
-msgstr "感謝你參與 $PROJECT 專案"
-
-# ########################################
-# Non-first Account setup page (account_setup_nonfirst.php)
-# ########################################
-msgid "AC_NONFIRST_TITLE"
-msgstr "帳號設定：資源分享"
-
-# ########################################
-# Non-first Account setup done page (account_setup_nonfirst_done.php)
-# ########################################
-msgid "AC_DONE_MUST_USE"
-msgstr "下一步你必須告訴你電腦使用這個帳號。"
-
-msgid "AC_DONE_WIN"
-msgstr "Windows 使用者："
-
-msgid "AC_DONE_WIN_TEXT"
-msgstr "按兩下 BOINC 的系統匣圖示開啟 BOINC 應用程式視窗。然後從設定功能表選擇「加入新專案」。接下來程式會詢問你專案網址和帳號金鑰。"
-
-msgid "AC_DONE_UNIX"
-msgstr "Mac、Unix 和 Linux 的使用者："
-
-msgid "AC_DONE_UNIX_TEXT"
-msgstr "離開 BOINC 用戶端。然後以 -attach_project 選項執行 BOINC 用戶端。接下來程式會詢問你專案網址和帳號金鑰。"
-
-msgid "AC_DONE_ANYCASE"
-msgstr "所有使用者都要複製下面的訊息並貼上到軟體中："
-
-msgid "AC_DONE_INSTALLED"
-msgstr "已經完成了 $PROJECT 的安裝。"
+msgid "AC_INVITE_INVALID"
+msgstr "你輸入的邀請碼無效。"
 
 # ########################################
 # Rules and Policies page (info.php)
@@ -272,11 +180,10 @@ msgid "FORUM_TITLE"
 msgstr "$PROJECT 留言板"
 
 # ########################################
-# Different strange places:
+# Rules and Policies page (info.php)
 # ########################################
-# account_created.php
-msgid "AC_CREATED_TITLE"
-msgstr "組態你的帳號"
+msgid "FORUM_TITLE_SHORT"
+msgstr "留言板"
 
 # ########################################
 # General stuff (create_account_form.php and others)
@@ -296,10 +203,10 @@ msgstr "排名"
 msgid "USER_TABLE_NAME"
 msgstr "姓名"
 
-msgid "USER_TABLE_TOTAL_CREDIT"
+msgid "TOTAL_CREDIT"
 msgstr "總積分"
 
-msgid "USER_TABLE_EXPAVG"
+msgid "EXPAVG_CREDIT"
 msgstr "最近平均積分"
 
 msgid "USER_TABLE_COUNTRY"
@@ -317,6 +224,36 @@ msgstr "%s 團隊排名"
 msgid "TEAM_TABLE_MEMBERS"
 msgstr "成員"
 
+msgid "FORUM_POSTS"
+msgstr "篇數"
+
+# ########################################
+# Rules and Policies page (info.php)
+# ########################################
+msgid "FORUM_TOPIC"
+msgstr "主題"
+
+# ########################################
+# Rules and Policies page (info.php)
+# ########################################
+msgid "FORUM_THREADS"
+msgstr "討論串"
+
+msgid "FORUM_LAST_POST"
+msgstr "最後發表時間"
+
+# ########################################
+# Rules and Policies page (info.php)
+# ########################################
+msgid "FORUM_AUTHOR"
+msgstr "發表者"
+
+# ########################################
+# Rules and Policies page (info.php)
+# ########################################
+msgid "FORUM_VIEWS"
+msgstr "觀看次數"
+
 # ########################################
 # Forum
 # ########################################
@@ -383,6 +320,30 @@ msgstr "此文章解答了我的問題"
 msgid "FORUM_HTML_INFO"
 msgstr "使用 BBCode 標籤為文字加上格式"
 
+# ########################################
+# Forum thread
+# ########################################
+msgid "FORUM_THREAD_HIDDEN"
+msgstr "因管理之故，此討論串已被隱藏"
+
+msgid "FORUM_THREAD_REPLY"
+msgstr "回覆此討論串"
+
+msgid "FORUM_THREAD_SUBSCRIBED"
+msgstr "你已訂閱此討論串。"
+
+msgid "FORUM_THREAD_UNSUBSCRIBE"
+msgstr "按這裡取消訂閱"
+
+msgid "FORUM_THREAD_SUBSCRIBE"
+msgstr "訂閱此討論串"
+
+# ########################################
+# Rules and Policies page (info.php)
+# ########################################
+msgid "FORUM_SEARCH"
+msgstr "討論區搜尋"
+
 # ########################################
 # Rules and Policies page (info.php)
 # ########################################
diff --git a/languages/translations/de.po b/languages/translations/de.po
index 7624c18105..1e2995350c 100644
--- a/languages/translations/de.po
+++ b/languages/translations/de.po
@@ -646,7 +646,7 @@ msgid "HELP_P1_1"
 msgstr "Mit der BOINC-Onlinehilfe können Sie sich persönlich mit "
 "einem erfahrenen BOINC-Nutzer unterhalten. Dieser kann: "
 "%sFragen rund um BOINC und Volunteer Computing beantworten, "
-"%sSie bei der Installation und beim Betrieb von BOINC unterstützen, "
+"%sSie bei der Installation und beim Betrieb von BOINC unterstützen "
 "%sund Problemen aller Art auf den Grund gehen."
 
 msgid "HELP_P1_2"
@@ -676,7 +676,7 @@ msgstr "Informationen und Rat erhalten Sie auch von: "
 "%sder BOINC-Website%s"
 "%sanderen Websites zum Thema BOINC%s" 
 "%sden BOINC-Diskussionsforen%s"
-"%sden Diskussionsforen der einzelnen BOINC-basierten Projekte.%s"
+"%sden Diskussionsforen der einzelnen BOINC-basierten Projekte."
 
 msgid "HELP_HEADING3"
 msgstr "Ein freiwilliger Helfer werden"
@@ -691,6 +691,7 @@ msgid "HELP_P3_2"
 msgstr "Wenn Sie bereits ein freiwilliger Helfer sind, können Sie "
 "hier Ihre %sEinstellungen bearbeiten%s."
 
+
 ##############################################
 # index.php
 ##############################################
@@ -703,16 +704,16 @@ msgstr "Bekämpfen Sie Krankheiten, studieren Sie die globale "
 "Klimaerwärmung, entdecken Sie Pulsare und stellen Sie "
 "zahlreiche andere Arten wissenschaftlicher Forschung an mit "
 "der ungenutzten Rechenleistung Ihres Computers (Windows, Mac "
-"oder Linux). Es ist sicher und einfach zugleich:"
-"%sProjekte%s auswählen"
-"Die BOINC-Software %sherunterladen%s und starten"
-"Die Projekt-URLs, Ihre E-Mailadresse und ein Passwort "
-"%seingeben%s."
+"oder Linux). Es ist sicher und einfach zugleich: "
+"%sAuswählen%s der Projekte"
+"%sHerunterladen%s und Starten der BOINC-Software "
+"%sEingeben%s der Projekt-URLs, Ihrer E-Mailadresse und eines "
+"Passworts."
 
 msgid "HOME_P2"
-msgstr "Sie können der Einfachheit halber auch eine "
-"Kontoverwaltung wie beispielsweise %sGridRepublic%s oder "
-"%sBAM!%s verwenden, wenn Sie an mehreren Projekten teilnehmen."
+msgstr "Wenn Sie an mehreren Projekten teilnehmen, können Sie der "
+"Einfachheit halber auch eine Kontoverwaltung wie beispielsweise "
+"%sGridRepublic%s oder %sBAM!%s verwenden."
 
 msgid "HOME_P3"
 msgstr "Wenn Sie Fragen haben oder Hilfe beim Einstieg benötigen, "
@@ -731,4 +732,4 @@ msgid "HOME_ADD_ONS"
 msgstr "Add-ons"
 
 msgid "HOME_SURVEY"
-msgstr "Umfrage"
+msgstr "Umfrage"
\ No newline at end of file
diff --git a/locale/client/fr/BOINC Manager.mo b/locale/client/fr/BOINC Manager.mo
index d704eb809ee7e9cc9241cc2453e04b4ce0026c9a..147ca720a4d790108a1097a9694828fe5f6e28bf 100755
GIT binary patch
delta 9960
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

delta 9346
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
HRZ#Q)Z0A6!

diff --git a/locale/client/fr/BOINC Manager.po b/locale/client/fr/BOINC Manager.po
index d7b0b7b78c..03920530de 100755
--- a/locale/client/fr/BOINC Manager.po	
+++ b/locale/client/fr/BOINC Manager.po	
@@ -4,8 +4,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: BOINC Manager\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2007-01-11 20:08+0100\n"
-"Last-Translator: Arnaud <arnaud_71fr@yahoo.fr>\n"
+"PO-Revision-Date: 2007-01-18 12:11+0100\n"
+"Last-Translator: Arnaud <bidibulle25atyahoo.fr>\n"
 "Language-Team:  <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
@@ -300,7 +300,7 @@ msgstr "Configuration de l'interface graphique et des param
 #: clientgui/AdvancedFrame.cpp:421
 #, c-format
 msgid "Connect to another computer running %s"
-msgstr "Se connecter � un autre ordinateur travaillant sur %s"
+msgstr "Se connecte � un autre ordinateur travaillant sur %s"
 
 #: clientgui/AdvancedFrame.cpp:426
 msgid "Select computer..."
@@ -1559,7 +1559,7 @@ msgstr "Je veux personnaliser mes pr
 
 #: clientgui/sg_DlgPreferences.cpp:330
 msgid "Customized Preferences"
-msgstr "Pr�f�rences Personnalis�es"
+msgstr "Pr�f�rences Personnelles"
 
 #: clientgui/sg_DlgPreferences.cpp:346
 msgid "Do work only between:"
@@ -1707,7 +1707,6 @@ msgid "Show graphics"
 msgstr "Montrer les graphiques"
 
 #: clientgui/SkinManager.cpp:975
-#, c-format
 msgid ""
 "This will shut down %s and its tasks entirely until either the\n"
 "%s application or the %s screen saver is run again.\n"
@@ -1716,6 +1715,12 @@ msgid ""
 "rather than to exit the application; that will allow %s to run its\n"
 "tasks at the times you selected in your preferences."
 msgstr ""
+"Cela va enti�rement arr�ter %s et ses t�ches jusqu'� ce que\n"
+"l'application ou l'�cran de veille soit red�marr�.\n"
+"\n"
+"Dans la plupart des cas, il vaut mieux simplement fermer la fen�tre du %s \n"
+"plut�t que de quitter l'application; cela permettra � %s de\n"
+"traiter les t�ches aux moments que vous avez choisis dans les pr�f�rences."
 
 #: clientgui/UnavailablePage.cpp:186
 msgid "Project temporarily unavailable"
@@ -2047,7 +2052,7 @@ msgstr "Suspendu par l'utilisateur"
 #: clientgui/ViewProjects.cpp:685
 #: clientgui/ViewProjectsGrid.cpp:632
 msgid "Won't get new tasks"
-msgstr "N'obtiendra pas de nouveau travail"
+msgstr "Pas de nouveau travail"
 
 #: clientgui/ViewProjects.cpp:688
 #: clientgui/ViewProjectsGrid.cpp:635
@@ -2484,14 +2489,14 @@ msgstr "Calculs en cours"
 #: clientgui/ViewWork.cpp:778
 #: clientgui/ViewWorkGrid.cpp:688
 msgid "Waiting to run"
-msgstr "En attente de d�marrage"
+msgstr "Calculs en attente"
 
 #: clientgui/ViewWork.cpp:780
 #: clientgui/ViewWork.cpp:783
 #: clientgui/ViewWorkGrid.cpp:690
 #: clientgui/ViewWorkGrid.cpp:693
 msgid "Ready to start"
-msgstr "Pr�t a d�marrer"
+msgstr "Pr�t � d�marrer"
 
 #: clientgui/ViewWork.cpp:787
 #: clientgui/ViewWorkGrid.cpp:697
@@ -2679,7 +2684,7 @@ msgstr "OnDropTarget: index by HitTest = %i"
 
 #: clientgui/common/wxPieCtrl.cpp:196
 msgid "Pie Ctrl"
-msgstr "Pie Ctrl"
+msgstr "L�gende du Camembert"
 
 #: clientgui/DlgAbout.h:52
 msgid "About BOINC Manager"
diff --git a/locale/client/zh_CN/BOINC Manager.mo b/locale/client/zh_CN/BOINC Manager.mo
index 2a4411a10a974d38a3d18c41f94c81c9261ae025..92e2757f4ad78f5da1d084d8e1dd9e2a6700ac46 100644
GIT binary patch
delta 14203
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
E0QBq6<p2Nx

delta 12742
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
JzWk*s{U7V?nTY@Z

diff --git a/locale/client/zh_CN/BOINC Manager.po b/locale/client/zh_CN/BOINC Manager.po
index d155c5613d..248cc2e5f9 100644
--- a/locale/client/zh_CN/BOINC Manager.po	
+++ b/locale/client/zh_CN/BOINC Manager.po	
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: BOINC Manager 5.8.0\n"
+"Project-Id-Version: 1.38\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2006-12-26 22:40+0800\n"
+"PO-Revision-Date: 2007-01-15 17:24+0800\n"
 "Last-Translator: Yin Gang <zenith.yin@gmail.com>\n"
 "Language-Team: www.EQUN.com <zenith.yin@gmail.com>\n"
 "MIME-Version: 1.0\n"
@@ -10,8 +10,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: Chinese\n"
 "X-Poedit-Country: CHINA\n"
-"X-Poedit-SourceCharset: iso-8859-1\n"
-"X-Poedit-Basepath: C:\\Entwicklung\\boinc\\\n"
+"X-Poedit-Basepath: E:\\Works\\boinc_src\\dev\n"
 "X-Poedit-SearchPath-0: clientgui\n"
 
 #: clientgui/AccountInfoPage.cpp:320
@@ -69,12 +68,11 @@ msgid "&Email address:"
 msgstr "电子邮箱地址(&E)："
 
 #: clientgui/AccountInfoPage.cpp:416
-#, c-format
 msgid "minimum length %d"
 msgstr "最小长度 %d"
 
 #: clientgui/AccountInfoPage.cpp:435
-#: clientgui/WelcomePage.cpp:312
+#: clientgui/WelcomePage.cpp:314
 msgid "Attach to project"
 msgstr "加入项目"
 
@@ -87,12 +85,10 @@ msgid "Attach to account manager"
 msgstr "加入帐号管理器"
 
 #: clientgui/AccountInfoPage.cpp:450
-#, c-format
 msgid "The minimum password length for this project is %d. Please enter a different password."
 msgstr "该项目要求的最小密码长度为%d，请输入符合要求的密码。"
 
 #: clientgui/AccountInfoPage.cpp:456
-#, c-format
 msgid "The minimum password length for this account manager is %d. Please enter a different password."
 msgstr "该帐号管理器要求的最小密码长度为%d。请输入符合要求的密码。"
 
@@ -102,7 +98,7 @@ msgstr "两次输入的密码不匹配，请重新输入。"
 
 #: clientgui/AccountKeyPage.cpp:225
 msgid "Enter account key"
-msgstr "输入账号密钥"
+msgstr "输入帐号密钥"
 
 #: clientgui/AccountKeyPage.cpp:228
 msgid ""
@@ -111,7 +107,7 @@ msgid ""
 "Go to the project's web site to create an account. Your account\n"
 "key will be emailed to you."
 msgstr ""
-"该项目通过\"账号密钥\"来鉴别您的身份。\n"
+"该项目通过\"帐号密钥\"来鉴别您的身份。\n"
 "\n"
 "请访问项目网站以创建一个帐号。您的帐号密钥将通过电子邮件发送给您。"
 
@@ -125,7 +121,7 @@ msgstr "82412313ac88e9a3638f66ea82186948"
 
 #: clientgui/AccountKeyPage.cpp:240
 msgid "Account key:"
-msgstr "账号密钥："
+msgstr "帐号密钥："
 
 #: clientgui/AccountManagerInfoPage.cpp:175
 msgid "Account Manager URL"
@@ -140,11 +136,11 @@ msgstr "请输入帐号管理器的网址。"
 msgid ""
 "You can copy and paste the URL from your browser's\n"
 "address bar."
-msgstr "你可以从浏览器的地址栏中复制网址(URL)。"
+msgstr "您可以从浏览器的地址栏中复制网址(URL)。"
 
 #: clientgui/AccountManagerInfoPage.cpp:185
 msgid "Account Manager &URL:"
-msgstr "账号管理的网址(&U)："
+msgstr "帐号管理器的网址(&U)："
 
 #: clientgui/AccountManagerInfoPage.cpp:188
 msgid "For a list of BOINC-based account managers go to:"
@@ -152,7 +148,6 @@ msgstr "查看BOINC项目的帐号管理器网址列表请到："
 
 #: clientgui/AccountManagerProcessingPage.cpp:190
 #: clientgui/AccountManagerPropertiesPage.cpp:191
-#, c-format
 msgid "Communicating with %s."
 msgstr "正在和%s进行通讯。"
 
@@ -168,33 +163,34 @@ msgstr "请稍候..."
 
 #: clientgui/AccountManagerProcessingPage.cpp:313
 #: clientgui/ProjectProcessingPage.cpp:482
-#: clientgui/ProjectProcessingPage.cpp:544
+#: clientgui/ProjectProcessingPage.cpp:540
 msgid "An internal server error has occurred.\n"
 msgstr "服务器上产生了一个内部错误。\n"
 
-#: clientgui/AdvancedFrame.cpp:96
+#: clientgui/AdvancedFrame.cpp:100
 msgid "Connected"
 msgstr "已连接"
 
-#: clientgui/AdvancedFrame.cpp:104
+#: clientgui/AdvancedFrame.cpp:108
 msgid "Disconnected"
 msgstr "已断开"
 
-#: clientgui/AdvancedFrame.cpp:308
+#: clientgui/AdvancedFrame.cpp:310
+#: clientgui/sg_BoincSimpleGUI.cpp:103
 msgid "&Close Window\tCTRL+W"
 msgstr "关闭窗口(&C)\tCTRL+W"
 
-#: clientgui/AdvancedFrame.cpp:309
+#: clientgui/AdvancedFrame.cpp:311
+#: clientgui/sg_BoincSimpleGUI.cpp:104
 msgid "Close BOINC Manager Window."
 msgstr "关闭BOINC管理器的窗口。"
 
-#: clientgui/AdvancedFrame.cpp:316
-#, c-format
+#: clientgui/AdvancedFrame.cpp:317
 msgid "Exit the %s"
 msgstr "退出%s"
 
-#: clientgui/AdvancedFrame.cpp:321
-#: clientgui/BOINCTaskBar.cpp:618
+#: clientgui/AdvancedFrame.cpp:322
+#: clientgui/BOINCTaskBar.cpp:614
 #: clientgui/mac/MacSysMenu.cpp:129
 msgid "E&xit"
 msgstr "退出(&X)"
@@ -205,193 +201,209 @@ msgstr "简易视图(&S)"
 
 #: clientgui/AdvancedFrame.cpp:332
 msgid "Display the simple BOINC graphical interface."
-msgstr "显示BOINC的简易图形界面。"
+msgstr "显示简洁的BOINC图形界面。"
 
-#: clientgui/AdvancedFrame.cpp:342
-#: clientgui/AdvancedFrame.cpp:453
-msgid "Attach to &project"
+#: clientgui/AdvancedFrame.cpp:341
+msgid "Attach to &project..."
 msgstr "加入项目(&P)"
 
-#: clientgui/AdvancedFrame.cpp:343
+#: clientgui/AdvancedFrame.cpp:342
 msgid "Attach to a project"
 msgstr "加入一个项目"
 
+#: clientgui/AdvancedFrame.cpp:346
+msgid "Attach to &account manager..."
+msgstr "加入帐号管理器(&A)..."
+
 #: clientgui/AdvancedFrame.cpp:347
-msgid "Attach to &account manager"
+msgid "Attach to an account manager"
 msgstr "加入帐号管理器"
 
-#: clientgui/AdvancedFrame.cpp:348
-msgid "Attach to an account manager"
-msgstr "加入一个账号管理器"
-
-#: clientgui/AdvancedFrame.cpp:352
-#, c-format
+#: clientgui/AdvancedFrame.cpp:351
 msgid "&Synchronize with %s"
 msgstr "与%s进行同步(&S)"
 
-#: clientgui/AdvancedFrame.cpp:356
-#, c-format
+#: clientgui/AdvancedFrame.cpp:355
 msgid "Get current settings from %s"
 msgstr "从%s获取当前的参数设定"
 
-#: clientgui/AdvancedFrame.cpp:371
+#: clientgui/AdvancedFrame.cpp:370
 msgid "&Run always"
 msgstr "一直运行(&R)"
 
-#: clientgui/AdvancedFrame.cpp:372
+#: clientgui/AdvancedFrame.cpp:371
 msgid "Allow work regardless of preferences"
-msgstr "运行计算程序且不受参数设置的影响"
+msgstr "运行计算程序且不受参数的影响"
+
+#: clientgui/AdvancedFrame.cpp:375
+msgid "Run based on &preferences"
+msgstr "依照参数运行(&P)"
 
 #: clientgui/AdvancedFrame.cpp:376
-msgid "Run based on &preferences"
-msgstr "依照参数设置运行(&P)"
-
-#: clientgui/AdvancedFrame.cpp:377
 msgid "Allow work according to your preferences"
 msgstr "运行计算程序且依照用户设定的参数"
 
-#: clientgui/AdvancedFrame.cpp:381
+#: clientgui/AdvancedFrame.cpp:380
 msgid "&Suspend"
 msgstr "暂停(&S)"
 
-#: clientgui/AdvancedFrame.cpp:382
+#: clientgui/AdvancedFrame.cpp:381
 msgid "Stop work regardless of preferences"
-msgstr "暂停计算程序且不受参数设置的影响"
+msgstr "暂停计算程序且不受参数的影响"
 
-#: clientgui/AdvancedFrame.cpp:398
+#: clientgui/AdvancedFrame.cpp:397
 msgid "&Network activity always available"
 msgstr "网络总是可用(&N)"
 
-#: clientgui/AdvancedFrame.cpp:399
+#: clientgui/AdvancedFrame.cpp:398
 msgid "Allow network activity regardless of preferences"
-msgstr "允许使用网络且不受参数设置影响"
+msgstr "允许使用网络且不受参数影响"
+
+#: clientgui/AdvancedFrame.cpp:402
+msgid "Network activity based on &preferences"
+msgstr "依据参数使用网络(&P)"
 
 #: clientgui/AdvancedFrame.cpp:403
-msgid "Network activity based on &preferences"
-msgstr "依据参数设置使用网络(&P)"
-
-#: clientgui/AdvancedFrame.cpp:404
 msgid "Allow network activity according to your preferences"
 msgstr "允许使用网络且依照用户设定的参数"
 
-#: clientgui/AdvancedFrame.cpp:408
+#: clientgui/AdvancedFrame.cpp:407
 msgid "&Network activity suspended"
 msgstr "暂停使用网络(&N)"
 
-#: clientgui/AdvancedFrame.cpp:409
+#: clientgui/AdvancedFrame.cpp:408
 msgid "Stop BOINC network activity"
-msgstr "暂停使用网络且不受参数设置的影响"
+msgstr "暂停使用网络且不受参数的影响"
 
-#: clientgui/AdvancedFrame.cpp:416
-msgid "&Options"
+#: clientgui/AdvancedFrame.cpp:415
+msgid "&Options..."
 msgstr "选项(&O)"
 
-#: clientgui/AdvancedFrame.cpp:417
+#: clientgui/AdvancedFrame.cpp:416
 msgid "Configure GUI options and proxy settings"
-msgstr "配置程序界面及网络代理选项"
+msgstr "配置界面及代理服务器选项"
 
-#: clientgui/AdvancedFrame.cpp:422
-#, c-format
+#: clientgui/AdvancedFrame.cpp:421
 msgid "Connect to another computer running %s"
-msgstr "连接到一台运行%s的计算机"
+msgstr "连接到另外一台运行%s的计算机"
 
-#: clientgui/AdvancedFrame.cpp:427
+#: clientgui/AdvancedFrame.cpp:426
 msgid "Select computer..."
 msgstr "选择计算机..."
 
-#: clientgui/AdvancedFrame.cpp:432
+#: clientgui/AdvancedFrame.cpp:431
 msgid "Run CPU &benchmarks"
 msgstr "运行CPU基准测试(&B)"
 
-#: clientgui/AdvancedFrame.cpp:433
+#: clientgui/AdvancedFrame.cpp:432
 msgid "Runs BOINC CPU benchmarks"
 msgstr "运行BOINC的CPU基准测试"
 
-#: clientgui/AdvancedFrame.cpp:437
+#: clientgui/AdvancedFrame.cpp:436
 msgid "Retry &communications"
 msgstr "重试所有连接(&C)"
 
-#: clientgui/AdvancedFrame.cpp:438
+#: clientgui/AdvancedFrame.cpp:437
 msgid "Report completed work, get latest credit, get latest preferences, and possibly get more work."
 msgstr "上报所有完成的任务，获取最新的积分及参数设置，可能下载更多的新任务。"
 
+#: clientgui/AdvancedFrame.cpp:442
+msgid "Read config file"
+msgstr "读取配置文件"
+
 #: clientgui/AdvancedFrame.cpp:443
-#: clientgui/WelcomePage.cpp:320
+msgid "Read configuration info from cc-config.xml."
+msgstr "从cc-config.xml中读取配置信息。"
+
+#: clientgui/AdvancedFrame.cpp:447
+msgid "Read local prefs file"
+msgstr "读取本地参数设置文件"
+
+#: clientgui/AdvancedFrame.cpp:448
+msgid "Read preferences from global_prefs_override.xml."
+msgstr "从global_prefs_override.xml中读取参数设置。"
+
+#: clientgui/AdvancedFrame.cpp:452
+#: clientgui/WelcomePage.cpp:322
 #, c-format
 msgid "&Defect from %s"
-msgstr "退出%s(&D)"
+msgstr "离开%s(&D)"
 
-#: clientgui/AdvancedFrame.cpp:449
+#: clientgui/AdvancedFrame.cpp:458
 msgid "Remove client from account manager control."
-msgstr "从帐号管理器移除客户端。"
+msgstr "将客户端退出帐号管理器。"
 
-#: clientgui/AdvancedFrame.cpp:454
+#: clientgui/AdvancedFrame.cpp:462
+msgid "Attach to &project"
+msgstr "加入项目(&P)"
+
+#: clientgui/AdvancedFrame.cpp:463
 msgid "Attach to a project to begin processing work"
 msgstr "加入一个项目以开始处理任务"
 
-#: clientgui/AdvancedFrame.cpp:465
+#: clientgui/AdvancedFrame.cpp:474
+#: clientgui/sg_BoincSimpleGUI.cpp:113
 #, c-format
-msgid "&%s\tF1"
-msgstr "&%s\tF1"
+msgid "&%s"
+msgstr "&%s"
 
-#: clientgui/AdvancedFrame.cpp:471
-#, c-format
+#: clientgui/AdvancedFrame.cpp:480
+#: clientgui/sg_BoincSimpleGUI.cpp:119
 msgid "Show information about the %s"
 msgstr "查看%s的信息"
 
-#: clientgui/AdvancedFrame.cpp:483
-#, c-format
+#: clientgui/AdvancedFrame.cpp:492
+#: clientgui/sg_BoincSimpleGUI.cpp:131
 msgid "%s &website"
 msgstr "%s网站(&W)"
 
-#: clientgui/AdvancedFrame.cpp:489
-#, c-format
+#: clientgui/AdvancedFrame.cpp:498
+#: clientgui/sg_BoincSimpleGUI.cpp:137
 msgid "Show information about BOINC and %s"
 msgstr "查看BOINC和%s的信息"
 
-#: clientgui/AdvancedFrame.cpp:503
-#: clientgui/BOINCTaskBar.cpp:608
-#, c-format
+#: clientgui/AdvancedFrame.cpp:514
+#: clientgui/BOINCTaskBar.cpp:604
 msgid "&About %s..."
 msgstr "关于%s(&A)..."
 
-#: clientgui/AdvancedFrame.cpp:509
+#: clientgui/AdvancedFrame.cpp:520
 msgid "Licensing and copyright information."
 msgstr "查看许可与版权信息。"
 
-#: clientgui/AdvancedFrame.cpp:516
+#: clientgui/AdvancedFrame.cpp:527
+#: clientgui/sg_BoincSimpleGUI.cpp:160
 msgid "&File"
 msgstr "文件(&F)"
 
-#: clientgui/AdvancedFrame.cpp:521
+#: clientgui/AdvancedFrame.cpp:531
 msgid "&View"
 msgstr "视图(&V)"
 
-#: clientgui/AdvancedFrame.cpp:526
+#: clientgui/AdvancedFrame.cpp:535
 msgid "&Tools"
 msgstr "工具(&T)"
 
-#: clientgui/AdvancedFrame.cpp:530
+#: clientgui/AdvancedFrame.cpp:539
 msgid "&Activity"
 msgstr "活动(&A)"
 
-#: clientgui/AdvancedFrame.cpp:534
+#: clientgui/AdvancedFrame.cpp:543
 msgid "A&dvanced"
 msgstr "高级(&D)"
 
-#: clientgui/AdvancedFrame.cpp:538
+#: clientgui/AdvancedFrame.cpp:547
+#: clientgui/sg_BoincSimpleGUI.cpp:150
 #: clientgui/wizardex.cpp:356
 #: clientgui/wizardex.cpp:363
 msgid "&Help"
 msgstr "帮助(&H)"
 
-#: clientgui/AdvancedFrame.cpp:1161
-#, c-format
+#: clientgui/AdvancedFrame.cpp:1169
 msgid "BOINC Manager - Detach from %s"
 msgstr "BOINC管理器 - 退出%s"
 
-#: clientgui/AdvancedFrame.cpp:1165
-#, c-format
+#: clientgui/AdvancedFrame.cpp:1173
 msgid ""
 "If you defect from %s,\n"
 "you'll keep all your current projects,\n"
@@ -399,53 +411,47 @@ msgid ""
 "\n"
 "Do you want to defect from %s?"
 msgstr ""
-"退出%s并不会导致您当前参加的项目也退出，\n"
-"但退出后您将必须手动对这些项目进行管理。\n"
+"如果您退出%s，\n"
+"您所有的项目并不受影响，\n"
+"但您将必须手动进行管理。\n"
 "\n"
 "您确定要退出%s吗？"
 
-#: clientgui/AdvancedFrame.cpp:1215
+#: clientgui/AdvancedFrame.cpp:1223
 msgid "Attaching to project..."
 msgstr "正在加入项目..."
 
-#: clientgui/AdvancedFrame.cpp:1257
+#: clientgui/AdvancedFrame.cpp:1261
 msgid "Retrying communications for project(s)..."
 msgstr "正在重试项目的网络通讯..."
 
-#: clientgui/AdvancedFrame.cpp:1340
-#, c-format
+#: clientgui/AdvancedFrame.cpp:1344
 msgid "%s - Language Selection"
 msgstr "%s - 语言选择"
 
-#: clientgui/AdvancedFrame.cpp:1347
-#, c-format
+#: clientgui/AdvancedFrame.cpp:1351
 msgid "The %s's default language has been changed, in order for this change to take affect you must restart the %s."
 msgstr "%s的缺省语言已被修改，且必须重启%s才能生效。"
 
-#: clientgui/AdvancedFrame.cpp:1554
+#: clientgui/AdvancedFrame.cpp:1560
 #: clientgui/DlgAbout.cpp:105
-#, c-format
 msgid "%s"
 msgstr "%s"
 
-#: clientgui/AdvancedFrame.cpp:1563
-#, c-format
+#: clientgui/AdvancedFrame.cpp:1569
 msgid "%s has successfully attached to %s"
 msgstr "%s已经成功地加入了%s"
 
-#: clientgui/AdvancedFrame.cpp:1688
-#: clientgui/AdvancedFrame.cpp:1691
-#, c-format
+#: clientgui/AdvancedFrame.cpp:1694
+#: clientgui/AdvancedFrame.cpp:1697
 msgid "%s - (%s)"
 msgstr "%s - (%s)"
 
-#: clientgui/AdvancedFrame.cpp:1689
-#, c-format
+#: clientgui/AdvancedFrame.cpp:1695
 msgid "Connecting to %s"
 msgstr "正在连接至 %s"
 
-#: clientgui/AdvancedFrame.cpp:1692
-#, c-format
+#: clientgui/AdvancedFrame.cpp:1698
 msgid "Connected to %s"
 msgstr "已连接至 %s"
 
@@ -487,22 +493,19 @@ msgstr ""
 "\n"
 "请访问项目网站并按照上面的说明进行操作。"
 
-#: clientgui/BOINCBaseFrame.cpp:336
-#, c-format
+#: clientgui/BOINCBaseFrame.cpp:346
 msgid "%s - Connection Error"
 msgstr "%s - 连接错误"
 
-#: clientgui/BOINCBaseFrame.cpp:342
+#: clientgui/BOINCBaseFrame.cpp:352
 msgid "The password you have provided is incorrect, please try again."
 msgstr "您提供的密码不正确，请重试。"
 
-#: clientgui/BOINCBaseFrame.cpp:365
-#, c-format
+#: clientgui/BOINCBaseFrame.cpp:375
 msgid "%s - Connection Failed"
 msgstr "%s - 连接失败"
 
-#: clientgui/BOINCBaseFrame.cpp:374
-#, c-format
+#: clientgui/BOINCBaseFrame.cpp:384
 msgid ""
 "%s is not able to connect to a %s client.\n"
 "Would you like to try to connect again?"
@@ -510,38 +513,36 @@ msgstr ""
 "%s无法连接至%s客户端。\n"
 "您想再连接一次吗？"
 
-#: clientgui/BOINCBaseFrame.cpp:407
-#, c-format
+#: clientgui/BOINCBaseFrame.cpp:417
 msgid "%s - Connection Status"
 msgstr "%s - 连接状态"
 
-#: clientgui/BOINCBaseFrame.cpp:418
+#: clientgui/BOINCBaseFrame.cpp:428
 #, c-format
 msgid ""
 "%s is not currently connected to a %s client.\n"
 "Please use the 'Advanced\\Select Computer...' menu option to connect up to a %s client.\n"
 "To connect up to your local computer please use 'localhost' as the host name."
 msgstr ""
-"%s is not currently connected to a %s client.\n"
-"Please use the 'Advanced\\Select Computer...' menu option to connect up to a %s client.\n"
-"To connect up to your local computer please use 'localhost' as the host name."
+"%s当前未连接至任何%s客户端。\n"
+"请使用菜单中的'高级\\选择计算机...'以连接至一个%s客户端。\n"
+"如果要连接至您的本地计算机，请在主机名称中填入'localhost'。"
 
-#: clientgui/BOINCBaseView.cpp:457
+#: clientgui/BOINCBaseView.cpp:465
+#: clientgui/ViewProjectsGrid.cpp:517
+#: clientgui/ViewWorkGrid.cpp:436
 msgid "Web sites"
 msgstr "网站"
 
 #: clientgui/BOINCDialupManager.cpp:63
-#, c-format
 msgid "%s - Network Status"
 msgstr "%s - 网络状态"
 
 #: clientgui/BOINCDialupManager.cpp:260
-#, c-format
 msgid "%s needs to connect to the Internet.  Please click to open %s."
 msgstr "%s需要连接至互联网。请点击打开%s。"
 
 #: clientgui/BOINCDialupManager.cpp:268
-#, c-format
 msgid ""
 "%s is unable to communicate with a project and needs an Internet connection.\n"
 "Please connect to the Internet, then select the 'retry communications' item off the advanced menu."
@@ -550,21 +551,18 @@ msgstr ""
 "请连接至互联网并从菜单中选择'高级->重试所有连接'。"
 
 #: clientgui/BOINCDialupManager.cpp:314
-#, c-format
 msgid ""
 "%s needs to connect to the Internet.\n"
 "May it do so now?"
 msgstr ""
 "%s需要连接至互联网。\n"
-"现在就可以连接吗？"
+"现在就进行连接吗？"
 
 #: clientgui/BOINCDialupManager.cpp:327
-#, c-format
 msgid "%s is connecting to the Internet."
 msgstr "%s正在连接至互联网。"
 
 #: clientgui/BOINCDialupManager.cpp:358
-#, c-format
 msgid ""
 "%s couldn't do Internet communication, and no default connection is selected.\n"
 "Please connect to the Internet, or select a default connection\n"
@@ -574,36 +572,30 @@ msgstr ""
 "请连接至互联网或者从菜单中选择'高级->选项'然后切换到连接页面以设定一个缺省连接。"
 
 #: clientgui/BOINCDialupManager.cpp:392
-#, c-format
 msgid "%s has successfully connected to the Internet."
 msgstr "%s已经成功地连接至互联网。"
 
 #: clientgui/BOINCDialupManager.cpp:420
-#, c-format
 msgid "%s failed to connect to the Internet."
 msgstr "%s连接至互联网失败。"
 
 #: clientgui/BOINCDialupManager.cpp:461
-#, c-format
 msgid ""
 "%s has detected it is now connected to the Internet.\n"
 "Updating all projects and retrying all transfers."
 msgstr ""
 "%s已经检测到与互联网的连接。\n"
-"正在更新所有项目并重试所有网络传输。"
+"请更新所有项目并重试所有网络传输。"
 
 #: clientgui/BOINCDialupManager.cpp:504
-#, c-format
 msgid "%s has successfully disconnected from the Internet."
 msgstr "%s已经成功地断开至互联网的连接。"
 
 #: clientgui/BOINCDialupManager.cpp:520
-#, c-format
 msgid "%s failed to disconnected from the Internet."
 msgstr "%s断开至互联网的连接失败。"
 
-#: clientgui/BOINCGUIApp.cpp:203
-#, c-format
+#: clientgui/BOINCGUIApp.cpp:195
 msgid ""
 "BOINC ownership or permissions are not set properly; please reinstall BOINC.\n"
 "(Error code %d)"
@@ -611,63 +603,56 @@ msgstr ""
 "BOINC的所有者或权限设置错误，请重新安装BOINC。\n"
 "(错误代码 %d)"
 
-#: clientgui/BOINCGUIApp.cpp:392
+#: clientgui/BOINCGUIApp.cpp:382
 msgid "Startup BOINC so only the system tray icon is visible"
 msgstr "启动BOINC时仅显示在系统托盘区"
 
-#: clientgui/BOINCGUIApp.cpp:393
+#: clientgui/BOINCGUIApp.cpp:383
 msgid "disable BOINC security users and permissions"
 msgstr "禁用BOINC中用户和权限相关的安全选项"
 
-#: clientgui/BOINCGUIApp.cpp:456
+#: clientgui/BOINCGUIApp.cpp:446
 msgid "(Automatic Detection)"
 msgstr "(自动检测)"
 
-#  Dialog: Extras/Optionen/Sprachauswahl
-#: clientgui/BOINCGUIApp.cpp:457
+#: clientgui/BOINCGUIApp.cpp:447
 msgid "(Unknown)"
 msgstr "(未知)"
 
-#: clientgui/BOINCGUIApp.cpp:458
+#: clientgui/BOINCGUIApp.cpp:448
 msgid "(User Defined)"
 msgstr "(用户自定义)"
 
-#: clientgui/BOINCGUIApp.cpp:1059
+#: clientgui/BOINCGUIApp.cpp:1036
 #, c-format
 msgid "%s - Exit Confirmation"
 msgstr "%s - 退出确认"
 
-#: clientgui/BOINCTaskBar.cpp:342
-#, c-format
+#: clientgui/BOINCTaskBar.cpp:338
 msgid "%s is currently suspended...\n"
 msgstr "%s已被暂停...\n"
 
-#: clientgui/BOINCTaskBar.cpp:354
-#, c-format
+#: clientgui/BOINCTaskBar.cpp:350
 msgid "%s networking is currently suspended...\n"
 msgstr "%s的网络已被暂停...\n"
 
-#: clientgui/BOINCTaskBar.cpp:394
-#, c-format
+#: clientgui/BOINCTaskBar.cpp:390
 msgid "%s is currently reconnecting to a %s client...\n"
 msgstr "%s正在重新连接至一个%s客户端...\n"
 
-#: clientgui/BOINCTaskBar.cpp:406
-#, c-format
+#: clientgui/BOINCTaskBar.cpp:402
 msgid "%s is not currently connected to a %s client...\n"
 msgstr "%s当前没有连接到任何%s客户端...\n"
 
-#: clientgui/BOINCTaskBar.cpp:589
-#, c-format
+#: clientgui/BOINCTaskBar.cpp:585
 msgid "Open %s Web..."
 msgstr "打开%s的网站..."
 
-#: clientgui/BOINCTaskBar.cpp:596
-#, c-format
+#: clientgui/BOINCTaskBar.cpp:592
 msgid "Open %s..."
 msgstr "打开%s..."
 
-#: clientgui/BOINCTaskBar.cpp:603
+#: clientgui/BOINCTaskBar.cpp:599
 msgid "Snooze"
 msgstr "休息一下"
 
@@ -681,7 +666,7 @@ msgstr "更新帐号管理器失败"
 
 #: clientgui/CompletionErrorPage.cpp:211
 msgid "Failed to remove account manager"
-msgstr "移除账号管理器失败"
+msgstr "退出帐号管理器失败"
 
 #: clientgui/CompletionErrorPage.cpp:215
 msgid "Failed to attach to account manager"
@@ -726,7 +711,6 @@ msgid ""
 msgstr "点击完成，您的浏览器将打开一个网页，您可在网页上设置您的帐号用户名及项目参数。"
 
 #: clientgui/CompletionPage.cpp:236
-#, c-format
 msgid "Update from %s completed."
 msgstr "从%s的更新已完成。"
 
@@ -735,7 +719,6 @@ msgid "Update completed."
 msgstr "更新已完成。"
 
 #: clientgui/CompletionPage.cpp:257
-#, c-format
 msgid "Removal from %s completed."
 msgstr "退出%s已完成。"
 
@@ -744,7 +727,6 @@ msgid "Removal succeeded!"
 msgstr "退出成功！"
 
 #: clientgui/CompletionPage.cpp:278
-#, c-format
 msgid "Attached to %s"
 msgstr "已经加入了%s"
 
@@ -753,21 +735,20 @@ msgid "Attached to account manager"
 msgstr "已经加入到帐号管理器"
 
 #: clientgui/CompletionPage.cpp:292
-#, c-format
 msgid "Welcome to %s!"
 msgstr "欢迎来到%s！"
 
 #: clientgui/CompletionPage.cpp:306
-#, c-format
 msgid "You are now successfully attached to the %s system."
-msgstr "您已经成功地加入了%s系统。"
+msgstr ""
+"您已经成功地加入了%s系统。\n"
+"%s"
 
 #: clientgui/CompletionPage.cpp:310
 msgid "You are now successfully attached to this account manager."
 msgstr "您已经成功地加入了当前帐号管理器。"
 
 #: clientgui/DlgAbout.cpp:99
-#, c-format
 msgid "About %s"
 msgstr "关于%s"
 
@@ -849,7 +830,7 @@ msgstr "设置默认值(&S)"
 
 #: clientgui/DlgOptions.cpp:185
 msgid "&Clear Default"
-msgstr "消除默认值(&C)"
+msgstr "清除默认值(&C)"
 
 #: clientgui/DlgOptions.cpp:192
 msgid "Default Connection:"
@@ -920,12 +901,10 @@ msgid "Host name:"
 msgstr "主机名："
 
 #: clientgui/hyperlink.cpp:181
-#, c-format
 msgid "%s - Can't find web browser"
 msgstr "%s - 无法找到网页浏览器"
 
 #: clientgui/hyperlink.cpp:192
-#, c-format
 msgid ""
 "%s tried to display the web page\n"
 "\t%s\n"
@@ -963,7 +942,7 @@ msgstr "提问及报告错误"
 #: clientgui/Localization.cpp:113
 #: clientgui/Localization.cpp:131
 msgid "Your account"
-msgstr "您的账号"
+msgstr "您的帐号"
 
 #: clientgui/Localization.cpp:43
 #: clientgui/Localization.cpp:89
@@ -977,14 +956,13 @@ msgstr "您的参数设置"
 
 #: clientgui/Localization.cpp:47
 msgid "View and modify your SETI@home account profile and preferences"
-msgstr "查看和修改您的SETI@home账号及参数设置"
+msgstr "查看和修改您的SETI@home帐号及参数设置"
 
 #: clientgui/Localization.cpp:49
 #: clientgui/Localization.cpp:91
 msgid "Your results"
 msgstr "您的任务"
 
-# Einstein@home project button
 #: clientgui/Localization.cpp:51
 #: clientgui/Localization.cpp:93
 msgid "View your last week (or more) of computational results and work"
@@ -1076,7 +1054,8 @@ msgstr "GEO-600项目的主页"
 #: clientgui/Localization.cpp:117
 #: clientgui/Localization.cpp:135
 #: clientgui/ViewProjects.cpp:155
-#: clientgui/ViewStatistics.cpp:279
+#: clientgui/ViewProjectsGrid.cpp:164
+#: clientgui/ViewStatistics.cpp:400
 msgid "Team"
 msgstr "团队"
 
@@ -1181,7 +1160,7 @@ msgid ""
 "\n"
 "Please check the URL and try again."
 msgstr ""
-"您提供的网址并不属于任何一个基于BOINC的账号管理器。\n"
+"您提供的网址并不属于任何一个基于BOINC的帐号管理器。\n"
 "\n"
 "请检查该网址并重试。"
 
@@ -1203,7 +1182,7 @@ msgstr "项目网址"
 
 #: clientgui/ProjectInfoPage.cpp:234
 msgid "Enter the URL of the project's web site."
-msgstr "请输入项目网站的地址："
+msgstr "请输入项目网站的地址。"
 
 #: clientgui/ProjectInfoPage.cpp:241
 msgid "Project &URL:"
@@ -1239,29 +1218,24 @@ msgid ""
 "BOINC failed to communicate on the Internet. The most likely\n"
 "reasons are:\n"
 "\n"
-"1) Connectivity problem.  Please check your network or modem\n"
-"connection and hit the back button to retry the previous\n"
-"operation.\n"
+"1) Connectivity problem.  Check your network\n"
+"or modem connection and click Back to try again.\n"
 "\n"
-"2) Personal firewall software is blocking BOINC. You must\n"
-"configure your personal firewall to let BOINC communicate\n"
-"on port 80. Once this is fixed, click Back to try again.\n"
+"2) Personal firewall software is blocking BOINC.\n"
+"Configure your personal firewall to let BOINC\n"
+"communicate on port 80, then click Back to try again.\n"
 "\n"
-"3) You are using a proxy server and BOINC needs to know\n"
-"about it."
+"3) You are using a proxy server.\n"
+"Click Next to configure BOINC's proxy settings."
 msgstr ""
 "BOINC无法在互联网上通讯，可能的原因有：\n"
 "\n"
-"1) 连接问题。请检查您的网络或拨号连接并点击上一步以重试之前的操作。\n"
+"1) 连接问题。请检查您的网络或拨号连接并点击上一步以重试。\n"
 "\n"
 "2) 被个人防火墙阻挡，您必须配置您的防火墙以允许BOINC在80端口的通讯。\n"
 "配置完成后，请点击上一步进行重试。\n"
 "\n"
-"3) 您正在通过代理服务器接入互联网，您必须让BOINC也使用这个代理。"
-
-#: clientgui/ProxyInfoPage.cpp:216
-msgid "Click Next to configure BOINC's proxy settings."
-msgstr "点击下一步对BOINC的代理进行配置。"
+"3) 您正在通过代理服务器接入互联网，请点击下一步以进行对BOINC的代理设置。"
 
 #: clientgui/ProxyPage.cpp:337
 msgid "Proxy configuration"
@@ -1327,7 +1301,7 @@ msgstr "正在等待连接项目服务器。"
 #: clientgui/sg_ClientStateIndicator.cpp:318
 #: clientgui/sg_ClientStateIndicator.cpp:326
 msgid "Retrieving current status"
-msgstr "正在取得当前状态。"
+msgstr "正在获取当前状态"
 
 #: clientgui/sg_ClientStateIndicator.cpp:321
 msgid "No work available to process"
@@ -1337,317 +1311,307 @@ msgstr "无任务可供处理"
 msgid "Unable to connect to the core client"
 msgstr "无法连接至核心客户端"
 
-#: clientgui/sg_DlgMessages.cpp:104
-#: clientgui/sg_DlgMessages_bak.cpp:104
+#: clientgui/sg_DlgMessages.cpp:106
 #: clientgui/ViewMessages.cpp:110
-#: clientgui/ViewMessages_bak.cpp:120
+#: clientgui/ViewMessagesGrid.cpp:132
 #: clientgui/ViewProjects.cpp:153
-#: clientgui/ViewStatistics.cpp:269
-#: clientgui/ViewStatistics.cpp:862
+#: clientgui/ViewProjectsGrid.cpp:164
+#: clientgui/ViewStatistics.cpp:370
+#: clientgui/ViewStatistics.cpp:1630
 #: clientgui/ViewTransfers.cpp:117
+#: clientgui/ViewTransfersGrid.cpp:128
 #: clientgui/ViewWork.cpp:132
+#: clientgui/ViewWorkGrid.cpp:139
 msgid "Project"
 msgstr "项目"
 
-#: clientgui/sg_DlgMessages.cpp:105
-#: clientgui/sg_DlgMessages_bak.cpp:105
+#: clientgui/sg_DlgMessages.cpp:107
 #: clientgui/ViewMessages.cpp:111
-#: clientgui/ViewMessages_bak.cpp:121
+#: clientgui/ViewMessagesGrid.cpp:132
 msgid "Time"
 msgstr "时间"
 
-#: clientgui/sg_DlgMessages.cpp:106
-#: clientgui/sg_DlgMessages_bak.cpp:106
+#: clientgui/sg_DlgMessages.cpp:108
 #: clientgui/ViewMessages.cpp:112
-#: clientgui/ViewMessages_bak.cpp:122
+#: clientgui/ViewMessagesGrid.cpp:132
 msgid "Message"
 msgstr "消息"
 
-#: clientgui/sg_DlgMessages.cpp:169
-#: clientgui/sg_DlgMessages_bak.cpp:169
-#: clientgui/ViewMessages.cpp:84
-#: clientgui/ViewMessages_bak.cpp:84
-msgid "Copy all messages"
-msgstr "复制所有消息"
-
-#: clientgui/sg_DlgMessages.cpp:171
-#: clientgui/sg_DlgMessages.cpp:175
-#: clientgui/sg_DlgMessages_bak.cpp:171
-#: clientgui/sg_DlgMessages_bak.cpp:175
+#: clientgui/sg_DlgMessages.cpp:185
+#: clientgui/sg_DlgMessages.cpp:189
 #: clientgui/ViewMessages.cpp:85
-#: clientgui/ViewMessages_bak.cpp:85
+#: clientgui/ViewMessagesGrid.cpp:103
 msgid "Copy all the messages to the clipboard."
 msgstr "复制所有消息至剪贴板。"
 
-#: clientgui/sg_DlgMessages.cpp:181
-#: clientgui/sg_DlgMessages_bak.cpp:181
-#: clientgui/ViewMessages.cpp:91
-#: clientgui/ViewMessages_bak.cpp:91
-msgid "Copy selected messages"
-msgstr "复制选中的消息"
-
-#: clientgui/sg_DlgMessages.cpp:184
-#: clientgui/sg_DlgMessages.cpp:196
-#: clientgui/sg_DlgMessages_bak.cpp:184
-#: clientgui/sg_DlgMessages_bak.cpp:196
+#: clientgui/sg_DlgMessages.cpp:210
+#: clientgui/sg_DlgMessages.cpp:222
 #: clientgui/ViewMessages.cpp:93
+#: clientgui/ViewMessagesGrid.cpp:111
 msgid "Copy the selected messages to the clipboard. You can select multiple messages by holding down the shift or command key while clicking on messages."
 msgstr "复制选中的消息至剪贴板。您可以在选择的时候通过按住Shift键或Commandl键来选取多条消息。"
 
-#: clientgui/sg_DlgMessages.cpp:188
-#: clientgui/sg_DlgMessages.cpp:200
-#: clientgui/sg_DlgMessages_bak.cpp:188
-#: clientgui/sg_DlgMessages_bak.cpp:200
+#: clientgui/sg_DlgMessages.cpp:214
+#: clientgui/sg_DlgMessages.cpp:226
 #: clientgui/ViewMessages.cpp:97
-#: clientgui/ViewMessages_bak.cpp:102
-#: clientgui/ViewMessages_bak.cpp:106
+#: clientgui/ViewMessagesGrid.cpp:115
 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/sg_DlgMessages.cpp:664
-#: clientgui/sg_DlgMessages_bak.cpp:661
+#: clientgui/sg_DlgMessages.cpp:268
+#: clientgui/sg_DlgPreferences.cpp:506
+#: clientgui/sg_ProjectsComponent.cpp:116
+msgid "Get help with BOINC"
+msgstr "从BOINC得到帮助"
+
+#: clientgui/sg_DlgMessages.cpp:744
 msgid "BOINC Manager - Messages"
 msgstr "BOINC管理器 - 消息"
 
-#: clientgui/sg_DlgPreferences.cpp:91
+#: clientgui/sg_DlgPreferences.cpp:92
 msgid "100 MB"
 msgstr "100 MB"
 
-#: clientgui/sg_DlgPreferences.cpp:92
+#: clientgui/sg_DlgPreferences.cpp:93
 msgid "200 MB"
 msgstr "200 MB"
 
-#: clientgui/sg_DlgPreferences.cpp:93
+#: clientgui/sg_DlgPreferences.cpp:94
 msgid "500 MB"
 msgstr "500 MB"
 
-#: clientgui/sg_DlgPreferences.cpp:94
+#: clientgui/sg_DlgPreferences.cpp:95
 msgid "1 GB"
 msgstr "1 GB"
 
-#: clientgui/sg_DlgPreferences.cpp:95
+#: clientgui/sg_DlgPreferences.cpp:96
 msgid "2 GB"
 msgstr "2 GB"
 
-#: clientgui/sg_DlgPreferences.cpp:96
+#: clientgui/sg_DlgPreferences.cpp:97
 msgid "5 GB"
 msgstr "5 GB"
 
-#: clientgui/sg_DlgPreferences.cpp:97
+#: clientgui/sg_DlgPreferences.cpp:98
 msgid "10 GB"
 msgstr "10 GB"
 
-#: clientgui/sg_DlgPreferences.cpp:98
+#: clientgui/sg_DlgPreferences.cpp:99
 msgid "20 GB"
 msgstr "20 GB"
 
-#: clientgui/sg_DlgPreferences.cpp:99
+#: clientgui/sg_DlgPreferences.cpp:100
 msgid "50 GB"
 msgstr "50 GB"
 
-#: clientgui/sg_DlgPreferences.cpp:100
+#: clientgui/sg_DlgPreferences.cpp:101
 msgid "100 GB"
 msgstr "100 GB"
 
-#: clientgui/sg_DlgPreferences.cpp:131
+#: clientgui/sg_DlgPreferences.cpp:132
 msgid "10%"
 msgstr "10%"
 
-#: clientgui/sg_DlgPreferences.cpp:132
+#: clientgui/sg_DlgPreferences.cpp:133
 msgid "20%"
 msgstr "20%"
 
-#: clientgui/sg_DlgPreferences.cpp:133
+#: clientgui/sg_DlgPreferences.cpp:134
 msgid "30%"
 msgstr "30%"
 
-#: clientgui/sg_DlgPreferences.cpp:134
+#: clientgui/sg_DlgPreferences.cpp:135
 msgid "40%"
 msgstr "40%"
 
-#: clientgui/sg_DlgPreferences.cpp:135
+#: clientgui/sg_DlgPreferences.cpp:136
 msgid "50%"
 msgstr "50%"
 
-#: clientgui/sg_DlgPreferences.cpp:136
+#: clientgui/sg_DlgPreferences.cpp:137
 msgid "60%"
 msgstr "60%"
 
-#: clientgui/sg_DlgPreferences.cpp:137
+#: clientgui/sg_DlgPreferences.cpp:138
 msgid "70%"
 msgstr "70%"
 
-#: clientgui/sg_DlgPreferences.cpp:138
+#: clientgui/sg_DlgPreferences.cpp:139
 msgid "80%"
 msgstr "80%"
 
-#: clientgui/sg_DlgPreferences.cpp:139
+#: clientgui/sg_DlgPreferences.cpp:140
 msgid "90%"
 msgstr "90%"
 
-#: clientgui/sg_DlgPreferences.cpp:140
+#: clientgui/sg_DlgPreferences.cpp:141
 msgid "100%"
 msgstr "100%"
 
-#: clientgui/sg_DlgPreferences.cpp:165
+#: clientgui/sg_DlgPreferences.cpp:166
 msgid "1"
 msgstr "1"
 
-#: clientgui/sg_DlgPreferences.cpp:166
+#: clientgui/sg_DlgPreferences.cpp:167
+msgid "3"
+msgstr "3"
+
+#: clientgui/sg_DlgPreferences.cpp:168
 msgid "5"
 msgstr "5"
 
-#: clientgui/sg_DlgPreferences.cpp:167
+#: clientgui/sg_DlgPreferences.cpp:169
 msgid "10"
 msgstr "10"
 
-#: clientgui/sg_DlgPreferences.cpp:168
+#: clientgui/sg_DlgPreferences.cpp:170
 msgid "15"
 msgstr "15"
 
-#: clientgui/sg_DlgPreferences.cpp:169
+#: clientgui/sg_DlgPreferences.cpp:171
 msgid "30"
 msgstr "30"
 
-#: clientgui/sg_DlgPreferences.cpp:170
+#: clientgui/sg_DlgPreferences.cpp:172
 msgid "60"
 msgstr "60"
 
-#: clientgui/sg_DlgPreferences.cpp:279
+#: clientgui/sg_DlgPreferences.cpp:281
 msgid "Skin"
 msgstr "皮肤"
 
-#: clientgui/sg_DlgPreferences.cpp:286
+#: clientgui/sg_DlgPreferences.cpp:288
 msgid "Skin:"
 msgstr "皮肤："
 
-#: clientgui/sg_DlgPreferences.cpp:302
+#: clientgui/sg_DlgPreferences.cpp:304
 msgid "Preferences"
 msgstr "参数设置"
 
-#: clientgui/sg_DlgPreferences.cpp:319
+#: clientgui/sg_DlgPreferences.cpp:321
 msgid "I want to customize my preferences for this computer only."
-msgstr "我只想定制本台计算机的参数"
+msgstr "我想定制本台计算机的参数。"
 
-#: clientgui/sg_DlgPreferences.cpp:328
+#: clientgui/sg_DlgPreferences.cpp:330
 msgid "Customized Preferences"
 msgstr "定制的参数设置"
 
-#: clientgui/sg_DlgPreferences.cpp:344
+#: clientgui/sg_DlgPreferences.cpp:346
 msgid "Do work only between:"
 msgstr "计算时间段："
 
-#: clientgui/sg_DlgPreferences.cpp:357
-#: clientgui/sg_DlgPreferences.cpp:379
+#: clientgui/sg_DlgPreferences.cpp:359
+#: clientgui/sg_DlgPreferences.cpp:381
 msgid "and"
 msgstr "到"
 
-#: clientgui/sg_DlgPreferences.cpp:366
+#: clientgui/sg_DlgPreferences.cpp:368
 msgid "Connect to internet only between:"
 msgstr "连接互联网的时间段："
 
-#: clientgui/sg_DlgPreferences.cpp:388
-#: clientgui/sg_DlgPreferences.cpp:405
+#: clientgui/sg_DlgPreferences.cpp:390
+#: clientgui/sg_DlgPreferences.cpp:407
 msgid "Use no more than:"
 msgstr "最多使用："
 
-#: clientgui/sg_DlgPreferences.cpp:401
+#: clientgui/sg_DlgPreferences.cpp:403
 msgid "of disk space"
 msgstr "磁盘空间"
 
-#: clientgui/sg_DlgPreferences.cpp:418
+#: clientgui/sg_DlgPreferences.cpp:420
 msgid "of the processor"
 msgstr "处理器"
 
-#: clientgui/sg_DlgPreferences.cpp:422
-msgid "Do work while in use?"
-msgstr "使用计算机时仍然计算？"
-
-#: clientgui/sg_DlgPreferences.cpp:435
+#: clientgui/sg_DlgPreferences.cpp:424
 msgid "Do work while on battery?"
 msgstr "电池供电时仍然计算？"
 
-#: clientgui/sg_DlgPreferences.cpp:448
+#: clientgui/sg_DlgPreferences.cpp:437
 msgid "Do work after idle for:"
 msgstr "闲置一定时间后开始计算："
 
-#: clientgui/sg_DlgPreferences.cpp:461
+#: clientgui/sg_DlgPreferences.cpp:450
 msgid "minutes"
 msgstr "分钟"
 
-#: clientgui/sg_DlgPreferences.cpp:619
-#: clientgui/sg_DlgPreferences.cpp:622
-#: clientgui/sg_DlgPreferences.cpp:680
-#: clientgui/sg_DlgPreferences.cpp:684
-#: clientgui/sg_DlgPreferences.cpp:696
-#: clientgui/sg_DlgPreferences.cpp:700
-#: clientgui/sg_DlgPreferences.cpp:852
-#: clientgui/sg_DlgPreferences.cpp:863
+#: clientgui/sg_DlgPreferences.cpp:670
+#: clientgui/sg_DlgPreferences.cpp:673
+#: clientgui/sg_DlgPreferences.cpp:733
+#: clientgui/sg_DlgPreferences.cpp:737
+#: clientgui/sg_DlgPreferences.cpp:749
+#: clientgui/sg_DlgPreferences.cpp:753
+#: clientgui/sg_DlgPreferences.cpp:911
+#: clientgui/sg_DlgPreferences.cpp:922
 msgid "Anytime"
 msgstr "任何时候"
 
-#: clientgui/sg_DlgPreferences.cpp:716
+#: clientgui/sg_DlgPreferences.cpp:769
 #, c-format
 msgid "%d MB"
 msgstr "%d MB"
 
-#: clientgui/sg_DlgPreferences.cpp:718
+#: clientgui/sg_DlgPreferences.cpp:771
 #, c-format
 msgid "%4.2f GB"
 msgstr "%4.2f GB"
 
-#: clientgui/sg_DlgPreferences.cpp:759
+#: clientgui/sg_DlgPreferences.cpp:812
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: clientgui/sg_DlgPreferences.cpp:799
+#: clientgui/sg_DlgPreferences.cpp:848
+msgid "0 (Run Always)"
+msgstr "0 (一直运行)"
+
+#: clientgui/sg_DlgPreferences.cpp:851
 #, c-format
 msgid "%d"
 msgstr "%d"
 
-#: clientgui/sg_DlgPreferences.cpp:953
+#: clientgui/sg_DlgPreferences.cpp:1014
 msgid "BOINC Manager - Preferences"
 msgstr "BOINC管理器 - 参数设置"
 
-#: clientgui/sg_ProjectsComponent.cpp:97
+#: clientgui/sg_ProjectsComponent.cpp:99
 msgid "Attach to an additional project"
 msgstr "加入其它项目"
 
-#: clientgui/sg_ProjectsComponent.cpp:146
-#: clientgui/sg_ProjectsComponent.cpp:157
+#: clientgui/sg_ProjectsComponent.cpp:169
+#: clientgui/sg_ProjectsComponent.cpp:180
 msgid "Open a window to view messages"
 msgstr "打开一个窗口来查看消息"
 
-#: clientgui/sg_ProjectsComponent.cpp:175
+#: clientgui/sg_ProjectsComponent.cpp:198
 msgid "Stop all activity"
 msgstr "暂停所有活动"
 
-#: clientgui/sg_ProjectsComponent.cpp:187
+#: clientgui/sg_ProjectsComponent.cpp:210
 msgid "Resume activity"
 msgstr "继续所有活动"
 
-#: clientgui/sg_ProjectsComponent.cpp:204
+#: clientgui/sg_ProjectsComponent.cpp:227
 msgid "Open a window to set your preferences"
 msgstr "打开一个窗口进行参数设置"
 
-#: clientgui/sg_ProjectsComponent.cpp:221
+#: clientgui/sg_ProjectsComponent.cpp:244
 msgid "Switch to the BOINC advanced view"
 msgstr "切换到BOINC的高级视图"
 
 #: clientgui/sg_StatImageLoader.cpp:103
 #, c-format
-msgid "%s. Work done for %s: %0.2f"
-msgstr "%s。%s任务完成：%0.2f"
+msgid "%s. Work done by %s: %0.2f"
+msgstr "%s。%s已经完成的任务：%0.2f"
 
 #: clientgui/sg_StatImageLoader.cpp:218
 #: clientgui/ViewProjects.cpp:349
-#, c-format
+#: clientgui/ViewProjectsGrid.cpp:368
 msgid "Are you sure you want to detach from project '%s'?"
 msgstr "您确定要退出'%s'项目吗？"
 
 #: clientgui/sg_StatImageLoader.cpp:224
 #: clientgui/ViewProjects.cpp:355
+#: clientgui/ViewProjectsGrid.cpp:374
 msgid "Detach from Project"
 msgstr "退出项目"
 
@@ -1664,16 +1628,19 @@ msgstr "%d时%d分%d秒"
 
 #: clientgui/sg_ViewTabPage.cpp:411
 #: clientgui/ViewWork.cpp:214
+#: clientgui/ViewWorkGrid.cpp:228
 msgid "Are you sure you want to display graphics on a remote machine?"
 msgstr "您确定要在远程计算机上显示图形吗？"
 
 #: clientgui/sg_ViewTabPage.cpp:412
 #: clientgui/ViewWork.cpp:106
 #: clientgui/ViewWork.cpp:215
+#: clientgui/ViewWorkGrid.cpp:107
+#: clientgui/ViewWorkGrid.cpp:229
 msgid "Show graphics"
 msgstr "显示图形"
 
-#: clientgui/SkinManager.cpp:948
+#: clientgui/SkinManager.cpp:975
 #, c-format
 msgid ""
 "This will shut down %s and its tasks entirely until either the\n"
@@ -1703,7 +1670,7 @@ msgstr ""
 
 #: clientgui/UnavailablePage.cpp:193
 msgid "Account manager temporarily unavailable"
-msgstr "账号管理器已暂停服务"
+msgstr "帐号管理器已暂停服务"
 
 #: clientgui/UnavailablePage.cpp:196
 msgid ""
@@ -1711,7 +1678,7 @@ msgid ""
 "\n"
 "Please try again later."
 msgstr ""
-"该账号管理器已暂停服务。\n"
+"帐号管理器已暂停服务。\n"
 "\n"
 "请稍后重试。"
 
@@ -1721,7 +1688,7 @@ msgstr "请输入帐号密钥以继续。"
 
 #: clientgui/ValidateAccountKey.cpp:72
 msgid "Invalid Account Key; please enter a valid Account Key"
-msgstr "此账号密钥错误；请输入一个正确的帐号密钥"
+msgstr "此帐号密钥错误；请输入一个正确的帐号密钥"
 
 #: clientgui/ValidateAccountKey.cpp:83
 #: clientgui/ValidateEmailAddress.cpp:87
@@ -1773,113 +1740,153 @@ msgstr ""
 
 #: clientgui/ValidateURL.cpp:105
 #: clientgui/ValidateURL.cpp:109
-#, c-format
 msgid "'%s' does not contain a valid host name."
 msgstr "'%s'中未包含正确的主机名称。"
 
 #: clientgui/ValidateURL.cpp:112
-#, c-format
 msgid "'%s' does not contain a valid path."
 msgstr "'%s'中未包含正确的路径。"
 
 #: clientgui/ViewMessages.cpp:80
-#: clientgui/ViewMessages_bak.cpp:80
+#: clientgui/ViewMessagesGrid.cpp:98
 #: clientgui/ViewProjects.cpp:105
-#: clientgui/ViewStatistics.cpp:831
+#: clientgui/ViewProjectsGrid.cpp:112
+#: clientgui/ViewStatistics.cpp:1599
 #: clientgui/ViewTransfers.cpp:94
+#: clientgui/ViewTransfersGrid.cpp:101
 #: clientgui/ViewWork.cpp:102
+#: clientgui/ViewWorkGrid.cpp:103
 msgid "Commands"
 msgstr "命令"
 
+#: clientgui/ViewMessages.cpp:84
+#: clientgui/ViewMessagesGrid.cpp:102
+msgid "Copy all messages"
+msgstr "复制所有消息"
+
+#: clientgui/ViewMessages.cpp:91
+#: clientgui/ViewMessagesGrid.cpp:109
+msgid "Copy selected messages"
+msgstr "复制选中的消息"
+
 #: clientgui/ViewMessages.cpp:136
-#: clientgui/ViewMessages_bak.cpp:146
 msgid "Messages"
 msgstr "消息"
 
 #: clientgui/ViewMessages.cpp:158
-#: clientgui/ViewMessages_bak.cpp:168
+#: clientgui/ViewMessagesGrid.cpp:175
 msgid "Copying all messages to the clipboard..."
 msgstr "复制所有消息至剪贴板..."
 
 #: clientgui/ViewMessages.cpp:190
-#: clientgui/ViewMessages_bak.cpp:200
 #: clientgui/ViewTransfers.cpp:190
+#: clientgui/ViewTransfersGrid.cpp:207
 msgid "Aborting transfer..."
 msgstr "中断传输..."
 
-#: clientgui/ViewMessages_bak.cpp:93
-msgid "Copy the selected messages to the clipboard. You can select multiple messages by holding down the shift "
-msgstr "复制选中的消息至剪贴板。您可以在选择的时候通过按住Shift键"
+#: clientgui/ViewMessagesGrid.cpp:132
+msgid "ID"
+msgstr "ID"
 
-#: clientgui/ViewMessages_bak.cpp:96
-msgid "or command key while clicking on messages."
-msgstr "或Commandl键来选取多条消息。"
+#: clientgui/ViewMessagesGrid.cpp:132
+msgid "Priority"
+msgstr "优先级"
+
+#: clientgui/ViewMessagesGrid.cpp:153
+msgid "MessagesGrid"
+msgstr "消息窗格"
+
+#: clientgui/ViewMessagesGrid.cpp:205
+msgid "Copying selected messages to Clipboard..."
+msgstr "复制选中的消息到剪贴板..."
 
 #: clientgui/ViewProjects.cpp:109
+#: clientgui/ViewProjectsGrid.cpp:116
 msgid "Update"
 msgstr "更新"
 
 #: clientgui/ViewProjects.cpp:110
+#: clientgui/ViewProjectsGrid.cpp:117
 msgid "Report all completed tasks, get latest credit, get latest preferences, and possibly get more tasks."
 msgstr "上报所有完成的任务，获取最新的积分及参数设置，可能下载更多的新任务。"
 
 #: clientgui/ViewProjects.cpp:117
 #: clientgui/ViewProjects.cpp:568
+#: clientgui/ViewProjectsGrid.cpp:124
+#: clientgui/ViewProjectsGrid.cpp:453
 #: clientgui/ViewWork.cpp:113
 #: clientgui/ViewWork.cpp:511
+#: clientgui/ViewWorkGrid.cpp:114
+#: clientgui/ViewWorkGrid.cpp:379
 msgid "Suspend"
 msgstr "暂停"
 
 #: clientgui/ViewProjects.cpp:118
 #: clientgui/ViewProjects.cpp:568
+#: clientgui/ViewProjectsGrid.cpp:125
+#: clientgui/ViewProjectsGrid.cpp:453
 msgid "Suspend tasks for this project."
 msgstr "暂停当前项目的所有任务。"
 
 #: clientgui/ViewProjects.cpp:124
 #: clientgui/ViewProjects.cpp:580
+#: clientgui/ViewProjectsGrid.cpp:131
+#: clientgui/ViewProjectsGrid.cpp:465
 msgid "No new tasks"
 msgstr "禁止下载新任务"
 
 #: clientgui/ViewProjects.cpp:125
+#: clientgui/ViewProjectsGrid.cpp:132
 msgid "Don't get new tasks for this project."
 msgstr "该项目不再下载任何新任务。"
 
 #: clientgui/ViewProjects.cpp:131
+#: clientgui/ViewProjectsGrid.cpp:138
 msgid "Reset project"
 msgstr "重置项目"
 
 #: clientgui/ViewProjects.cpp:132
+#: clientgui/ViewProjectsGrid.cpp:139
 msgid "Delete all files and tasks associated with this project, and get new tasks.  You can update the project first to report any completed tasks."
 msgstr "删除并重新下载当前项目所有相关文件。您可以先更新当前项目以上传所有已经完成的任务。"
 
 #: clientgui/ViewProjects.cpp:141
+#: clientgui/ViewProjectsGrid.cpp:148
 msgid "Detach"
 msgstr "退出"
 
 #: clientgui/ViewProjects.cpp:142
+#: clientgui/ViewProjectsGrid.cpp:149
 msgid "Detach computer from this project.  Tasks in progress will be lost (use 'Update' first to report any completed tasks)."
 msgstr "在本计算机上退出当前项目。该项目所有正在计算的任务将丢失，您可以先点击“更新”按钮以上报所有已经完成的任务。"
 
 #: clientgui/ViewProjects.cpp:154
-#: clientgui/ViewStatistics.cpp:274
+#: clientgui/ViewProjectsGrid.cpp:164
+#: clientgui/ViewStatistics.cpp:385
 msgid "Account"
 msgstr "帐号"
 
 #: clientgui/ViewProjects.cpp:156
+#: clientgui/ViewProjectsGrid.cpp:164
 msgid "Work done"
 msgstr "总积分"
 
 #: clientgui/ViewProjects.cpp:157
+#: clientgui/ViewProjectsGrid.cpp:164
 msgid "Avg. work done"
 msgstr "近期平均积分"
 
 #: clientgui/ViewProjects.cpp:158
+#: clientgui/ViewProjectsGrid.cpp:164
 msgid "Resource share"
 msgstr "资源分享"
 
 #: clientgui/ViewProjects.cpp:159
+#: clientgui/ViewProjectsGrid.cpp:164
 #: clientgui/ViewTransfers.cpp:123
+#: clientgui/ViewTransfersGrid.cpp:128
 #: clientgui/ViewWork.cpp:139
+#: clientgui/ViewWorkGrid.cpp:139
 msgid "Status"
 msgstr "状态"
 
@@ -1888,251 +1895,293 @@ msgid "Projects"
 msgstr "项目"
 
 #: clientgui/ViewProjects.cpp:195
+#: clientgui/ViewProjectsGrid.cpp:209
 msgid "Updating project..."
 msgstr "正在更新项目..."
 
 #: clientgui/ViewProjects.cpp:223
+#: clientgui/ViewProjectsGrid.cpp:239
 msgid "Resuming project..."
 msgstr "正在继续项目..."
 
 #: clientgui/ViewProjects.cpp:227
+#: clientgui/ViewProjectsGrid.cpp:243
 msgid "Suspending project..."
 msgstr "正在暂停项目..."
 
 #: clientgui/ViewProjects.cpp:255
+#: clientgui/ViewProjectsGrid.cpp:272
 msgid "Telling project to allow additional task downloads..."
 msgstr "允许项目下载更多的任务..."
 
 #: clientgui/ViewProjects.cpp:259
+#: clientgui/ViewProjectsGrid.cpp:276
 msgid "Telling project to not fetch any additional tasks..."
 msgstr "禁止项目下载更多的任务..."
 
 #: clientgui/ViewProjects.cpp:293
+#: clientgui/ViewProjectsGrid.cpp:310
 msgid "Resetting project..."
 msgstr "正在重置项目..."
 
 #: clientgui/ViewProjects.cpp:299
-#, c-format
+#: clientgui/ViewProjectsGrid.cpp:317
 msgid "Are you sure you want to reset project '%s'?"
 msgstr "您确定要重置'%s'项目吗？"
 
 #: clientgui/ViewProjects.cpp:305
+#: clientgui/ViewProjectsGrid.cpp:323
 msgid "Reset Project"
 msgstr "重置项目"
 
 #: clientgui/ViewProjects.cpp:343
+#: clientgui/ViewProjectsGrid.cpp:361
 msgid "Detaching from project..."
 msgstr "正在退出项目..."
 
 #: clientgui/ViewProjects.cpp:384
+#: clientgui/ViewProjectsGrid.cpp:403
 #: clientgui/ViewWork.cpp:318
+#: clientgui/ViewWorkGrid.cpp:336
 msgid "Launching browser..."
 msgstr "正在启动浏览器..."
 
 #: clientgui/ViewProjects.cpp:564
+#: clientgui/ViewProjectsGrid.cpp:449
 #: clientgui/ViewWork.cpp:505
+#: clientgui/ViewWorkGrid.cpp:373
 msgid "Resume"
 msgstr "继续"
 
 #: clientgui/ViewProjects.cpp:564
+#: clientgui/ViewProjectsGrid.cpp:449
 msgid "Resume tasks for this project."
 msgstr "继续当前任务的计算。"
 
 #: clientgui/ViewProjects.cpp:576
+#: clientgui/ViewProjectsGrid.cpp:461
 msgid "Allow new tasks"
 msgstr "允许下载新任务"
 
 #: clientgui/ViewProjects.cpp:576
+#: clientgui/ViewProjectsGrid.cpp:461
 msgid "Allow fetching new tasks for this project."
 msgstr "允许当前项目下载新任务。"
 
 #: clientgui/ViewProjects.cpp:580
+#: clientgui/ViewProjectsGrid.cpp:465
 msgid "Don't fetch new tasks for this project."
 msgstr "禁止当前项目下载新任务。"
 
 #: clientgui/ViewProjects.cpp:682
+#: clientgui/ViewProjectsGrid.cpp:629
 msgid "Suspended by user"
 msgstr "已被用户暂停"
 
 #: clientgui/ViewProjects.cpp:685
+#: clientgui/ViewProjectsGrid.cpp:632
 msgid "Won't get new tasks"
 msgstr "禁止下载新任务"
 
 #: clientgui/ViewProjects.cpp:688
+#: clientgui/ViewProjectsGrid.cpp:635
 msgid "Scheduler request pending"
 msgstr "等待调度请求"
 
 #: clientgui/ViewProjects.cpp:695
+#: clientgui/ViewProjectsGrid.cpp:642
 msgid "Communication deferred "
 msgstr "通讯被延迟 "
 
-#: clientgui/ViewResources.cpp:151
+#: clientgui/ViewProjectsGrid.cpp:186
+msgid "ProjectsGrid"
+msgstr "项目窗格"
+
+#: clientgui/ViewResources.cpp:95
+msgid "total disk usage"
+msgstr "总磁盘占用"
+
+#: clientgui/ViewResources.cpp:112
+msgid "disk usage by BOINC projects"
+msgstr "BOINC项目的磁盘占用"
+
+#: clientgui/ViewResources.cpp:141
 msgid "Disk"
 msgstr "磁盘"
 
-#: clientgui/ViewResources.cpp:245
+#: clientgui/ViewResources.cpp:235
 msgid "not attached to any BOINC project - 0 bytes"
 msgstr "未加入到任何BOINC项目 - 0字节"
 
-#: clientgui/ViewResources.cpp:257
+#: clientgui/ViewResources.cpp:251
 msgid "free disk space - "
 msgstr "剩余磁盘空间 - "
 
+#: clientgui/ViewResources.cpp:257
+msgid "used by BOINC - "
+msgstr "BOINC使用 - "
+
 #: clientgui/ViewResources.cpp:263
-msgid "used by BOINC projects - "
-msgstr "BOINC项目 - "
+msgid "used by other programs - "
+msgstr "其它程序使用 - "
 
-#: clientgui/ViewResources.cpp:269
-msgid "used by others - "
-msgstr "其它 - "
-
-#: clientgui/ViewStatistics.cpp:574
+#: clientgui/ViewStatistics.cpp:1126
 msgid "User Total"
 msgstr "用户的总积分"
 
-#: clientgui/ViewStatistics.cpp:576
+#: clientgui/ViewStatistics.cpp:1127
 msgid "User Average"
 msgstr "用户的近期平均积分"
 
-#: clientgui/ViewStatistics.cpp:578
+#: clientgui/ViewStatistics.cpp:1128
 msgid "Host Total"
 msgstr "主机的总积分"
 
-#: clientgui/ViewStatistics.cpp:580
+#: clientgui/ViewStatistics.cpp:1129
 msgid "Host Average"
 msgstr "主机的近期平均积分"
 
-#: clientgui/ViewStatistics.cpp:682
+#: clientgui/ViewStatistics.cpp:1234
 #, c-format
 msgid "Last update: %.0f days ago"
 msgstr "上次更新：%.0f天前"
 
-#: clientgui/ViewStatistics.cpp:835
+#: clientgui/ViewStatistics.cpp:1603
 msgid "Show user total"
 msgstr "显示用户的总积分"
 
-#: clientgui/ViewStatistics.cpp:836
+#: clientgui/ViewStatistics.cpp:1604
 msgid "Show total credit for user"
 msgstr "显示用户的总积分"
 
-#: clientgui/ViewStatistics.cpp:842
+#: clientgui/ViewStatistics.cpp:1610
 msgid "Show user average"
 msgstr "显示用户的近期平均积分"
 
-#: clientgui/ViewStatistics.cpp:843
+#: clientgui/ViewStatistics.cpp:1611
 msgid "Show average credit for user"
 msgstr "显示用户的近期平均积分"
 
-#: clientgui/ViewStatistics.cpp:849
+#: clientgui/ViewStatistics.cpp:1617
 msgid "Show host total"
 msgstr "显示主机的总积分"
 
-#: clientgui/ViewStatistics.cpp:850
+#: clientgui/ViewStatistics.cpp:1618
 msgid "Show total credit for host"
 msgstr "显示主机的总积分"
 
-#: clientgui/ViewStatistics.cpp:856
+#: clientgui/ViewStatistics.cpp:1624
 msgid "Show host average"
 msgstr "显示主机的近期平均积分"
 
-#: clientgui/ViewStatistics.cpp:857
+#: clientgui/ViewStatistics.cpp:1625
 msgid "Show average credit for host"
 msgstr "显示主机的近期平均积分"
 
-#: clientgui/ViewStatistics.cpp:866
+#: clientgui/ViewStatistics.cpp:1634
 msgid "< &Previous project"
 msgstr "< 前一项目(&P)"
 
-#: clientgui/ViewStatistics.cpp:867
+#: clientgui/ViewStatistics.cpp:1635
 msgid "Show chart for previous project"
-msgstr "显示上一个项目的图表"
+msgstr "显示前一个项目的图表"
 
-#: clientgui/ViewStatistics.cpp:872
+#: clientgui/ViewStatistics.cpp:1640
 msgid "&Next project >"
 msgstr "后一项目(&N) >"
 
-#: clientgui/ViewStatistics.cpp:873
+#: clientgui/ViewStatistics.cpp:1641
 msgid "Show chart for next project"
-msgstr "显示下一个项目的图表"
+msgstr "显示后一个项目的图表"
 
-#: clientgui/ViewStatistics.cpp:878
+#: clientgui/ViewStatistics.cpp:1646
 msgid "Mode view"
 msgstr "查看模式"
 
-#: clientgui/ViewStatistics.cpp:881
+#: clientgui/ViewStatistics.cpp:1649
 msgid "All projects"
 msgstr "所有项目"
 
-#: clientgui/ViewStatistics.cpp:882
+#: clientgui/ViewStatistics.cpp:1650
 msgid "Show all projects, one chart per project"
 msgstr "显示所有项目，一个项目一张图表"
 
-#: clientgui/ViewStatistics.cpp:888
+#: clientgui/ViewStatistics.cpp:1656
 msgid "One project"
 msgstr "单项目"
 
-#: clientgui/ViewStatistics.cpp:889
+#: clientgui/ViewStatistics.cpp:1657
 msgid "Show one chart with selected project"
 msgstr "显示当前项目的图表"
 
-#: clientgui/ViewStatistics.cpp:895
+#: clientgui/ViewStatistics.cpp:1663
 msgid "All projects(sum)"
 msgstr "所有项目(合成)"
 
-#: clientgui/ViewStatistics.cpp:896
+#: clientgui/ViewStatistics.cpp:1664
 msgid "Show one chart with all projects"
 msgstr "在一张图表中显示所有项目"
 
-#: clientgui/ViewStatistics.cpp:913
+#: clientgui/ViewStatistics.cpp:1681
 msgid "Statistics"
 msgstr "统计"
 
-#: clientgui/ViewStatistics.cpp:930
-#: clientgui/ViewStatistics.cpp:948
-#: clientgui/ViewStatistics.cpp:966
-#: clientgui/ViewStatistics.cpp:985
-#: clientgui/ViewStatistics.cpp:1003
-#: clientgui/ViewStatistics.cpp:1023
-#: clientgui/ViewStatistics.cpp:1043
-#: clientgui/ViewStatistics.cpp:1063
-#: clientgui/ViewStatistics.cpp:1081
+#: clientgui/ViewStatistics.cpp:1701
+#: clientgui/ViewStatistics.cpp:1722
+#: clientgui/ViewStatistics.cpp:1743
+#: clientgui/ViewStatistics.cpp:1765
+#: clientgui/ViewStatistics.cpp:1786
+#: clientgui/ViewStatistics.cpp:1809
+#: clientgui/ViewStatistics.cpp:1832
+#: clientgui/ViewStatistics.cpp:1855
+#: clientgui/ViewStatistics.cpp:1877
 msgid "Updating charts..."
 msgstr "正在更新图表..."
 
 #: clientgui/ViewTransfers.cpp:98
+#: clientgui/ViewTransfersGrid.cpp:105
 msgid "Retry Now"
 msgstr "立即重试"
 
 #: clientgui/ViewTransfers.cpp:99
+#: clientgui/ViewTransfersGrid.cpp:106
 msgid "Click 'Retry now' to transfer the file now"
 msgstr "点击“立即重试”，则现在就传输该文件"
 
 #: clientgui/ViewTransfers.cpp:105
+#: clientgui/ViewTransfersGrid.cpp:112
 msgid "Abort Transfer"
 msgstr "中断传输"
 
 #: clientgui/ViewTransfers.cpp:106
+#: clientgui/ViewTransfersGrid.cpp:113
 msgid "Click 'Abort transfer' to delete the file from the transfer queue. This will prevent you from being granted credit for this result."
 msgstr "点击“中断传输”以从传输队列中删除该文件，这将导致您无法从该结果获得积分。"
 
 #: clientgui/ViewTransfers.cpp:118
+#: clientgui/ViewTransfersGrid.cpp:128
 msgid "File"
 msgstr "文件"
 
 #: clientgui/ViewTransfers.cpp:119
+#: clientgui/ViewTransfersGrid.cpp:128
 #: clientgui/ViewWork.cpp:136
+#: clientgui/ViewWorkGrid.cpp:139
 msgid "Progress"
 msgstr "进度"
 
 #: clientgui/ViewTransfers.cpp:120
+#: clientgui/ViewTransfersGrid.cpp:128
 msgid "Size"
 msgstr "大小"
 
 #: clientgui/ViewTransfers.cpp:121
+#: clientgui/ViewTransfersGrid.cpp:128
 msgid "Elapsed Time"
 msgstr "已用时间"
 
 #: clientgui/ViewTransfers.cpp:122
+#: clientgui/ViewTransfersGrid.cpp:128
 msgid "Speed"
 msgstr "速度"
 
@@ -2141,11 +2190,12 @@ msgid "Transfers"
 msgstr "网络传输"
 
 #: clientgui/ViewTransfers.cpp:159
+#: clientgui/ViewTransfersGrid.cpp:174
 msgid "Retrying transfer now..."
 msgstr "正在重试传输..."
 
 #: clientgui/ViewTransfers.cpp:193
-#, c-format
+#: clientgui/ViewTransfersGrid.cpp:211
 msgid ""
 "Are you sure you want to abort this file transfer '%s'?\n"
 "NOTE: Aborting a transfer will invalidate a task and you\n"
@@ -2155,80 +2205,108 @@ msgstr ""
 "注意：中断传输将标识该任务为无效，您将不能从该任务得到积分。"
 
 #: clientgui/ViewTransfers.cpp:201
+#: clientgui/ViewTransfersGrid.cpp:219
 msgid "Abort File Transfer"
 msgstr "中断文件传输"
 
 #: clientgui/ViewTransfers.cpp:522
+#: clientgui/ViewTransfersGrid.cpp:406
 msgid "Retry in "
 msgstr "稍后重试 "
 
 #: clientgui/ViewTransfers.cpp:524
-#: clientgui/ViewWork.cpp:741
+#: clientgui/ViewTransfersGrid.cpp:408
+#: clientgui/ViewWork.cpp:742
+#: clientgui/ViewWorkGrid.cpp:652
 msgid "Download failed"
 msgstr "下载失败"
 
 #: clientgui/ViewTransfers.cpp:526
-#: clientgui/ViewWork.cpp:793
+#: clientgui/ViewTransfersGrid.cpp:410
+#: clientgui/ViewWork.cpp:791
+#: clientgui/ViewWorkGrid.cpp:701
 msgid "Upload failed"
 msgstr "上传失败"
 
 #: clientgui/ViewTransfers.cpp:529
 #: clientgui/ViewTransfers.cpp:542
-#: clientgui/ViewWork.cpp:752
+#: clientgui/ViewTransfersGrid.cpp:413
+#: clientgui/ViewTransfersGrid.cpp:426
+#: clientgui/ViewWork.cpp:753
+#: clientgui/ViewWorkGrid.cpp:663
 msgid "Suspended"
 msgstr "已被暂停"
 
 #: clientgui/ViewTransfers.cpp:532
-#: clientgui/ViewWork.cpp:795
+#: clientgui/ViewTransfersGrid.cpp:416
+#: clientgui/ViewWork.cpp:793
+#: clientgui/ViewWorkGrid.cpp:703
 msgid "Uploading"
 msgstr "正在上传"
 
 #: clientgui/ViewTransfers.cpp:532
-#: clientgui/ViewWork.cpp:743
+#: clientgui/ViewTransfersGrid.cpp:416
+#: clientgui/ViewWork.cpp:744
+#: clientgui/ViewWorkGrid.cpp:654
 msgid "Downloading"
 msgstr "正在下载"
 
 #: clientgui/ViewTransfers.cpp:534
+#: clientgui/ViewTransfersGrid.cpp:418
 msgid "Upload pending"
 msgstr "等待上传"
 
 #: clientgui/ViewTransfers.cpp:534
+#: clientgui/ViewTransfersGrid.cpp:418
 msgid "Download pending"
 msgstr "等待下载"
 
+#: clientgui/ViewTransfersGrid.cpp:151
+msgid "TransfersGrid"
+msgstr "传输窗格"
+
 #: clientgui/ViewWork.cpp:107
+#: clientgui/ViewWorkGrid.cpp:108
 msgid "Show application graphics in a window."
 msgstr "在新窗口中显示项目图形。"
 
 #: clientgui/ViewWork.cpp:114
+#: clientgui/ViewWorkGrid.cpp:115
 msgid "Suspend work for this result."
 msgstr "暂停当前任务。"
 
 #: clientgui/ViewWork.cpp:120
+#: clientgui/ViewWorkGrid.cpp:121
 msgid "Abort"
 msgstr "中止"
 
 #: clientgui/ViewWork.cpp:121
+#: clientgui/ViewWorkGrid.cpp:122
 msgid "Abandon work on the result. You will get no credit for it."
 msgstr "中止该任务，您将不能得到它的积分。"
 
 #: clientgui/ViewWork.cpp:133
+#: clientgui/ViewWorkGrid.cpp:139
 msgid "Application"
 msgstr "计算程序"
 
 #: clientgui/ViewWork.cpp:134
+#: clientgui/ViewWorkGrid.cpp:139
 msgid "Name"
 msgstr "任务名称"
 
 #: clientgui/ViewWork.cpp:135
+#: clientgui/ViewWorkGrid.cpp:139
 msgid "CPU time"
 msgstr "已用CPU时间"
 
 #: clientgui/ViewWork.cpp:137
+#: clientgui/ViewWorkGrid.cpp:139
 msgid "To completion"
 msgstr "剩余时间"
 
 #: clientgui/ViewWork.cpp:138
+#: clientgui/ViewWorkGrid.cpp:139
 msgid "Report deadline"
 msgstr "上报期限"
 
@@ -2237,23 +2315,26 @@ msgid "Tasks"
 msgstr "任务"
 
 #: clientgui/ViewWork.cpp:177
+#: clientgui/ViewWorkGrid.cpp:191
 msgid "Resuming task..."
 msgstr "正在继续该任务..."
 
 #: clientgui/ViewWork.cpp:181
+#: clientgui/ViewWorkGrid.cpp:195
 msgid "Suspending task..."
 msgstr "正在暂停该任务..."
 
 #: clientgui/ViewWork.cpp:207
+#: clientgui/ViewWorkGrid.cpp:221
 msgid "Showing graphics for task..."
 msgstr "正在显示该任务的图形..."
 
 #: clientgui/ViewWork.cpp:272
+#: clientgui/ViewWorkGrid.cpp:287
 msgid "Aborting result..."
 msgstr "正在中止任务..."
 
 #: clientgui/ViewWork.cpp:280
-#, c-format
 msgid ""
 "Are you sure you want to abort this task '%s'?\n"
 "(Progress: %s, Status: %s)"
@@ -2262,182 +2343,220 @@ msgstr ""
 "(进度：%s，状态：%s)"
 
 #: clientgui/ViewWork.cpp:289
+#: clientgui/ViewWorkGrid.cpp:307
 msgid "Abort task"
 msgstr "中止任务"
 
 #: clientgui/ViewWork.cpp:506
+#: clientgui/ViewWorkGrid.cpp:374
 msgid "Resume work for this task."
 msgstr "继续计算当前任务。"
 
 #: clientgui/ViewWork.cpp:512
+#: clientgui/ViewWorkGrid.cpp:380
 msgid "Suspend work for this task."
 msgstr "暂停计算当前任务。"
 
-#: clientgui/ViewWork.cpp:737
+#: clientgui/ViewWork.cpp:738
+#: clientgui/ViewWorkGrid.cpp:648
 msgid "New"
 msgstr "新任务"
 
-#: clientgui/ViewWork.cpp:748
+#: clientgui/ViewWork.cpp:749
+#: clientgui/ViewWorkGrid.cpp:659
 msgid "Project suspended by user"
 msgstr "项目已被用户暂停"
 
-#: clientgui/ViewWork.cpp:750
+#: clientgui/ViewWork.cpp:751
+#: clientgui/ViewWorkGrid.cpp:661
 msgid "Task suspended by user"
 msgstr "任务已被用户暂停"
 
-#: clientgui/ViewWork.cpp:754
+#: clientgui/ViewWork.cpp:755
+#: clientgui/ViewWorkGrid.cpp:665
 msgid " - on batteries"
 msgstr " - 电池供电"
 
-#: clientgui/ViewWork.cpp:757
+#: clientgui/ViewWork.cpp:758
+#: clientgui/ViewWorkGrid.cpp:668
 msgid " - user active"
 msgstr " - 用户活跃"
 
-#: clientgui/ViewWork.cpp:760
+#: clientgui/ViewWork.cpp:761
+#: clientgui/ViewWorkGrid.cpp:671
 msgid " - computation suspended"
 msgstr " - 计算被暂停"
 
-#: clientgui/ViewWork.cpp:763
+#: clientgui/ViewWork.cpp:764
+#: clientgui/ViewWorkGrid.cpp:674
 msgid " - time of day"
 msgstr " - 休息时间段"
 
-#: clientgui/ViewWork.cpp:766
+#: clientgui/ViewWork.cpp:767
+#: clientgui/ViewWorkGrid.cpp:677
 msgid " - CPU benchmarks"
 msgstr " - CPU基准测试"
 
-#: clientgui/ViewWork.cpp:769
+#: clientgui/ViewWork.cpp:770
+#: clientgui/ViewWorkGrid.cpp:680
 msgid " - need disk space"
 msgstr " - 磁盘空间不足"
 
-#: clientgui/ViewWork.cpp:772
-msgid " - CPU throttled"
-msgstr " - CPU限速"
-
-#: clientgui/ViewWork.cpp:776
+#: clientgui/ViewWork.cpp:774
+#: clientgui/ViewWorkGrid.cpp:684
 msgid "Waiting for memory"
 msgstr "等待足够的内存"
 
-#: clientgui/ViewWork.cpp:778
+#: clientgui/ViewWork.cpp:776
+#: clientgui/ViewWorkGrid.cpp:686
 msgid "Running"
 msgstr "运行中"
 
-#: clientgui/ViewWork.cpp:780
-msgid "Preempted"
-msgstr "被抢占"
-
-#: clientgui/ViewWork.cpp:782
-#: clientgui/ViewWork.cpp:785
-msgid "Ready to run"
+#: clientgui/ViewWork.cpp:778
+#: clientgui/ViewWorkGrid.cpp:688
+msgid "Waiting to run"
 msgstr "等待运行"
 
-#: clientgui/ViewWork.cpp:789
+#: clientgui/ViewWork.cpp:780
+#: clientgui/ViewWork.cpp:783
+#: clientgui/ViewWorkGrid.cpp:690
+#: clientgui/ViewWorkGrid.cpp:693
+msgid "Ready to start"
+msgstr "准备运行"
+
+#: clientgui/ViewWork.cpp:787
+#: clientgui/ViewWorkGrid.cpp:697
 msgid "Computation error"
 msgstr "计算错误"
 
-#: clientgui/ViewWork.cpp:801
+#: clientgui/ViewWork.cpp:799
+#: clientgui/ViewWorkGrid.cpp:709
 msgid "Aborted by user"
 msgstr "已被用户终止"
 
-#: clientgui/ViewWork.cpp:804
+#: clientgui/ViewWork.cpp:802
+#: clientgui/ViewWorkGrid.cpp:712
 msgid "Aborted by project"
 msgstr "已被项目中止"
 
-#: clientgui/ViewWork.cpp:807
+#: clientgui/ViewWork.cpp:805
+#: clientgui/ViewWorkGrid.cpp:715
 msgid "Aborted"
 msgstr "已中止"
 
-#: clientgui/ViewWork.cpp:812
+#: clientgui/ViewWork.cpp:810
+#: clientgui/ViewWorkGrid.cpp:720
 msgid "Acknowledged"
 msgstr "已被确认"
 
-#: clientgui/ViewWork.cpp:814
+#: clientgui/ViewWork.cpp:812
+#: clientgui/ViewWorkGrid.cpp:722
 msgid "Ready to report"
-msgstr "准备上报"
+msgstr "等待上报"
 
-#: clientgui/ViewWork.cpp:816
-#, c-format
+#: clientgui/ViewWork.cpp:814
+#: clientgui/ViewWorkGrid.cpp:724
 msgid "Error: invalid state '%d'"
 msgstr "错误：非法状态 '%d'"
 
-#: clientgui/ViewWork.cpp:824
+#: clientgui/ViewWork.cpp:822
+#: clientgui/ViewWorkGrid.cpp:732
 msgid "Activities suspended by user"
 msgstr "已被用户暂停"
 
-#: clientgui/WelcomePage.cpp:315
+#: clientgui/ViewWorkGrid.cpp:165
+msgid "TasksGrid"
+msgstr "任务窗格"
+
+#: clientgui/ViewWorkGrid.cpp:298
+msgid ""
+"Are you sure you want to abort this task '%s'?\n"
+"(Progress: %s %%, Status: %s)"
+msgstr ""
+"您确定要中止当前任务'%s'吗？\n"
+"(进度：%s，状态：%s)"
+
+#: clientgui/WelcomePage.cpp:317
 msgid ""
 "We'll now guide you through the process of attaching\n"
 "to a project."
-msgstr "我们将引导你完成加入一个项目的过程。"
+msgstr "我们将引导您完成加入一个项目的过程。"
 
-#: clientgui/WelcomePage.cpp:327
+#: clientgui/WelcomePage.cpp:329
 #, c-format
 msgid ""
-"We'll now remove this computer from %s.  You will\n"
-"be responsible for managing the BOINC client software from\n"
-"now on."
+"We'll now remove this computer from %s.  From now on,\n"
+"attach and detach projects directly from this computer.\n"
 msgstr ""
-"我们将从%s移除当前计算机。\n"
-"之后该客户端软件的管理将由您来执行。"
+"我们将从%s中移除当前计算机。\n"
+"从现在开始，请直接在该客户端中加入或退出项目。\n"
 
-#: clientgui/WelcomePage.cpp:337
+#: clientgui/WelcomePage.cpp:339
 msgid "Account manager"
-msgstr "账号管理器"
+msgstr "帐号管理器"
 
-#: clientgui/WelcomePage.cpp:340
+#: clientgui/WelcomePage.cpp:342
 msgid ""
-"We'll now guide you through the process of adding\n"
-"an account manager."
-msgstr "我们将引导你完成加入一个帐号管理器的过程。"
+"We'll now guide you through the process of attaching\n"
+"to an account manager.\n"
+"\n"
+"If you want to attach to a single project, click Cancel,\n"
+"then select the 'Attach to project' menu item instead."
+msgstr ""
+"我们将引导您完成加入一个帐号管理器的过程。\n"
+"\n"
+"如果您只想要加入一个项目，请点击取消，\n"
+"然后选择菜单中的'加入项目'。"
 
-#: clientgui/WelcomePage.cpp:349
+#: clientgui/WelcomePage.cpp:354
 msgid "Debug Flags"
 msgstr "调试标志位"
 
-#: clientgui/WelcomePage.cpp:352
+#: clientgui/WelcomePage.cpp:357
 msgid "Project Properties Failure"
-msgstr "项目内容错误"
+msgstr "项目属性错误"
 
-#: clientgui/WelcomePage.cpp:355
+#: clientgui/WelcomePage.cpp:360
 msgid "Project Comm Failure"
 msgstr "项目通讯失败"
 
-#: clientgui/WelcomePage.cpp:358
+#: clientgui/WelcomePage.cpp:363
 msgid "Project Properties URL Failure"
 msgstr "项目网址错误"
 
-#: clientgui/WelcomePage.cpp:361
+#: clientgui/WelcomePage.cpp:366
 msgid "Account Creation Disabled"
 msgstr "帐号创建已被停用"
 
-#: clientgui/WelcomePage.cpp:364
+#: clientgui/WelcomePage.cpp:369
 msgid "Client Account Creation Disabled"
 msgstr "客户端的帐号创建已被停用"
 
-#: clientgui/WelcomePage.cpp:367
+#: clientgui/WelcomePage.cpp:372
 msgid "Account Already Exists"
 msgstr "帐号已存在"
 
-#: clientgui/WelcomePage.cpp:370
+#: clientgui/WelcomePage.cpp:375
 msgid "Project Already Attached"
-msgstr "项目已经加入"
+msgstr "项目已被加入"
 
-#: clientgui/WelcomePage.cpp:373
+#: clientgui/WelcomePage.cpp:378
 msgid "Project Attach Failure"
 msgstr "加入项目失败"
 
-#: clientgui/WelcomePage.cpp:376
+#: clientgui/WelcomePage.cpp:381
 msgid "Google Comm Failure"
 msgstr "连接Google失败"
 
-#: clientgui/WelcomePage.cpp:379
+#: clientgui/WelcomePage.cpp:384
 msgid "Yahoo Comm Failure"
 msgstr "连接Yahoo失败"
 
-#: clientgui/WelcomePage.cpp:382
+#: clientgui/WelcomePage.cpp:387
 msgid "Net Detection Failure"
 msgstr "网络检测失败"
 
-#: clientgui/WelcomePage.cpp:387
+#: clientgui/WelcomePage.cpp:392
 msgid "To continue, click Next."
 msgstr "点击下一步以继续。"
 
@@ -2467,26 +2586,26 @@ msgstr "完成(&F)"
 #: clientgui/common/wxFlatNotebook.cpp:182
 #, c-format
 msgid "New page inserted. Index = %i"
-msgstr ""
+msgstr "New page inserted. Index = %i"
 
 #: clientgui/common/wxFlatNotebook.cpp:187
 #, c-format
 msgid "New page appended. Index = %i"
-msgstr ""
+msgstr "New page appended. Index = %i"
 
 #: clientgui/common/wxFlatNotebook.cpp:2048
 #, c-format
 msgid "Old Page Index = %i"
-msgstr ""
+msgstr "Old Page Index = %i"
 
 #: clientgui/common/wxFlatNotebook.cpp:2053
 #, c-format
 msgid "OnDropTarget: index by HitTest = %i"
-msgstr ""
+msgstr "OnDropTarget: index by HitTest = %i"
 
-#: clientgui/common/wxPieCtrl.cpp:191
+#: clientgui/common/wxPieCtrl.cpp:196
 msgid "Pie Ctrl"
-msgstr ""
+msgstr "派图"
 
 #: clientgui/DlgAbout.h:52
 msgid "About BOINC Manager"
diff --git a/locale/client/zh_TW/Boinc Manager.mo b/locale/client/zh_TW/Boinc Manager.mo
index c2cde25f7214bd4f6be9aa27bfaac4b1e8f2b1fd..a4a0a9887c8371ecedbb8d3dad19efdf7b6b5dff 100644
GIT binary patch
literal 44215
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

delta 12777
zcmb{1cX(7)-oWuYk(MzC(o2L(Zy{7^QUlU^Qv}3GGD!xKnK&~cpvWY2NFsqFp-2lQ
z1P};}0@Cekcdh8!Rx^`CS5bV`wZGrr+yk=jKF|BUf9!qy@j2(*d(S<6P*1%d^-D=q
z;NyDLHW^&IY=#kw4Qd-k*C@k?X(pwHajCUokTssdoAFtU#y7Azet-?}2W*5fZ7kbh
zWAX#AK2F6lOu=^8xUFHt8AiYuL?VTP`52FX#a<{+wSwN*4QJwQxC*D>K70*-!0z~5
zd&4*;d0d1g9Soxnw(Mva{A0}Ik0Ths8rZcHjph4BZxVGW7>3fbsaO-|;4PSpb<n3>
zj@8L4l;^hUd@(Wz#sQR(c}d?7qrCq$GPuU?coW8SHjG+)->6H%j!jX9xGlzDcdUhj
zumO%lY58olV<O7XW}x&i7a3jS5XzLihNH0@qp@ojt3!R!BtH@Z(t}hIQjrG}a5+xJ
z=TTm4%0vyoHYh#67v=e6lo48lc3h3p(~VdU_n<WV36ze!g!0~7DBrD!WBg^&T%n*T
z*63=r+(db>560kFl#1^{c`g+@U@qQ@2lf54D9^u)^5M%Ui~1{+2H06(a=$*xduBZ2
z&*&IEDd>%JQ5Mriln*|GGPG|Y>(clYWo}z_GYr`vgHTrW-FO(IdD($apfs>?4{J(?
zAnVi^hlO}Qj=`uvPd-j!Jbw&E$uk(n1(enQCDy~*y{r*2QSSFf83_kU4<E!^aSPsp
zhfo^&B-Y1wP_|<g%2e6ttvnZqAyJz|b8LZ~P%0da@`4jv;zM}OW*9q=HW~M@x1?bO
zC_}p&xn&$g2E+Im<-@o1Wj$eQl#wpMM)+6cxqwkgVh#mO`WePR%t8}SpnTvhln;cl
zE?z;Y!01n7p)tx-48z7a2W2GuC{wozr{Xc>XfUE!$#RZ#!WOdsN0E?Ko`Q8S6XioW
zcr$K5sc;9%oE}4Iz<an6zef2`?j6?99>THYpFsYJ^h$a@klsmssVF1k!+hEQt4YYd
zZZOC&7GiUh2R33;EJ115C6u{;17#KehSku{!jU<xgSTNbl!o?0S#<ZIyuS*iV?`(p
zIe-D#&q4jblPDFxh_U!CO3%N;?pS?@)zdymkueV$RbwYgLocILd==#&`W>5N>!H?^
z4%W^?X?V_1#=i%Nl@!Qao<eEq-?1isi_(yvP>$9{!>k7NM;W1UC_SHtEpfiiuS5C3
zCX^0s)8z-WCvY0&=Z6IhV;zZGIrbXhcI|Pzo&57CJ^B@;r?rM#6(*oGU=qrENys`j
z7NInx4CTCd1EnM1qina|P!@B{2<xD07$6}Z=z_8c`=Y!s46ET7l(T#y%IZx<nd3aX
z2@hg5Jc6<)PheyUQR;mc<-?z$jMTR%-}x0e6pcWQJ1MZSckxLI29LDP`hVhR^1Vh`
z`*sORMF&vU%t@4r&Y|?^d8~=Aqns!2VG|6YH0*bjk!nb#&9F1Jko|ur37PX`lotC@
z7F`a?qS}Zuq>o`Od<A9b-_iLhWCIyjQKqch7^^-f%1C6PJiiR(!$m0P%5m%>`~O)I
zNfdm8b8-4utAZ2Sr!krGH?bD>9cT4$sCFVs&*q?v(ETXeIS1*Xu^Q#WB`6Jf3S}F<
zgI)N(5hl?A>y5YOdH_a~pRBzHJCRRD8PbPQDms8NLT9lizN7OW;mzcKL=$hCVCCDQ
zJl`Fq0b?=Hn#61pG9*h;D%yau*tTMAyo53(uc1uUr`QI+L0OCqCR+D<qTC;WvTdhh
zHM}2XL>8i~orkbCE}zKw%babXz>Y8I2j4_FINnG3(D&E{n@+MCcqhu5n1IrN43y{d
zP)6<mN`sH1?4D;(I`}?H1O9>1u&a|8e`&yv6!gZflMN#s6EPKE$9dRyinSXyV_Wi{
z;$2vMs&#)ZO8z`D>PEw9)(M%2L&+CoA%2Dj&^Mjm6Ko!sVYTE*lp(o*GRLo=^dy8b
zbXQQe(GMs+t3A`2%a$lT?~l^M8CW0FQ0iNPx8ORI`nF;W?nN2#K$%XQ#kv$ckMcA6
z9?A<>P%8WhW%bvln`{K55spL$ayS~LD8C6`qKTdFw*DS44rOE?#35LQ95u!_$a?{!
z&n)&l1&dKW_%%w4|B3Qq&3g>PjRR2{av0^gizq#Q5j)|B*avIOwhpjC*pvJsln)<9
z>G_u!sUPdg{;xU5y3qt>)wV<VKms<y@hC%{iZ!BWD1wo5uQkNWQJ&v`jqy>G=Y!hk
zwC`!Fw7*~>-#2Q{v*vK8_6*8F^e(o*-uGEf!zSdtDBCj+8{rAO17E~4tnRSxpTx!F
zKf(;WE7AHltLLya`JXVbmqaYbpDeOVC~M#a?PZijQl<SblqvWFrHA!77Ny7SP@Ws4
z9j%>)v6SD7($EL74sOJTxF?zMmj_N$AQil${S@T{`x2!=KcalNmeYDJ7Nr3lbiO|}
zAU^`z;VhI93ZRK4D0BV-@-tz)i}HTUlz^4!kzzeK9HoWHC@u7(EUI-l5T8P6=<hfL
zqd6pM;24y}I9Z#7ve*{t{Bms($`l?%Su;-uNHit!3Q9#`l#0GWdC*9+7GYDA2K7eS
z*JDve<ZfM_j<Qykp>&`ar2)rLK6F8s{{^Mq%UBZw-;$6Ae?s{{4VU#V9<kV&{9tU0
zE|iKN*7=<%AAClae}>YLt9Te==5r?CX}lX93#=pi49fRDK<W(`6(knP3+dK@vJyLy
ze+9eZ4;Y7SS;Eb63d)+uz!+SLtuPN|<c?@B>HBYKKh@=5p>#wJm4>qa>ynU)+D8i5
zA}9}x!In4+rKgKghHi__AIEeXf5$@^p+T9}T1rG&BYu=M6F^x*=k)#WFpqro`zh!9
z#s(77gTG)u`~o@5j5c0t1eT&S;4zdQzKpU~K1OMH2xWU+MQL!f&uVBVtV=!t<+*8S
z;(aI$%EdrC5~oQ>13pGM800*ThBhc8(G~0AAe0YJ*7>_o-kXoIcJlEd+@s6QENdhZ
zuovYMup8#0{A?f3V*I6LuTxMPKg37y3zQE97Fz#`wF>3ArrFkq+M_gVAa=m<C=K?b
zytfqP`IRVBwh?8D4r|}g_rK3({H3BOR-jZ+4`uFRQOY}@RMZ!xrz22CA_e8ci*<Q1
zN)MmGuJ|L$!PbuRSL#i`CO97DeJ9FdUKG%YM^IW`hH{pl!k+jY-h%BPu<qZEQt?1+
zkF!u3n1l7P0Hp)PXyRi!|0+uTmr*+Qi8gSBgbe*3I1Xz+Xc#1oStu=jTl*EtqN%aO
z`rsf;AU_sw#sZXjwxaa#01m)2*bu)*sqbbMh%}@vGBN?9i!Qhwn{s0yN{?o0leC#A
zFFu6wffXpLeY4J=LK*6pP@a1mrKf+>eu+}=FDN5bYpLX!|5y@o6m~*cBt7s;oQaQO
z0?)`)e2l~K)*Nds%s{Cy8>`_8lm@ItX@Jsh!&}K0qcl9IeO{za<9%K550oML1Eu9n
za;*<^M9JTda{o^4y(k~bMyYtI&Tl}Osx2ss@pY7j{-(7rv!<#s24u+Fk&q7zL3v>k
zy6_=P!3vZLCN8&}jkC$8p)}xGlm@)4{TQ2*{}$!F+AFN*nxT}p!WKAa1>-M^V-5vU
zffw82O6?(RME-S@ioz(X`#Y2hen+YBww0FsQ93jOWhy+_3Kyd+(nodvfX=_TlJS=h
zze9lxZ6!*@wpG?5F;PC)8)amMpfn@{rQr`~3$YFP5|jqKq|3{-Kcm!NceOPVolxrO
z9?%7YbioLe7EjUTKJ5b-OL;Cz19zf4cV6HB1Z5<``hL_J>$z4aBQX@EqhnDTK3C@h
zJ`y!3Sfwq%&g37_Uc{;7zrcAoXsz|1>vrHB<bTEn*k_%!OUB_u@=I|vzKRLhD9`$D
zNVBjf`E|&v0pmQ0hbb79Z}~1tgPaA{5T&E^cri-(7VR#So|K^U>>SF_zm780Rk}Qi
z%H_F+C_~-_WwH0eXxaaxb-`4WpUXs@_i2}-46V}lkD*j_32Wl3*dO1)IIOeY`n%yk
zlo48j(xB7W7XOO!Tk!)9k^SGf(0XA$%Dz2>_u=1BdYrJq>fsoa3g%!Y=A!iMDoTTD
zZM2?ii1NXX*cyjn2TVp8$$XRsAI5;Z7$PBF#d`RM&eu~`&s(D0zXN3vjz;;g6K&Xo
zke}^E#4zG}Lar=srVw{oS>qXP6Uq)*=_untWs7SNpky<#mr@xLxpqhXWc;u?_kO}7
zL^sm(*f>MT)x{$6rwrdh?#tB*Gl{Xp-Na$ax}aP#eA@|`pNA+5Y$maeL|@!bd`mDt
zMy`H=q;U`FErcxRA$ULvxqc*e5LXEq*V)`#OoT|g2o`wc>PlHWQKa*~YKPl&pS`+Z
zBM)&985P7b(sE5EWXx-mPr_BYyesKhgj}5|^Wo>jds4tPgR+?zAIbgs$DNc<A_h`a
zXwzeUjLd2Zr=bV0U0;*vM7}-lB(n9rK`8&@P%inauv~9j7=6h*h-94?-Xdhn^ryT9
z;UPVRxIX7mlHt0S=*0uKV?8{FLkPJhlXnvRtZd|Ol%JBmkLXGH1(d5H>5s7$F_d%;
zDwM0-!YIaBlwDhM#=H8)O%(cxRN@=TWZ%j4Gtq|FCK-Lz#|gv&o^6Js@D8FoA=gw~
zhFggFq;DZ=k=~*2&z1TAjDiFT`Vg;^euud6nx`|3xSvn@1DzjC{&qsHFD;Bj^5aO~
zPvnqZjIZf?LJ9FVou7karT^zijOO7KoUd;RBPf&2FV|9{1@SxaAu*DBw-TF3%hiwc
zZP=UGNxCr(BINkILfm*2l95v?a>@92B!WacUX<%$Z4a~&|3z7SJc?V1d8DTh+X(qD
z*f(CeWPT%VA)e4Tp2NQrH}mWZ*a6?r_f)O8n85uMOd}p7(zua^ay8XjISz0Vw^7!b
z_<^(>nQ}c$JW5$Q&L$d=Zh(&y`K14WbBR&JQu5cXURELy`7e$)lj%fUBqs3CNzB7o
zBARp}kwM6HH?c@p^fKvcq&E=NNDn|$-#blyHSqv(?TX@FQ!<<ID;zIpK&ig_Jl;gq
zCC(Br619ox#7jgSUGW#B<!VIy5lJ!U+)LK?by4KsW+gpSm#@2a1GiJQmbg!T1LUfO
zCf2~M#QUUA5po^0Fr0WRahd3@%Y>CYUx}aGP<Dy*bjr(c1<ExLJL4~rob~s7`fvT)
zW)?2j5B4NIRc>%CBt}G193;4gDB!t{go_wVz8NmS$B1#HAHrveyGTDk#1Sotw!}Wl
z_Yflqu7L3fg)#~q$h|_GAPR`l#2m^e5^ac@#8Z@o3Ax4-al~=S=&KIi%X1Uat;^oj
zx+#y<>Gq_Hh<0)Y3?tE+8yP6qa-u4dvi_(Jc73lmendVAy~HZge(SO8f36_aoO^YN
zF~kyL4dKvF+=)Yp7|J5QY7n{BYQMv$iC2mBJTwDq5Pu<B5>FD>u1O?z5yOcAL^fe3
ze7rXX|4FEi;sQZm*AiQBV7E!OY9n3g&Y<d^Z3{TeB#+zeO!B)tZqx5E{b^2fjN9+@
zx}AQ>XF9zp9&d)}^JF;942O$bZihR`8E1MjoxH*0?R@f}t|lwfbhwkRzb5zHPG_<+
z+06EM7sMMpEct7%sJcD7swF+&Y}>w_FM4DTqy4Z%PnMr5<KyGWBqe#W+<w06cBDGJ
zYH_bN>Ughx>h9hhRDSPn>Z#tBRcxPD!C`%R+JX=FZDNadd;De!?<A`o{dxw^^!qp}
zF3!wMcRGAdGbzoPv>?*r45!aWg*3vE$m3o!CCf`oy>@lvj<M>GJAPMV2YsLt2G>(d
z2S+R4V2_F#ax!Lw%aKm^#(PpdZgpu$CsloDR`TQ<>t5{1^3pxObk(HV3{SE%!+yg6
z%h05`7+8iS(Lrkxv;2N*;Jr@2cX8xKrq{X9<;n8d8DX!3iBV^V_P*Ji<;gNLvV4Af
zlKOTiy-M<AWMsKrNe;i$P8FFRuixy~J>Hze>`;%(XYx;qYmqZKP7N3~pmk(k5+;qA
zIQ-8USm5?#+Z~Z1clqOkQ3;!DYRRz9vxld<Xk3cR?ee9`<T@8|JJNz|S9-dc$Ojw?
zWcod(!_0OjnwboznVsfJ;&Eqsy3fu~(0#Adv}%uxj0{J*T0cA`X1K?l;__xl=iJIZ
z;?+s1bTlhHlJ~`#@^YGEAxp=TZThm3l9;cQtn~E7rqA#2`dLho`e-FpIPJsJ9Bw{;
z=OV_-mEm;z<JDUux(D0c+1aK(8#ztQ8}($c+vvl#nhVTnnT{l<8b5ZMsx|J2${!c4
z<|H($8~I?Ck9s|BJ9DFQ#x+zM5*q&7jo`s?88+2<!sX!5iPLQA=%hk5esW(`IC+Jd
zJf*#Qc}jcxWQWhk{3j1E)Xp9)RO-~*q8x5DJE3{th5?i<VD-Vto=Uenl9Rpk(R8Im
znv(5c(aWB)Iu_}yL+=GorVN@-mKQBHWyR^`Y)|w!yve?JyZtWaLgvZmWWC8?dXkbH
z0Uz%<(#^;heO6<V9BzixlPT+t${c<c35$?HjK5xqY^h8-bwhj2Ywfj`u1EHcFW%65
zA=B$w=t`C~=(Ij&J+4v{>I5RKiHtPe^Ey*qK8_kY-yP+3B~Nu`W+k%n;?0hFAoL>e
zn~OP(lDtl4JDDb$*9ODkx8L~U^{t-l;lPsar1|}s1G;s~&d!cc<qI+1YoG9VQ`H+&
zPpi^tx7KiGWKyp>HvK@&Y1aBu6J|Ko#Tj$du9;(R@@Bb%U(c)^rHaQkQEg_83+|nD
z)TSPo-Ci}C<5kt>4sGi8cph*X(=wS=BT|Do+3T6lp{nkgJ72v!_iFX&4&MS_u<pEL
zQ8kj%JRYA@HBW4=K5_K@GyAPtn6xDjnQQ0um27hSxzbIJ4AzIV&1X8Y{2tjkNe(uI
zJ;jrr?#Xt!Q?2P?XuT!}NQ%?z<Q!m{ho|#3mV-N)y(DWYl9##Br>Z^M<xi7CR~AAb
zQ>u#0-1RoZ8`I@9u~t+X4^orc`kY_7^`C5GkN;02ueVV?ubMmitJTg^YI4e$=oxh1
z?Z|Kr2yRLF$)=jQx->~nmLC1NX6)B~Od7lT)V2;V7Hnj)-gb2vH;dgOJ+*VjG31$S
zHCJM~Gx94DdGp%%SSM*xx{LFM#g^jFc5vFIcs&_*Iki0Q_~3~7<83$D+xb-Cg5sF#
zdnVE0RrjYSsXxXyY-~<+X8Vi`&e@Et3^U#7PW7jm?UL0u8Ix=G>DvAFuHE~XJ^By0
zy?bzi`#xL81dnGyhQqtSH^A)LBkuY?y}JLIjufiBo;GSpraKsQ|5RJh?=_>6D^8xM
zJaw!pXK%%+ZQ->Aq4meg&+f0vIZ;`hAKq11e&*4NlSe9#oC@V_DnGyd^PFW>MR}o3
zyX3c>cgjz%v)&I~$k*?z&8ga+Q(2N*v2Dfmchm)cQ?=LMQvKk6_Sz46)#mNtqI1>{
zddK#|IvJtU!OE?>DvlOc6s}UAXLSp9UKnjtBeDmpg6yiuuerInr7bw?fflx|;k6ga
zPZxyNlvyw7cf%XD@L?l#>O|!s>4*`2{48xyU3SF=cR%<|RBU+l+KNX?D@yZ1=hhqH
zWu@UWMWJO|L;KHH<>sm2(qgqK@KLR@HR0klv`FpGxmPvHbw*21PVJ}n>cQOMG2xB-
zrI}mLhF0!Z&*sJj>ny8pYY;xNFSKcWRdIg##iOAM2N{kl=TwK~ZMv18zsM(L+b>#d
zmY+Kl-d+&eT3UX7m1(V$^3x^sq+-|ps$9kB2FsTpx2cQ!8U`v$kA#kH(@)U^U4>Q5
zlSVjy?dLi9p`-cXHHDw&6jVLBhpFL)^lSTa=17MBbWSKIk149!og3P)uCny;$lbLv
z_&iox9NL*j-Qh<c5AEAl8C+dix=vTEHm#f-Q?cg^BUxEeRB>pt`hMlUKH=OWp`z_q
z&gJqp!_1dM>vqYCIFLt))Ks=Nl(V(+=(?)hQ=wxeRR=dypW3pjgZgmQmp4gz?3#t@
zvo!_5HEU1WVk-9LR_xhTaqvu4ky20R<*D@i10yRB=T)9N&G0g)G`-^RRw}M~^la!z
zVb$^{%Fmt*Z7&P$$O&!C4;@=ovFDt$_}|}AnJbzE>lEB)Q_CN|9Nf5mqD}o=_>fw?
zp{II&!%~&Av4gs@F}|i%#Q^12-PDpt>IH7B)gCHY7Tzf%#j>JLGE9+0T9tdcYWK?U
znj&j<D>iMdEX@h;xELxsZY}<QZ!L|q+rw)%gmN~7a!*#Qxgc|NY(@FS;)*9q_`;QQ
z`7DZXXU5gqf!j*MTbG4$w}+4Hk$0_Et<@s0maSIZS2PLma%knr^0P(dXU_cVIIy>F
z`~@`Gs+FZ@L#x*PpMz=dc)j1DvTfn*hh(3Qa(S=+44a{|XDSZoF&16e3bdTj4{>x{
z$oZc?tN-$=dRgskQc+sK`jEfFhj#5AU{vlo99p@i{QM)TU{iiHE6Q3+s$S7OYH`s-
zRan$eIX1`D2<<w>c@$Ke>qV&(Ta$t#wmoiBw{7pOUfQ0mF6|g;O1*LfZDS`HRXMvt
zXG#pKu25t@tByM-s<k_-sz)|*@c1rUl={86Rb)lJUp!J9s|N2mpyKzg3$XOUs(?Mu
zK+AAP=D}Lx*0QG86)cA}W#QdVhSfH1g>u((l34q*a`hp0U)Ab@a8a4n44Fe-2tT}^
zy;oJV*4k9oT+2}w`G8e54+MC^ItfFnSmyPAYfq$0|JnA$UTaXKZmY%D+oOv24X(jn
zpl>R-ppj~~f3tdP|J=IPW~j_r87eHOC_O$P*sbI-n`%?qRxK@UrtU6nuSS*Di?tSV
z_{iSSg`M&%QhxeK#euU`TldjLWgcu4FGE?jT1N2H@yZjsD^EOTeVO~$PQyn^!)s1f
z96rX#1XB;Tw0=vE9%`(199p1y9gh5js$++1H41Of36-r69oZaOxx8xADOLqPqQ-v%
Duy#f>

diff --git a/locale/client/zh_TW/Boinc Manager.po b/locale/client/zh_TW/Boinc Manager.po
index 225bd0e36b..4c2ff7b3cd 100644
--- a/locale/client/zh_TW/Boinc Manager.po	
+++ b/locale/client/zh_TW/Boinc Manager.po	
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: BOINC Manager 4.x\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2006-05-06 19:50+0800\n"
+"PO-Revision-Date: 2007-01-19 17:15+0800\n"
 "Last-Translator: Jose Sun <josesun@gmail.com>\n"
 "Language-Team: BOINC Development Team <rwalton@ssl.berkeley.edu>\n"
 "MIME-Version: 1.0\n"
@@ -12,96 +12,97 @@ msgstr ""
 "X-Poedit-Country: UNITED STATES\n"
 "X-Poedit-SourceCharset: iso-8859-1\n"
 "X-Poedit-Basepath: C:\\BOINCSRC\\Main\\boinc\n"
-"X-Poedit-Bookmarks: -1,-1,-1,-1,30,-1,-1,-1,-1,-1\n"
 "X-Poedit-SearchPath-0: clientgui\n"
 
-#: clientgui/AccountInfoPage.cpp:301
+#: clientgui/AccountInfoPage.cpp:320
 msgid "User information"
 msgstr "使用者資訊"
 
-#: clientgui/AccountInfoPage.cpp:306
-msgid "Are you already running this project?"
-msgstr "您準備好運行此專案了嗎？"
+#: clientgui/AccountInfoPage.cpp:326
+msgid ""
+"Please enter your account information\n"
+"(to create an account, visit the project's web site)"
+msgstr ""
+"請輸入你的帳號資訊\n"
+"(要建立帳號，請前往專案網站)"
 
-#: clientgui/AccountInfoPage.cpp:309
+#: clientgui/AccountInfoPage.cpp:332
+msgid ""
+"This project is not currently accepting new accounts.\n"
+"You can attach only if you already have an account."
+msgstr "該專案暫不接受新帳號註冊，只能加入已存在的帳號。"
+
+#: clientgui/AccountInfoPage.cpp:338
+msgid "Are you already running this project?"
+msgstr "您準備好執行此專案了嗎？"
+
+#: clientgui/AccountInfoPage.cpp:342
 msgid "&No, new user"
 msgstr "否，我是新使用者(&N)"
 
-#: clientgui/AccountInfoPage.cpp:312
+#: clientgui/AccountInfoPage.cpp:345
 msgid "&Yes, existing user"
 msgstr "是，我是已存在的使用者(&Y)"
 
-#: clientgui/AccountInfoPage.cpp:331
-#: clientgui/AccountInfoPage.cpp:494
+#: clientgui/AccountInfoPage.cpp:361
+#: clientgui/AccountInfoPage.cpp:498
 msgid "&Password:"
 msgstr "密碼:(&P)"
 
-#: clientgui/AccountInfoPage.cpp:335
-#: clientgui/AccountInfoPage.cpp:509
+#: clientgui/AccountInfoPage.cpp:368
+#: clientgui/AccountInfoPage.cpp:513
 msgid "Choose a &password:"
 msgstr "選擇密碼(&O):"
 
-#: clientgui/AccountInfoPage.cpp:340
+#: clientgui/AccountInfoPage.cpp:371
 msgid "C&onfirm password:"
 msgstr "密碼確認:(&O)"
 
-#: clientgui/AccountInfoPage.cpp:371
-msgid ""
-"Enter the username and password you used on\n"
-"the web site."
-msgstr "請輸入此網站的帳號名稱和密碼。"
-
-#: clientgui/AccountInfoPage.cpp:377
+#: clientgui/AccountInfoPage.cpp:395
 msgid "&Username:"
 msgstr "使用者名稱(&U):"
 
-#: clientgui/AccountInfoPage.cpp:399
-msgid ""
-"Enter the email address and password you used on\n"
-"the web site."
-msgstr "請輸入此網站的電子郵件地址和密碼。"
-
-#: clientgui/AccountInfoPage.cpp:405
+#: clientgui/AccountInfoPage.cpp:409
 msgid "&Email address:"
 msgstr "電子郵件地址:(&E)"
 
-#: clientgui/AccountInfoPage.cpp:412
+#: clientgui/AccountInfoPage.cpp:416
 #, c-format
 msgid "minimum length %d"
 msgstr "最小字元長度 %d"
 
-#: clientgui/AccountInfoPage.cpp:431
-#: clientgui/WelcomePage.cpp:304
+#: clientgui/AccountInfoPage.cpp:435
+#: clientgui/WelcomePage.cpp:314
 msgid "Attach to project"
 msgstr "加入專案"
 
-#: clientgui/AccountInfoPage.cpp:433
+#: clientgui/AccountInfoPage.cpp:437
 msgid "Update account manager"
 msgstr "更新帳號管理員"
 
-#: clientgui/AccountInfoPage.cpp:435
+#: clientgui/AccountInfoPage.cpp:439
 msgid "Attach to account manager"
 msgstr "加入帳號管理"
 
-#: clientgui/AccountInfoPage.cpp:446
+#: clientgui/AccountInfoPage.cpp:450
 #, c-format
-msgid "The minimum password length for this project is %d. Please choose a different password."
-msgstr "此專案所需的最小密碼長度為 %d。請輸入其他的密碼。"
+msgid "The minimum password length for this project is %d. Please enter a different password."
+msgstr "此專案所需的最小密碼長度為 %d，請輸入其他的密碼。"
 
-#: clientgui/AccountInfoPage.cpp:452
+#: clientgui/AccountInfoPage.cpp:456
 #, c-format
-msgid "The minimum password length for this account manager is %d. Please choose a different password."
-msgstr "此帳號管理所需的最小密碼長度為 %d。請輸入其他的密碼。"
+msgid "The minimum password length for this account manager is %d. Please enter a different password."
+msgstr "此帳號管理員所需的最小密碼長度為 %d，請輸入其他的密碼。"
 
-#: clientgui/AccountInfoPage.cpp:463
+#: clientgui/AccountInfoPage.cpp:467
 msgid "The password and confirmation password do not match. Please type them again."
 msgstr "「密碼」與「確認密碼」不相符。請再輸入一次。"
 
-#: clientgui/AccountKeyPage.cpp:217
+#: clientgui/AccountKeyPage.cpp:225
 msgid "Enter account key"
 msgstr "輸入帳號金鑰"
 
-#: clientgui/AccountKeyPage.cpp:220
+#: clientgui/AccountKeyPage.cpp:228
 msgid ""
 "This project uses an \"account key\" to identify you.\n"
 "\n"
@@ -112,74 +113,380 @@ msgstr ""
 "\n"
 "請前往專案網站建立新帳號。您的帳號金鑰會寄到您的信箱。"
 
-#: clientgui/AccountKeyPage.cpp:226
+#: clientgui/AccountKeyPage.cpp:234
 msgid "An account key looks like:"
 msgstr "帳號金鑰看起來像:"
 
-#: clientgui/AccountKeyPage.cpp:229
+#: clientgui/AccountKeyPage.cpp:237
 msgid "82412313ac88e9a3638f66ea82186948"
 msgstr "82412313ac88e9a3638f66ea82186948"
 
-#: clientgui/AccountKeyPage.cpp:232
+#: clientgui/AccountKeyPage.cpp:240
 msgid "Account key:"
 msgstr "帳號金鑰:"
 
-#: clientgui/AccountManagerInfoPage.cpp:167
+#: clientgui/AccountManagerInfoPage.cpp:175
 msgid "Account Manager URL"
 msgstr "帳號管理員網址"
 
-#: clientgui/AccountManagerInfoPage.cpp:170
+#: clientgui/AccountManagerInfoPage.cpp:178
 msgid "Enter the URL of the account manager's web site."
 msgstr "請輸入帳號管理網站的網址。"
 
-#: clientgui/AccountManagerInfoPage.cpp:173
-#: clientgui/ProjectInfoPage.cpp:229
-msgid "You can copy and paste the URL from your browser's address bar."
+#: clientgui/AccountManagerInfoPage.cpp:181
+#: clientgui/ProjectInfoPage.cpp:237
+msgid ""
+"You can copy and paste the URL from your browser's\n"
+"address bar."
 msgstr "您可以從瀏覽器的網址列複製網址後貼上。"
 
-#: clientgui/AccountManagerInfoPage.cpp:176
+#: clientgui/AccountManagerInfoPage.cpp:185
 msgid "Account Manager &URL:"
 msgstr "帳號管理員網址:(&U)"
 
-#: clientgui/AccountManagerInfoPage.cpp:179
+#: clientgui/AccountManagerInfoPage.cpp:188
 msgid "For a list of BOINC-based account managers go to:"
 msgstr "要取得所有基於 BOINC 的帳號管理員列表請至:"
 
-#: clientgui/AccountManagerProcessingPage.cpp:182
-#: clientgui/AccountManagerPropertiesPage.cpp:185
+#: clientgui/AccountManagerProcessingPage.cpp:190
+#: clientgui/AccountManagerPropertiesPage.cpp:191
 #, c-format
 msgid "Communicating with %s."
 msgstr "正在與 %s 通訊。"
 
-#: clientgui/AccountManagerProcessingPage.cpp:189
-#: clientgui/AccountManagerPropertiesPage.cpp:192
+#: clientgui/AccountManagerProcessingPage.cpp:197
+#: clientgui/AccountManagerPropertiesPage.cpp:198
 msgid "Communicating with server."
 msgstr "與伺服器通訊中。"
 
-#: clientgui/AccountManagerProcessingPage.cpp:194
-#: clientgui/AccountManagerPropertiesPage.cpp:197
+#: clientgui/AccountManagerProcessingPage.cpp:202
+#: clientgui/AccountManagerPropertiesPage.cpp:203
 msgid "Please wait..."
 msgstr "請稍候..."
 
-#: clientgui/AccountManagerProcessingPage.cpp:300
-#: clientgui/ProjectProcessingPage.cpp:472
-#: clientgui/ProjectProcessingPage.cpp:534
+#: clientgui/AccountManagerProcessingPage.cpp:313
+#: clientgui/ProjectProcessingPage.cpp:482
+#: clientgui/ProjectProcessingPage.cpp:540
 msgid "An internal server error has occurred.\n"
 msgstr "內部伺服器發生錯誤。\n"
 
-#: clientgui/AlreadyAttachedPage.cpp:174
+#: clientgui/AdvancedFrame.cpp:100
+msgid "Connected"
+msgstr "已連線"
+
+#: clientgui/AdvancedFrame.cpp:108
+msgid "Disconnected"
+msgstr "已斷線"
+
+#: clientgui/AdvancedFrame.cpp:310
+#: clientgui/sg_BoincSimpleGUI.cpp:103
+msgid "&Close Window\tCTRL+W"
+msgstr "關閉視窗(&C)\tCTRL+W"
+
+#: clientgui/AdvancedFrame.cpp:311
+#: clientgui/sg_BoincSimpleGUI.cpp:104
+msgid "Close BOINC Manager Window."
+msgstr "關閉 BOINC 管理員"
+
+#: clientgui/AdvancedFrame.cpp:317
+#, c-format
+msgid "Exit the %s"
+msgstr "離開 %s"
+
+#: clientgui/AdvancedFrame.cpp:322
+#: clientgui/BOINCTaskBar.cpp:614
+#: clientgui/mac/MacSysMenu.cpp:129
+msgid "E&xit"
+msgstr "離開(&X)"
+
+#: clientgui/AdvancedFrame.cpp:331
+msgid "&Simple View"
+msgstr "簡易檢視(&S)"
+
+#: clientgui/AdvancedFrame.cpp:332
+msgid "Display the simple BOINC graphical interface."
+msgstr "顯示精簡 BOINC 圖形介面。"
+
+#: clientgui/AdvancedFrame.cpp:341
+msgid "Attach to &project..."
+msgstr "加入專案(&P)"
+
+#: clientgui/AdvancedFrame.cpp:342
+msgid "Attach to a project"
+msgstr "加入專案"
+
+#: clientgui/AdvancedFrame.cpp:346
+msgid "Attach to &account manager..."
+msgstr "加入帳號管理(&A)..."
+
+#: clientgui/AdvancedFrame.cpp:347
+msgid "Attach to an account manager"
+msgstr "加入帳號管理"
+
+#: clientgui/AdvancedFrame.cpp:351
+#, c-format
+msgid "&Synchronize with %s"
+msgstr "與 %s 同步(&S)"
+
+#: clientgui/AdvancedFrame.cpp:355
+#, c-format
+msgid "Get current settings from %s"
+msgstr "從 %s 取得現在的設定"
+
+#: clientgui/AdvancedFrame.cpp:370
+msgid "&Run always"
+msgstr "持續執行(&R)"
+
+#: clientgui/AdvancedFrame.cpp:371
+msgid "Allow work regardless of preferences"
+msgstr "不管偏好設定運行工作"
+
+#: clientgui/AdvancedFrame.cpp:375
+msgid "Run based on &preferences"
+msgstr "以偏好設定執行(&P)"
+
+#: clientgui/AdvancedFrame.cpp:376
+msgid "Allow work according to your preferences"
+msgstr "依照您的偏好設定運行工作"
+
+#: clientgui/AdvancedFrame.cpp:380
+msgid "&Suspend"
+msgstr "暫止(&S)"
+
+#: clientgui/AdvancedFrame.cpp:381
+msgid "Stop work regardless of preferences"
+msgstr "不管偏好設定停止工作"
+
+#: clientgui/AdvancedFrame.cpp:397
+msgid "&Network activity always available"
+msgstr "持續進行網路活動(&N)"
+
+#: clientgui/AdvancedFrame.cpp:398
+msgid "Allow network activity regardless of preferences"
+msgstr "不管偏好設定進行網路活動"
+
+#: clientgui/AdvancedFrame.cpp:402
+msgid "Network activity based on &preferences"
+msgstr "以偏好設定連線網路(&P)"
+
+#: clientgui/AdvancedFrame.cpp:403
+msgid "Allow network activity according to your preferences"
+msgstr "依照您的偏好設定進行網路活動"
+
+#: clientgui/AdvancedFrame.cpp:407
+msgid "&Network activity suspended"
+msgstr "暫止網路活動(&N)"
+
+#: clientgui/AdvancedFrame.cpp:408
+msgid "Stop BOINC network activity"
+msgstr "停止 BONIC 的網路活動"
+
+#: clientgui/AdvancedFrame.cpp:415
+msgid "&Options..."
+msgstr "選項(&O)"
+
+#: clientgui/AdvancedFrame.cpp:416
+msgid "Configure GUI options and proxy settings"
+msgstr "GUI 組態選項和 Proxy 設定"
+
+#: clientgui/AdvancedFrame.cpp:421
+#, c-format
+msgid "Connect to another computer running %s"
+msgstr "連線到另一台運行 %s 的電腦"
+
+#: clientgui/AdvancedFrame.cpp:426
+msgid "Select computer..."
+msgstr "選擇電腦...(&S)"
+
+#: clientgui/AdvancedFrame.cpp:431
+msgid "Run CPU &benchmarks"
+msgstr "執行 CPU 效能測試(&B)"
+
+#: clientgui/AdvancedFrame.cpp:432
+msgid "Runs BOINC CPU benchmarks"
+msgstr "執行 BONIC 的 CPU 效能測試"
+
+#: clientgui/AdvancedFrame.cpp:436
+msgid "Retry &communications"
+msgstr "重試網路通訊(&C)"
+
+#: clientgui/AdvancedFrame.cpp:437
+msgid "Report completed work, get latest credit, get latest preferences, and possibly get more work."
+msgstr "回報所有已完成的工作，取得最新積分與偏好設定資訊且儘可能的取得工作。"
+
+#: clientgui/AdvancedFrame.cpp:442
+msgid "Read config file"
+msgstr "讀取設定檔"
+
+#: clientgui/AdvancedFrame.cpp:443
+msgid "Read configuration info from cc-config.xml."
+msgstr "從 cc-config.xml 讀取設定檔案。"
+
+#: clientgui/AdvancedFrame.cpp:447
+msgid "Read local prefs file"
+msgstr "讀取本機偏好設定"
+
+#: clientgui/AdvancedFrame.cpp:448
+msgid "Read preferences from global_prefs_override.xml."
+msgstr "從 global_prefs_override.xml 讀取偏好設定。"
+
+#: clientgui/AdvancedFrame.cpp:452
+#: clientgui/WelcomePage.cpp:322
+#, c-format
+msgid "&Defect from %s"
+msgstr "從 %s 退出(&D)"
+
+#: clientgui/AdvancedFrame.cpp:458
+msgid "Remove client from account manager control."
+msgstr "從帳號管理員控制中移除用戶端。"
+
+#: clientgui/AdvancedFrame.cpp:462
+msgid "Attach to &project"
+msgstr "加入專案(&A)"
+
+#: clientgui/AdvancedFrame.cpp:463
+msgid "Attach to a project to begin processing work"
+msgstr "加入專案以開始進行工作"
+
+#: clientgui/AdvancedFrame.cpp:474
+#: clientgui/sg_BoincSimpleGUI.cpp:113
+#, c-format
+msgid "&%s"
+msgstr "&%s"
+
+#: clientgui/AdvancedFrame.cpp:480
+#: clientgui/sg_BoincSimpleGUI.cpp:119
+#, c-format
+msgid "Show information about the %s"
+msgstr "顯示關於 %s 的資訊"
+
+#: clientgui/AdvancedFrame.cpp:492
+#: clientgui/sg_BoincSimpleGUI.cpp:131
+#, c-format
+msgid "%s &website"
+msgstr "%s 網站(&W)"
+
+#: clientgui/AdvancedFrame.cpp:498
+#: clientgui/sg_BoincSimpleGUI.cpp:137
+#, c-format
+msgid "Show information about BOINC and %s"
+msgstr "顯示關於 BONIC 及 %s 的資訊"
+
+#: clientgui/AdvancedFrame.cpp:514
+#: clientgui/BOINCTaskBar.cpp:604
+#, c-format
+msgid "&About %s..."
+msgstr "關於 %s...(&A)"
+
+#: clientgui/AdvancedFrame.cpp:520
+msgid "Licensing and copyright information."
+msgstr "授權與版權資訊。"
+
+#: clientgui/AdvancedFrame.cpp:527
+#: clientgui/sg_BoincSimpleGUI.cpp:160
+msgid "&File"
+msgstr "檔案(&F)"
+
+#: clientgui/AdvancedFrame.cpp:531
+msgid "&View"
+msgstr "檢視(&V)"
+
+#: clientgui/AdvancedFrame.cpp:535
+msgid "&Tools"
+msgstr "工具(&T)"
+
+#: clientgui/AdvancedFrame.cpp:539
+msgid "&Activity"
+msgstr "活動(&A)"
+
+#: clientgui/AdvancedFrame.cpp:543
+msgid "A&dvanced"
+msgstr "進階(&D)"
+
+#: clientgui/AdvancedFrame.cpp:547
+#: clientgui/sg_BoincSimpleGUI.cpp:150
+#: clientgui/wizardex.cpp:356
+#: clientgui/wizardex.cpp:363
+msgid "&Help"
+msgstr "說明(&H)"
+
+#: clientgui/AdvancedFrame.cpp:1169
+#, c-format
+msgid "BOINC Manager - Detach from %s"
+msgstr "BOINC 管理員 - 從 %s 退出"
+
+#: clientgui/AdvancedFrame.cpp:1173
+#, c-format
+msgid ""
+"If you defect from %s,\n"
+"you'll keep all your current projects,\n"
+"but you'll have to manage projects manually.\n"
+"\n"
+"Do you want to defect from %s?"
+msgstr ""
+"如果您從 %s 退出，你會保留所有目前的專案，\n"
+"但您必須手動管理專案。\n"
+"\n"
+"您要從 %s 退出嗎？"
+
+#: clientgui/AdvancedFrame.cpp:1223
+msgid "Attaching to project..."
+msgstr "正在加入專案..."
+
+#: clientgui/AdvancedFrame.cpp:1261
+msgid "Retrying communications for project(s)..."
+msgstr "重試與專案的通訊中..."
+
+#: clientgui/AdvancedFrame.cpp:1344
+#, c-format
+msgid "%s - Language Selection"
+msgstr "%s - 語言選擇"
+
+#: clientgui/AdvancedFrame.cpp:1351
+#, c-format
+msgid "The %s's default language has been changed, in order for this change to take affect you must restart the %s."
+msgstr "%s 預設的語言已改變。為了使變更生效， 您必須重新啟動 %s。"
+
+#: clientgui/AdvancedFrame.cpp:1560
+#: clientgui/DlgAbout.cpp:105
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: clientgui/AdvancedFrame.cpp:1569
+#, c-format
+msgid "%s has successfully attached to %s"
+msgstr "%s 已成功加入 %s 專案。"
+
+#: clientgui/AdvancedFrame.cpp:1694
+#: clientgui/AdvancedFrame.cpp:1697
+#, c-format
+msgid "%s - (%s)"
+msgstr "%s - (%s)"
+
+#: clientgui/AdvancedFrame.cpp:1695
+#, c-format
+msgid "Connecting to %s"
+msgstr "正在連線到 %s"
+
+#: clientgui/AdvancedFrame.cpp:1698
+#, c-format
+msgid "Connected to %s"
+msgstr "已連線到 %s"
+
+#: clientgui/AlreadyAttachedPage.cpp:182
 msgid "Already attached to project"
 msgstr "已加入專案"
 
-#: clientgui/AlreadyAttachedPage.cpp:177
+#: clientgui/AlreadyAttachedPage.cpp:185
 msgid "You are already attached to this project."
 msgstr "您已加入此專案。"
 
-#: clientgui/AlreadyExistsPage.cpp:177
+#: clientgui/AlreadyExistsPage.cpp:185
 msgid "Username already in use"
 msgstr "此帳號名稱已被使用"
 
-#: clientgui/AlreadyExistsPage.cpp:180
+#: clientgui/AlreadyExistsPage.cpp:188
 msgid ""
 "An account with that username already exists and has a\n"
 "different password than the one you entered.\n"
@@ -191,11 +498,11 @@ msgstr ""
 "\n"
 "請拜訪專案網站後，依照專案網站的指示操作。"
 
-#: clientgui/AlreadyExistsPage.cpp:187
+#: clientgui/AlreadyExistsPage.cpp:195
 msgid "Email address already in use"
 msgstr "此電子郵件地址已被使用"
 
-#: clientgui/AlreadyExistsPage.cpp:190
+#: clientgui/AlreadyExistsPage.cpp:198
 msgid ""
 "An account with that email address already exists and has a\n"
 "different password than the one you entered.\n"
@@ -207,16 +514,62 @@ msgstr ""
 "\n"
 "請拜訪專案網站後，依照專案網站的指示操作。"
 
-#: clientgui/BOINCBaseView.cpp:457
+#: clientgui/BOINCBaseFrame.cpp:346
+#, c-format
+msgid "%s - Connection Error"
+msgstr "%s - 連線錯誤"
+
+#: clientgui/BOINCBaseFrame.cpp:352
+msgid "The password you have provided is incorrect, please try again."
+msgstr "您提供的密碼不正確，請再試一遍。"
+
+#: clientgui/BOINCBaseFrame.cpp:375
+#, c-format
+msgid "%s - Connection Failed"
+msgstr "%s - 連線失敗"
+
+#: clientgui/BOINCBaseFrame.cpp:384
+#, c-format
+msgid ""
+"%s is not able to connect to a %s client.\n"
+"Would you like to try to connect again?"
+msgstr ""
+"%s 無法連線到 %s 用戶端。\n"
+"您要再試一次嗎？"
+
+#: clientgui/BOINCBaseFrame.cpp:417
+#, c-format
+msgid "%s - Connection Status"
+msgstr "%s - 連線狀態"
+
+#: clientgui/BOINCBaseFrame.cpp:428
+#, c-format
+msgid ""
+"%s is not currently connected to a %s client.\n"
+"Please use the 'Advanced\\Select Computer...' menu option to connect up to a %s client.\n"
+"To connect up to your local computer please use 'localhost' as the host name."
+msgstr ""
+"%s 目前未連線到 %s 用戶端。\n"
+"請選擇「檔案」>「選擇電腦...」來連到 %s 用戶端。\n"
+"要連線到本機電腦，請於主機名稱輸入「localhost」。"
+
+#: clientgui/BOINCBaseView.cpp:465
+#: clientgui/ViewProjectsGrid.cpp:517
+#: clientgui/ViewWorkGrid.cpp:436
 msgid "Web sites"
 msgstr "網站"
 
-#: clientgui/BOINCDialupManager.cpp:56
+#: clientgui/BOINCDialupManager.cpp:63
 #, c-format
 msgid "%s - Network Status"
 msgstr "%s - 網路狀態"
 
-#: clientgui/BOINCDialupManager.cpp:163
+#: clientgui/BOINCDialupManager.cpp:260
+#, c-format
+msgid "%s needs to connect to the Internet.  Please click to open %s."
+msgstr "%s 需要連線到網路，請按一下開啟 %s。"
+
+#: clientgui/BOINCDialupManager.cpp:268
 #, c-format
 msgid ""
 "%s is unable to communicate with a project and needs an Internet connection.\n"
@@ -225,24 +578,19 @@ msgstr ""
 "%s 無法與專案通訊，需要網路連線。\n"
 "請連線到網路後於「進階」選單中選擇「重試通訊」。"
 
-#: clientgui/BOINCDialupManager.cpp:297
-#, c-format
-msgid "%s needs a connection to the Internet to perform some maintenance, open the %s to connectup and perform the needed work."
-msgstr "%s 需要網路連線才可以進行某些維護動作。開啟 %s 連上網路後進行所需要的動作。"
-
-#: clientgui/BOINCDialupManager.cpp:339
+#: clientgui/BOINCDialupManager.cpp:314
 #, c-format
 msgid ""
 "%s needs to connect to the Internet.\n"
 "May it do so now?"
 msgstr "%s 需要連線到網路。您要現在連線嗎？"
 
-#: clientgui/BOINCDialupManager.cpp:352
+#: clientgui/BOINCDialupManager.cpp:327
 #, c-format
 msgid "%s is connecting to the Internet."
 msgstr "%s 正連線到網路。"
 
-#: clientgui/BOINCDialupManager.cpp:383
+#: clientgui/BOINCDialupManager.cpp:358
 #, c-format
 msgid ""
 "%s couldn't do Internet communication, and no default connection is selected.\n"
@@ -252,195 +600,148 @@ msgstr ""
 "%s 無法與網路通訊，沒有選擇預設的連線。\n"
 "請連線到網路後，於「進階」>「選項」>「連線」選擇預設連線。"
 
-#: clientgui/BOINCDialupManager.cpp:412
+#: clientgui/BOINCDialupManager.cpp:392
 #, c-format
 msgid "%s has successfully connected to the Internet."
 msgstr "%s 已成功與網路連線。"
 
-#: clientgui/BOINCDialupManager.cpp:437
+#: clientgui/BOINCDialupManager.cpp:420
 #, c-format
 msgid "%s failed to connect to the Internet."
 msgstr "%s 連線到網路失敗。"
 
-#: clientgui/BOINCDialupManager.cpp:473
+#: clientgui/BOINCDialupManager.cpp:461
 #, c-format
 msgid ""
 "%s has detected it is now connected to the Internet.\n"
 "Updating all projects and retrying all transfers."
 msgstr "%s 偵測到現在處於連線狀態。正在更新所有專案並重試所有檔案傳送。"
 
-#: clientgui/BOINCDialupManager.cpp:512
+#: clientgui/BOINCDialupManager.cpp:504
 #, c-format
 msgid "%s has successfully disconnected from the Internet."
 msgstr "%s 已成功從網路斷線。"
 
-#: clientgui/BOINCDialupManager.cpp:528
+#: clientgui/BOINCDialupManager.cpp:520
 #, c-format
 msgid "%s failed to disconnected from the Internet."
 msgstr "%s 從網路斷線失敗。"
 
-#: clientgui/BOINCGUIApp.cpp:148
+#: clientgui/BOINCGUIApp.cpp:195
+#, c-format
 msgid ""
-"Please provide the email address and password you used to register\n"
-"at GridRepublic. (if you have not yet created an account at\n"
-"GridRepublic, please do so at http://www.gridrepublic.org)"
+"BOINC ownership or permissions are not set properly; please reinstall BOINC.\n"
+"(Error code %d)"
 msgstr ""
-"請輸入於 GridRepublic 上註冊的電子郵件地址和密碼。\n"
-"(如果您尚未於 GirdRepublic 建立帳號，請前往 http://www.gridrepublic.org)"
+"BOINC 的所有權或權限未正確設定，請重新安裝 BOINC。\n"
+"(錯誤碼 %d)"
 
-#: clientgui/BOINCGUIApp.cpp:165
-msgid "Start Project"
-msgstr "開始專案"
-
-#: clientgui/BOINCGUIApp.cpp:168
-msgid ""
-"Please enter an email address and password. You will need your email\n"
-"address if you want to change your account options or use our message\n"
-"boards.\n"
-"\n"
-"We will send you occasional emails. You can stop these at any time.\n"
-"We will not pass your email address on to others."
-msgstr ""
-"請輸入電子郵件地址和密碼。\n"
-"如果您要變更帳號選項或使用留言板就需要電子郵件地址。\n"
-"\n"
-"我們偶爾會寄信給您，但您可以隨時停止。\n"
-"我們並不會將您的電子郵件地址給其他人。"
-
-#: clientgui/BOINCGUIApp.cpp:175
-msgid "Project Started"
-msgstr "專案已開始"
-
-#: clientgui/BOINCGUIApp.cpp:177
-msgid ""
-"Congratulations, you have now successfully started your Climate\n"
-"Change Experiment."
-msgstr "恭喜！您已成功開始您的氣候變遷實驗。"
-
-#: clientgui/BOINCGUIApp.cpp:180
-msgid ""
-"Click finish to exit. You will be taken to a web page which tells\n"
-"you more about your model."
-msgstr "按「完成」離開。您會啟動一個網頁告訴您有關您模型的更多資訊。"
-
-#: clientgui/BOINCGUIApp.cpp:187
-msgid ""
-"This will shut down your experiment until it restarts automatically\n"
-"following your user preferences. Close window to close the manager\n"
-"without stopping the experiment."
-msgstr ""
-"此操作將會停止您的實驗，直到根據您偏好設定自動重新開始。\n"
-"直接關閉視窗可以不停止實驗關閉管理員。"
-
-#: clientgui/BOINCGUIApp.cpp:491
+#: clientgui/BOINCGUIApp.cpp:382
 msgid "Startup BOINC so only the system tray icon is visible"
 msgstr "只以系統匣圖示啟動 BOINC"
 
-#: clientgui/BOINCGUIApp.cpp:551
+#: clientgui/BOINCGUIApp.cpp:383
+msgid "disable BOINC security users and permissions"
+msgstr "停用 BOINC 安全性使用者和權限"
+
+#: clientgui/BOINCGUIApp.cpp:446
 msgid "(Automatic Detection)"
 msgstr "(自動偵測)"
 
-#: clientgui/BOINCGUIApp.cpp:552
+#: clientgui/BOINCGUIApp.cpp:447
 msgid "(Unknown)"
 msgstr "(未知的語言)"
 
-#: clientgui/BOINCGUIApp.cpp:553
+#: clientgui/BOINCGUIApp.cpp:448
 msgid "(User Defined)"
 msgstr "(使用者定義)"
 
-#: clientgui/BOINCTaskBar.cpp:318
+#: clientgui/BOINCGUIApp.cpp:1036
+#, c-format
+msgid "%s - Exit Confirmation"
+msgstr "%s - 關閉確認視窗"
+
+#: clientgui/BOINCTaskBar.cpp:338
 #, c-format
 msgid "%s is currently suspended...\n"
 msgstr "%s 目前已暫止...\n"
 
-#: clientgui/BOINCTaskBar.cpp:329
+#: clientgui/BOINCTaskBar.cpp:350
 #, c-format
 msgid "%s networking is currently suspended...\n"
 msgstr "%s 網路活動目前已暫止...\n"
 
-#: clientgui/BOINCTaskBar.cpp:369
+#: clientgui/BOINCTaskBar.cpp:390
 #, c-format
 msgid "%s is currently reconnecting to a %s client...\n"
 msgstr "%s 正重新連線到 %s 用戶端...\n"
 
-#: clientgui/BOINCTaskBar.cpp:381
+#: clientgui/BOINCTaskBar.cpp:402
 #, c-format
 msgid "%s is not currently connected to a %s client...\n"
 msgstr "%s 目前未連線到 %s 用戶端...\n"
 
-#: clientgui/BOINCTaskBar.cpp:469
-#: clientgui/MainFrame.cpp:348
-#: clientgui/mac/MacSysMenu.cpp:69
-msgid "E&xit"
-msgstr "離開(&X)"
-
-#: clientgui/BOINCTaskBar.cpp:512
+#: clientgui/BOINCTaskBar.cpp:585
 #, c-format
 msgid "Open %s Web..."
 msgstr "開啟 %s 網站..."
 
-#: clientgui/BOINCTaskBar.cpp:519
+#: clientgui/BOINCTaskBar.cpp:592
 #, c-format
 msgid "Open %s..."
 msgstr "開啟 %s..."
 
-#: clientgui/BOINCTaskBar.cpp:524
+#: clientgui/BOINCTaskBar.cpp:599
 msgid "Snooze"
 msgstr "稍後通知"
 
-#: clientgui/BOINCTaskBar.cpp:527
-#: clientgui/MainFrame.cpp:510
-#, c-format
-msgid "&About %s..."
-msgstr "關於 %s...(&A)"
-
-#: clientgui/CompletionErrorPage.cpp:194
+#: clientgui/CompletionErrorPage.cpp:202
 msgid "Failed to attach to project"
 msgstr "加入專案失敗"
 
-#: clientgui/CompletionErrorPage.cpp:199
+#: clientgui/CompletionErrorPage.cpp:207
 msgid "Failed to update account manager"
 msgstr "更新帳號管理員失敗"
 
-#: clientgui/CompletionErrorPage.cpp:203
+#: clientgui/CompletionErrorPage.cpp:211
 msgid "Failed to remove account manager"
 msgstr "移除帳號管理員失敗"
 
-#: clientgui/CompletionErrorPage.cpp:207
+#: clientgui/CompletionErrorPage.cpp:215
 msgid "Failed to attach to account manager"
 msgstr "加入帳號管理失敗"
 
-#: clientgui/CompletionErrorPage.cpp:216
+#: clientgui/CompletionErrorPage.cpp:224
 msgid ""
-"An error has occurred, please check the messages tab for further\n"
-"details.\n"
+"An error has occurred;\n"
+"check Messages for details.\n"
 "\n"
 "Click Finish to close."
 msgstr ""
 "發生錯誤，請檢查訊息分頁取得詳細資訊。\n"
 "按「完成」關閉視窗。"
 
-#: clientgui/CompletionErrorPage.cpp:223
-#: clientgui/CompletionPage.cpp:229
-#: clientgui/CompletionPage.cpp:253
-#: clientgui/CompletionPage.cpp:274
-#: clientgui/CompletionPage.cpp:325
+#: clientgui/CompletionErrorPage.cpp:231
+#: clientgui/CompletionPage.cpp:223
+#: clientgui/CompletionPage.cpp:246
+#: clientgui/CompletionPage.cpp:267
+#: clientgui/CompletionPage.cpp:316
 msgid "Click Finish to close."
 msgstr "按「完成」關閉此視窗。"
 
-#: clientgui/CompletionErrorPage.cpp:232
+#: clientgui/CompletionErrorPage.cpp:240
 msgid "Messages from server:"
 msgstr "伺服器傳來的訊息:"
 
-#: clientgui/CompletionPage.cpp:198
+#: clientgui/CompletionPage.cpp:207
 msgid "Attached to project"
 msgstr "已加入專案"
 
-#: clientgui/CompletionPage.cpp:210
+#: clientgui/CompletionPage.cpp:213
 msgid "You are now successfully attached to this project."
 msgstr "您已成功加入此專案。"
 
-#: clientgui/CompletionPage.cpp:222
+#: clientgui/CompletionPage.cpp:218
 msgid ""
 "When you click Finish, your web browser will go to a page where\n"
 "you can set your account name and preferences."
@@ -448,76 +749,65 @@ msgstr ""
 "當您按下「完成」後，程式將會啟動瀏覽器並前往設定\n"
 "帳號名稱與偏好設定的網頁。"
 
-#: clientgui/CompletionPage.cpp:243
+#: clientgui/CompletionPage.cpp:236
 #, c-format
 msgid "Update from %s completed."
 msgstr "從 %s 更新已完成。"
 
-#: clientgui/CompletionPage.cpp:247
+#: clientgui/CompletionPage.cpp:240
 msgid "Update completed."
 msgstr "更新已完成。"
 
-#: clientgui/CompletionPage.cpp:264
+#: clientgui/CompletionPage.cpp:257
 #, c-format
 msgid "Removal from %s completed."
 msgstr "從 %s 移除已完成。"
 
-#: clientgui/CompletionPage.cpp:268
+#: clientgui/CompletionPage.cpp:261
 msgid "Removal succeeded!"
 msgstr "成功移除！"
 
-#: clientgui/CompletionPage.cpp:285
+#: clientgui/CompletionPage.cpp:278
 #, c-format
 msgid "Attached to %s"
 msgstr "已加入 %s"
 
-#: clientgui/CompletionPage.cpp:289
+#: clientgui/CompletionPage.cpp:282
 msgid "Attached to account manager"
 msgstr "加入帳號管理"
 
-#: clientgui/CompletionPage.cpp:299
+#: clientgui/CompletionPage.cpp:292
 #, c-format
 msgid "Welcome to %s!"
 msgstr "歡迎加入 %s！"
 
-#: clientgui/CompletionPage.cpp:313
+#: clientgui/CompletionPage.cpp:306
 #, c-format
-msgid ""
-"You are now successfully attached to the %s system.\n"
-"%s"
-msgstr ""
-"您已成功加入 %s 系統。\n"
-"%s"
+msgid "You are now successfully attached to the %s system."
+msgstr "您已成功加入 %s 系統。"
 
-#: clientgui/CompletionPage.cpp:319
+#: clientgui/CompletionPage.cpp:310
 msgid "You are now successfully attached to this account manager."
 msgstr "您已成功加入此帳號管理員。"
 
-#: clientgui/DlgAbout.cpp:92
+#: clientgui/DlgAbout.cpp:99
 #, c-format
 msgid "About %s"
 msgstr "中止 %s"
 
-#: clientgui/DlgAbout.cpp:98
-#, c-format
-msgid "%s"
-msgstr "%s"
-
-#: clientgui/DlgAbout.cpp:136
-#: clientgui/WizardAccountManager.cpp:130
-#: clientgui/WizardAttachProject.cpp:141
+#: clientgui/DlgAbout.cpp:137
 msgid "BOINC Manager"
 msgstr "BOINC 管理員"
 
-#: clientgui/DlgAbout.cpp:155
+#: clientgui/DlgAbout.cpp:156
 msgid "Version:"
 msgstr "版本:"
 
-#: clientgui/DlgAbout.cpp:163
+#: clientgui/DlgAbout.cpp:164
 msgid "Copyright:"
 msgstr "Copyright:"
 
-#: clientgui/DlgAbout.cpp:167
+#: clientgui/DlgAbout.cpp:168
 msgid ""
 "(C) 2003-2006 University of California at Berkeley.\n"
 "All Rights Reserved."
@@ -525,132 +815,125 @@ msgstr ""
 "(C) 2003-2006 University of California at Berkeley.\n"
 "All Rights Reserved."
 
-#: clientgui/DlgAbout.cpp:171
+#: clientgui/DlgAbout.cpp:172
 msgid "Berkeley Open Infrastructure for Network Computing"
 msgstr "柏克萊開放式網路運算平台"
 
-#: clientgui/DlgAbout.cpp:175
+#: clientgui/DlgAbout.cpp:176
 msgid "A software platform for distributed computing using volunteered computer resources"
 msgstr "自願者提供的電腦資源所用的分散式運算平台"
 
-#: clientgui/DlgAbout.cpp:187
-#: clientgui/DlgDialupCredentials.cpp:136
+#: clientgui/DlgAbout.cpp:188
 #: clientgui/DlgGenericMessage.cpp:122
-#: clientgui/DlgOptions.cpp:324
+#: clientgui/DlgOptions.cpp:320
 #: clientgui/DlgSelectComputer.cpp:133
 msgid "&OK"
 msgstr "確定(&O)"
 
-#: clientgui/DlgDialupCredentials.cpp:111
-msgid "Username:"
-msgstr "使用者名稱:"
-
-#: clientgui/DlgDialupCredentials.cpp:122
-#: clientgui/DlgOptions.cpp:253
-#: clientgui/DlgOptions.cpp:309
-#: clientgui/DlgSelectComputer.cpp:122
-#: clientgui/ProxyPage.cpp:344
-#: clientgui/ProxyPage.cpp:364
-msgid "Password:"
-msgstr "密碼:"
-
-#: clientgui/DlgDialupCredentials.cpp:141
-#: clientgui/DlgGenericMessage.cpp:127
-#: clientgui/DlgOptions.cpp:329
-#: clientgui/DlgSelectComputer.cpp:138
-#: clientgui/wizardex.cpp:360
-msgid "&Cancel"
-msgstr "取消(&C)"
-
 #: clientgui/DlgGenericMessage.cpp:114
 msgid "Click here to disable displaying this message in the future."
 msgstr "按一下這裡以後不要顯示此訊息。"
 
-#: clientgui/DlgOptions.cpp:142
+#: clientgui/DlgGenericMessage.cpp:127
+#: clientgui/DlgOptions.cpp:325
+#: clientgui/DlgSelectComputer.cpp:138
+#: clientgui/wizardex.cpp:360
+msgid "&Cancel"
+msgstr "取消(&C)"
+
+#: clientgui/DlgOptions.cpp:138
 msgid "Language Selection:"
 msgstr "語言選擇:"
 
-#: clientgui/DlgOptions.cpp:149
+#: clientgui/DlgOptions.cpp:145
 msgid "What language should the manager display by default."
 msgstr "預設要使用何種語言顯示。"
 
-#: clientgui/DlgOptions.cpp:153
+#: clientgui/DlgOptions.cpp:149
 msgid "Reminder Frequency:"
 msgstr "提示頻率:"
 
-#: clientgui/DlgOptions.cpp:159
+#: clientgui/DlgOptions.cpp:155
 msgid "How often, in minutes, should the manager remind you of possible connection events."
 msgstr "設定 BOINC 管理員要隔多久才提示您重要訊息。(以分鐘計)"
 
-#: clientgui/DlgOptions.cpp:162
+#: clientgui/DlgOptions.cpp:158
 msgid "General"
 msgstr "一般"
 
-#: clientgui/DlgOptions.cpp:170
+#: clientgui/DlgOptions.cpp:166
 msgid "Dial-up and Virtual Private Network settings"
 msgstr "撥接與虛擬私人網路(VPN) 設定"
 
-#: clientgui/DlgOptions.cpp:184
+#: clientgui/DlgOptions.cpp:180
 msgid "&Set Default"
 msgstr "設為預設值(&S)"
 
-#: clientgui/DlgOptions.cpp:189
+#: clientgui/DlgOptions.cpp:185
 msgid "&Clear Default"
 msgstr "清除預設值(&C)"
 
-#: clientgui/DlgOptions.cpp:196
+#: clientgui/DlgOptions.cpp:192
 msgid "Default Connection:"
 msgstr "預設連線:"
 
-#: clientgui/DlgOptions.cpp:203
+#: clientgui/DlgOptions.cpp:199
 msgid "Connections"
 msgstr "連線"
 
-#: clientgui/DlgOptions.cpp:212
+#: clientgui/DlgOptions.cpp:208
 msgid "Connect via HTTP proxy server"
 msgstr "經由 HTTP Proxy 伺服器連線"
 
-#: clientgui/DlgOptions.cpp:216
+#: clientgui/DlgOptions.cpp:212
 msgid "HTTP Proxy Server Configuration"
 msgstr "HTTP Proxy 伺服器組態設定"
 
-#: clientgui/DlgOptions.cpp:224
-#: clientgui/DlgOptions.cpp:280
+#: clientgui/DlgOptions.cpp:220
+#: clientgui/DlgOptions.cpp:276
 msgid "Address:"
 msgstr "位址:"
 
-#: clientgui/DlgOptions.cpp:232
-#: clientgui/DlgOptions.cpp:288
-#: clientgui/ProxyPage.cpp:338
-#: clientgui/ProxyPage.cpp:358
+#: clientgui/DlgOptions.cpp:228
+#: clientgui/DlgOptions.cpp:284
+#: clientgui/ProxyPage.cpp:346
+#: clientgui/ProxyPage.cpp:366
 msgid "Port:"
 msgstr "埠:"
 
-#: clientgui/DlgOptions.cpp:239
-#: clientgui/DlgOptions.cpp:295
+#: clientgui/DlgOptions.cpp:235
+#: clientgui/DlgOptions.cpp:291
 msgid "Leave these blank if not needed"
 msgstr "如不需要請留空"
 
-#: clientgui/DlgOptions.cpp:245
-#: clientgui/DlgOptions.cpp:301
-#: clientgui/ProxyPage.cpp:341
-#: clientgui/ProxyPage.cpp:361
+#: clientgui/DlgOptions.cpp:241
+#: clientgui/DlgOptions.cpp:297
+#: clientgui/ProxyPage.cpp:349
+#: clientgui/ProxyPage.cpp:369
 msgid "User Name:"
 msgstr "使用者名稱:"
 
-#: clientgui/DlgOptions.cpp:260
+#: clientgui/DlgOptions.cpp:249
+#: clientgui/DlgOptions.cpp:305
+#: clientgui/DlgSelectComputer.cpp:122
+#: clientgui/ProxyPage.cpp:352
+#: clientgui/ProxyPage.cpp:372
+msgid "Password:"
+msgstr "密碼:"
+
+#: clientgui/DlgOptions.cpp:256
 msgid "HTTP Proxy"
 msgstr "HTTP Proxy"
 
-#: clientgui/DlgOptions.cpp:268
+#: clientgui/DlgOptions.cpp:264
 msgid "Connect via SOCKS proxy server"
 msgstr "經由 SOCKS Proxy 伺服器連線"
 
-#: clientgui/DlgOptions.cpp:272
+#: clientgui/DlgOptions.cpp:268
 msgid "SOCKS Proxy Server Configuration"
 msgstr "SOCKS Proxy 伺服器組態設定"
 
-#: clientgui/DlgOptions.cpp:316
+#: clientgui/DlgOptions.cpp:312
 msgid "SOCKS Proxy"
 msgstr "SOCKS Proxy"
 
@@ -658,12 +941,12 @@ msgstr "SOCKS Proxy"
 msgid "Host name:"
 msgstr "主機名稱:"
 
-#: clientgui/hyperlink.cpp:207
+#: clientgui/hyperlink.cpp:181
 #, c-format
 msgid "%s - Can't find web browser"
 msgstr "%s - 找不到瀏覽器"
 
-#: clientgui/hyperlink.cpp:218
+#: clientgui/hyperlink.cpp:192
 #, c-format
 msgid ""
 "%s tried to display the web page\n"
@@ -814,7 +1097,9 @@ msgstr "GEO-600 專案首頁"
 
 #: clientgui/Localization.cpp:117
 #: clientgui/Localization.cpp:135
-#: clientgui/ViewProjects.cpp:152
+#: clientgui/ViewProjects.cpp:155
+#: clientgui/ViewProjectsGrid.cpp:164
+#: clientgui/ViewStatistics.cpp:400
 msgid "Team"
 msgstr "團隊"
 
@@ -878,313 +1163,27 @@ msgstr "研究"
 msgid "Learn about the projects hosted at World Community Grid"
 msgstr "於 World Community Grid 學習更多有關此專案資訊"
 
-#: clientgui/MainDocument.cpp:328
+#: clientgui/MainDocument.cpp:318
 msgid "Retrieving system state; please wait..."
 msgstr "取回系統狀態中；請稍候..."
 
-#: clientgui/MainDocument.cpp:337
+#: clientgui/MainDocument.cpp:326
 msgid "Retrieving host information; please wait..."
 msgstr "取回主機資訊中；請稍候..."
 
-#: clientgui/MainFrame.cpp:89
-msgid "Connected"
-msgstr "已連線"
-
-#: clientgui/MainFrame.cpp:97
-msgid "Disconnected"
-msgstr "已斷線"
-
-#: clientgui/MainFrame.cpp:343
-#, c-format
-msgid "Exit the %s"
-msgstr "離開 %s"
-
-#: clientgui/MainFrame.cpp:358
-#: clientgui/MainFrame.cpp:460
-msgid "Attach to &project"
-msgstr "加入專案(&A)"
-
-#: clientgui/MainFrame.cpp:359
-msgid "Attach to a project"
-msgstr "加入專案"
-
-#: clientgui/MainFrame.cpp:363
-msgid "&Account manager"
-msgstr "帳號管理(&A)"
-
-#: clientgui/MainFrame.cpp:364
-msgid "Attach to an account manager"
-msgstr "加入帳號管理"
-
-#: clientgui/MainFrame.cpp:368
-#, c-format
-msgid "&Synchronize with %s"
-msgstr "與 %s 同步(&S)"
-
-#: clientgui/MainFrame.cpp:372
-#, c-format
-msgid "Get current settings from %s"
-msgstr "從 %s 取得現在的設定"
-
-#: clientgui/MainFrame.cpp:387
-msgid "&Run always"
-msgstr "持續執行(&R)"
-
-#: clientgui/MainFrame.cpp:388
-msgid "Allow work regardless of preferences"
-msgstr "不管偏好設定運行工作"
-
-#: clientgui/MainFrame.cpp:392
-msgid "Run based on &preferences"
-msgstr "以偏好設定執行(&P)"
-
-#: clientgui/MainFrame.cpp:393
-msgid "Allow work according to your preferences"
-msgstr "依照您的偏好設定運行工作"
-
-#: clientgui/MainFrame.cpp:397
-msgid "&Suspend"
-msgstr "暫止(&S)"
-
-#: clientgui/MainFrame.cpp:398
-msgid "Stop work regardless of preferences"
-msgstr "不管偏好設定停止工作"
-
-#: clientgui/MainFrame.cpp:405
-msgid "&Network activity always available"
-msgstr "持續進行網路活動(&N)"
-
-#: clientgui/MainFrame.cpp:406
-msgid "Allow network activity regardless of preferences"
-msgstr "不管偏好設定進行網路活動"
-
-#: clientgui/MainFrame.cpp:410
-msgid "Network activity based on &preferences"
-msgstr "以偏好設定連線網路(&P)"
-
-#: clientgui/MainFrame.cpp:411
-msgid "Allow network activity according to your preferences"
-msgstr "依照您的偏好設定進行網路活動"
-
-#: clientgui/MainFrame.cpp:415
-msgid "&Network activity suspended"
-msgstr "暫止網路活動(&N)"
-
-#: clientgui/MainFrame.cpp:416
-msgid "Stop BOINC network activity"
-msgstr "停止 BONIC 的網路活動"
-
-#: clientgui/MainFrame.cpp:423
-msgid "&Options"
-msgstr "選項(&O)"
-
-#: clientgui/MainFrame.cpp:424
-msgid "Configure GUI options and proxy settings"
-msgstr "GUI 組態選項和 Proxy 設定"
-
-#: clientgui/MainFrame.cpp:429
-#, c-format
-msgid "Connect to another computer running %s"
-msgstr "連線到另一台運行 %s 的電腦"
-
-#: clientgui/MainFrame.cpp:434
-msgid "Select computer..."
-msgstr "選擇電腦...(&S)"
-
-#: clientgui/MainFrame.cpp:439
-msgid "Run CPU &benchmarks"
-msgstr "執行 CPU 效能測試(&B)"
-
-#: clientgui/MainFrame.cpp:440
-msgid "Runs BOINC CPU benchmarks"
-msgstr "執行 BONIC 的 CPU 效能測試"
-
-#: clientgui/MainFrame.cpp:444
-msgid "Retry &communications"
-msgstr "重試網路通訊(&C)"
-
-#: clientgui/MainFrame.cpp:445
-msgid "Report completed work, get latest credit, get latest preferences, and possibly get more work."
-msgstr "回報所有已完成的工作，取得最新積分與偏好設定資訊且儘可能的取得工作。"
-
-#: clientgui/MainFrame.cpp:450
-#: clientgui/WelcomePage.cpp:311
-#, c-format
-msgid "&Defect from %s"
-msgstr "從 %s 退出(&D)"
-
-#: clientgui/MainFrame.cpp:456
-msgid "Remove client from account manager control."
-msgstr "從帳號管理員控制中移除用戶端。"
-
-#: clientgui/MainFrame.cpp:461
-msgid "Attach to a project to begin processing work"
-msgstr "加入專案以開始進行工作"
-
-#: clientgui/MainFrame.cpp:472
-#, c-format
-msgid "&%s\tF1"
-msgstr "&%s\tF1"
-
-#: clientgui/MainFrame.cpp:478
-#, c-format
-msgid "Show information about the %s"
-msgstr "顯示關於 %s 的資訊"
-
-#: clientgui/MainFrame.cpp:490
-#, c-format
-msgid "%s &website"
-msgstr "%s 網站(&W)"
-
-#: clientgui/MainFrame.cpp:496
-#, c-format
-msgid "Show information about BOINC and %s"
-msgstr "顯示關於 BONIC 及 %s 的資訊"
-
-#: clientgui/MainFrame.cpp:516
-msgid "Licensing and copyright information."
-msgstr "授權與版權資訊。"
-
-#: clientgui/MainFrame.cpp:529
-msgid "&File"
-msgstr "檔案(&F)"
-
-#: clientgui/MainFrame.cpp:533
-msgid "&Tools"
-msgstr "工具(&T)"
-
-#: clientgui/MainFrame.cpp:537
-msgid "&Activity"
-msgstr "活動(&A)"
-
-#: clientgui/MainFrame.cpp:541
-msgid "A&dvanced"
-msgstr "進階(&D)"
-
-#: clientgui/MainFrame.cpp:545
-#: clientgui/wizardex.cpp:356
-#: clientgui/wizardex.cpp:363
-msgid "&Help"
-msgstr "說明(&H)"
-
-#: clientgui/MainFrame.cpp:1086
-msgid ""
-"This will shut down your tasks until it restarts automatically\n"
-"following your user preferences. Close window to close the manager\n"
-"without stopping the tasks."
-msgstr ""
-"此操作將會停止您的工作，直到根據您偏好設定自動重新開始。\n"
-"直接關閉視窗可以不停止工作關閉管理員。"
-
-#: clientgui/MainFrame.cpp:1091
-msgid "Close Confirmation"
-msgstr "關閉確認視窗"
-
-#: clientgui/MainFrame.cpp:1222
-#, c-format
-msgid "BOINC Manager - Detach from %s"
-msgstr "BOINC 管理員 - 從 %s 退出"
-
-#: clientgui/MainFrame.cpp:1226
-#, c-format
-msgid ""
-"If you defect from %s,\n"
-"you'll keep all your current projects,\n"
-"but you'll have to manage projects manually.\n"
-"\n"
-"Do you want to defect from %s?"
-msgstr ""
-"如果您從 %s 退出，你會保留所有目前的專案，\n"
-"但您必須手動管理專案。\n"
-"\n"
-"您要從 %s 退出嗎？"
-
-#: clientgui/MainFrame.cpp:1278
-msgid "Attaching to project..."
-msgstr "正在加入專案..."
-
-#: clientgui/MainFrame.cpp:1320
-msgid "Retrying communications for project(s)..."
-msgstr "重試與專案的通訊中..."
-
-#: clientgui/MainFrame.cpp:1403
-#, c-format
-msgid "%s - Language Selection"
-msgstr "%s - 語言選擇"
-
-#: clientgui/MainFrame.cpp:1410
-#, c-format
-msgid "The %s's default language has been changed, in order for this change to take affect you must restart the %s."
-msgstr "%s 預設的語言已改變。為了使變更生效， 您必須重新啟動 %s。"
-
-#: clientgui/MainFrame.cpp:1895
-#: clientgui/MainFrame.cpp:1898
-#, c-format
-msgid "%s - (%s)"
-msgstr "%s - (%s)"
-
-#: clientgui/MainFrame.cpp:1896
-#, c-format
-msgid "Connecting to %s"
-msgstr "正在連線到 %s"
-
-#: clientgui/MainFrame.cpp:1899
-#, c-format
-msgid "Connected to %s"
-msgstr "已連線到 %s"
-
-#: clientgui/MainFrame.cpp:2064
-#, c-format
-msgid "%s - Connection Error"
-msgstr "%s - 連線錯誤"
-
-#: clientgui/MainFrame.cpp:2070
-msgid "The password you have provided is incorrect, please try again."
-msgstr "您提供的密碼不正確，請再試一遍。"
-
-#: clientgui/MainFrame.cpp:2087
-#, c-format
-msgid "%s - Connection Failed"
-msgstr "%s - 連線失敗"
-
-#: clientgui/MainFrame.cpp:2096
-#, c-format
-msgid ""
-"%s is not able to connect to a %s client.\n"
-"Would you like to try to connect again?"
-msgstr ""
-"%s 無法連線到 %s 用戶端。\n"
-"您要再試一次嗎？"
-
-#: clientgui/MainFrame.cpp:2123
-#, c-format
-msgid "%s - Connection Status"
-msgstr "%s - 連線狀態"
-
-#: clientgui/MainFrame.cpp:2134
-#, c-format
-msgid ""
-"%s is not currently connected to a %s client.\n"
-"Please use the 'File\\Select Computer...' menu option to connect up to a %s client.\n"
-"To connect up to your local computer please use 'localhost' as the host name."
-msgstr ""
-"%s 目前未連線到 %s 用戶端。\n"
-"請選擇「檔案」>「選擇電腦...」來連到 %s 用戶端。\n"
-"要連線到本機電腦，請於主機名稱輸入「localhost」。"
-
-#: clientgui/NoInternetConnectionPage.cpp:174
+#: clientgui/NoInternetConnectionPage.cpp:182
 msgid "No Internet connection"
 msgstr "無網路連線"
 
-#: clientgui/NoInternetConnectionPage.cpp:177
+#: clientgui/NoInternetConnectionPage.cpp:185
 msgid "Please connect to the Internet and try again."
 msgstr "請連線到網路後再試一次。"
 
-#: clientgui/NotDetectedPage.cpp:176
+#: clientgui/NotDetectedPage.cpp:184
 msgid "Project not found"
 msgstr "找不到專案"
 
-#: clientgui/NotDetectedPage.cpp:179
+#: clientgui/NotDetectedPage.cpp:187
 msgid ""
 "The URL you supplied is not that of a BOINC-based project.\n"
 "\n"
@@ -1193,11 +1192,11 @@ msgstr ""
 "您所輸入的網址並非基於 BOINC 的專案網站。\n"
 "請檢查網址後再試一次。"
 
-#: clientgui/NotDetectedPage.cpp:185
+#: clientgui/NotDetectedPage.cpp:193
 msgid "Account manager not found"
 msgstr "找不到帳號管理"
 
-#: clientgui/NotDetectedPage.cpp:188
+#: clientgui/NotDetectedPage.cpp:196
 msgid ""
 "The URL you supplied is not that of a BOINC-based account\n"
 "manager.\n"
@@ -1207,35 +1206,35 @@ msgstr ""
 "您所輸入的網址並非基於 BOINC 的帳號管理員。\n"
 "請檢查網址後再試一次。"
 
-#: clientgui/NotFoundPage.cpp:176
-msgid "Account not found"
-msgstr "找不到帳號"
+#: clientgui/NotFoundPage.cpp:184
+msgid "Login Failed."
+msgstr "登入失敗。"
 
-#: clientgui/NotFoundPage.cpp:180
+#: clientgui/NotFoundPage.cpp:188
 msgid "Check the username and password, and try again."
 msgstr "請檢查您的帳號名稱和密碼後再試一次。"
 
-#: clientgui/NotFoundPage.cpp:184
+#: clientgui/NotFoundPage.cpp:192
 msgid "Check the email address and password, and try again."
 msgstr "請檢查您的電子郵件地址和密碼後再試一次。"
 
-#: clientgui/ProjectInfoPage.cpp:223
+#: clientgui/ProjectInfoPage.cpp:231
 msgid "Project URL"
 msgstr "專案網址"
 
-#: clientgui/ProjectInfoPage.cpp:226
+#: clientgui/ProjectInfoPage.cpp:234
 msgid "Enter the URL of the project's web site."
 msgstr "請輸入專案網頁的網址。"
 
-#: clientgui/ProjectInfoPage.cpp:232
+#: clientgui/ProjectInfoPage.cpp:241
 msgid "Project &URL:"
 msgstr "專案網址:(&U)"
 
-#: clientgui/ProjectInfoPage.cpp:235
+#: clientgui/ProjectInfoPage.cpp:244
 msgid "For a list of BOINC-based projects go to:"
 msgstr "要取得所有基於 BOINC 的專案列表請至:"
 
-#: clientgui/ProjectProcessingPage.cpp:318
+#: clientgui/ProjectProcessingPage.cpp:326
 #: clientgui/ProjectPropertiesPage.cpp:327
 msgid ""
 "Communicating with project\n"
@@ -1244,7 +1243,7 @@ msgstr ""
 "與專案通訊中\n"
 "請稍候..."
 
-#: clientgui/ProjectProcessingPage.cpp:468
+#: clientgui/ProjectProcessingPage.cpp:478
 msgid ""
 "Required wizard file(s) are missing from the target server.\n"
 "(lookup_account.php/create_account.php)\n"
@@ -1252,64 +1251,458 @@ msgstr ""
 "此目標伺服器必須的 wizard 檔案遺失。\n"
 "(lookup_account.php/create_account.php)\n"
 
-#: clientgui/ProxyInfoPage.cpp:190
+#: clientgui/ProxyInfoPage.cpp:198
 msgid "Network communication failure"
 msgstr "網路通訊失敗"
 
-#: clientgui/ProxyInfoPage.cpp:193
+#: clientgui/ProxyInfoPage.cpp:201
 msgid ""
 "BOINC failed to communicate on the Internet. The most likely\n"
 "reasons are:\n"
 "\n"
-"1) Connectivity problem.  Please check your network or modem\n"
-"connection and hit the back button to retry the previous\n"
-"operation.\n"
+"1) Connectivity problem.  Check your network\n"
+"or modem connection and click Back to try again.\n"
 "\n"
-"2) Personal firewall software is blocking BOINC. You must\n"
-"configure your personal firewall to let BOINC communicate\n"
-"on port 80. Once this is fixed, click Back to try again.\n"
+"2) Personal firewall software is blocking BOINC.\n"
+"Configure your personal firewall to let BOINC\n"
+"communicate on port 80, then click Back to try again.\n"
 "\n"
-"3) You are using a proxy server and BOINC needs to know\n"
-"about it."
+"3) You are using a proxy server.\n"
+"Click Next to configure BOINC's proxy settings."
 msgstr ""
 "BOINC 與網路通訊失敗。可能有幾個原因:\n"
 "\n"
 "1) 通訊問題。\n"
 "請檢查您的網路或數據機連接後按「上一步」鈕重試剛剛的操作。\n"
 "2) 防火牆軟體阻擋了 BOINC 的連線。\n"
-"請設定您的防火牆讓 BOINC 能存取 port 80。此問題修復後，按「上一步」重試。\n"
-"3) 你使用 Proxy 伺服器但 BOINC 並不知道。"
+"請設定您的防火牆讓 BOINC 能存取 port 80。然後按「上一步」重試。\n"
+"3) 你正使用 Proxy 伺服器。\n"
+"按「下一步」設置 Proxy 設定。"
 
-#: clientgui/ProxyInfoPage.cpp:208
-msgid "Click Next to configure BOINC's proxy settings."
-msgstr "按「下一步」繼續設定 BOINC 的 Proxy 設定。"
-
-#: clientgui/ProxyPage.cpp:329
+#: clientgui/ProxyPage.cpp:337
 msgid "Proxy configuration"
 msgstr "Proxy 組態設定"
 
-#: clientgui/ProxyPage.cpp:332
+#: clientgui/ProxyPage.cpp:340
 msgid "HTTP proxy"
 msgstr "HTTP Proxy"
 
-#: clientgui/ProxyPage.cpp:335
-#: clientgui/ProxyPage.cpp:355
+#: clientgui/ProxyPage.cpp:343
+#: clientgui/ProxyPage.cpp:363
 msgid "Server:"
 msgstr "伺服器:"
 
-#: clientgui/ProxyPage.cpp:348
+#: clientgui/ProxyPage.cpp:356
 msgid "Autodetect"
 msgstr "自動偵測"
 
-#: clientgui/ProxyPage.cpp:352
+#: clientgui/ProxyPage.cpp:360
 msgid "SOCKS proxy"
 msgstr "SOCKS Proxy"
 
-#: clientgui/UnavailablePage.cpp:178
+#: clientgui/sg_ClientStateIndicator.cpp:289
+msgid "Retrieving current status."
+msgstr "取回目前狀態中。"
+
+#: clientgui/sg_ClientStateIndicator.cpp:292
+msgid "You don't have any projects.  Please Add a Project."
+msgstr "你沒有任何專案，請加入專案。"
+
+#: clientgui/sg_ClientStateIndicator.cpp:295
+msgid "Downloading work from the server."
+msgstr "正從伺服器下載工作。"
+
+#: clientgui/sg_ClientStateIndicator.cpp:300
+msgid "Processing Suspended:  Running On Batteries."
+msgstr "處理已暫止: 正以電池供電"
+
+#: clientgui/sg_ClientStateIndicator.cpp:302
+msgid "Processing Suspended:  User Active."
+msgstr "處理已暫止: 使用者正在操作"
+
+#: clientgui/sg_ClientStateIndicator.cpp:304
+msgid "Processing Suspended:  User paused processing."
+msgstr "處理已暫止: 被使用者暫停"
+
+#: clientgui/sg_ClientStateIndicator.cpp:306
+msgid "Processing Suspended:  Time of Day."
+msgstr "處理已暫止: 不在設定時間內"
+
+#: clientgui/sg_ClientStateIndicator.cpp:308
+msgid "Processing Suspended:  Benchmarks Running."
+msgstr "處理已暫止: 正在執行效能測試"
+
+#: clientgui/sg_ClientStateIndicator.cpp:310
+msgid "Processing Suspended."
+msgstr "處理已暫止。"
+
+#: clientgui/sg_ClientStateIndicator.cpp:314
+msgid "Waiting to contact project servers."
+msgstr "正在等待連到專案伺服器。"
+
+#: clientgui/sg_ClientStateIndicator.cpp:318
+#: clientgui/sg_ClientStateIndicator.cpp:326
+msgid "Retrieving current status"
+msgstr "取回目前狀態中"
+
+#: clientgui/sg_ClientStateIndicator.cpp:321
+msgid "No work available to process"
+msgstr "無工作可用"
+
+#: clientgui/sg_ClientStateIndicator.cpp:323
+msgid "Unable to connect to the core client"
+msgstr "無法連到核心用戶端"
+
+#: clientgui/sg_DlgMessages.cpp:106
+#: clientgui/ViewMessages.cpp:110
+#: clientgui/ViewMessagesGrid.cpp:132
+#: clientgui/ViewProjects.cpp:153
+#: clientgui/ViewProjectsGrid.cpp:164
+#: clientgui/ViewStatistics.cpp:370
+#: clientgui/ViewStatistics.cpp:1630
+#: clientgui/ViewTransfers.cpp:117
+#: clientgui/ViewTransfersGrid.cpp:128
+#: clientgui/ViewWork.cpp:132
+#: clientgui/ViewWorkGrid.cpp:139
+msgid "Project"
+msgstr "專案"
+
+#: clientgui/sg_DlgMessages.cpp:107
+#: clientgui/ViewMessages.cpp:111
+#: clientgui/ViewMessagesGrid.cpp:132
+msgid "Time"
+msgstr "時間"
+
+#: clientgui/sg_DlgMessages.cpp:108
+#: clientgui/ViewMessages.cpp:112
+#: clientgui/ViewMessagesGrid.cpp:132
+msgid "Message"
+msgstr "訊息"
+
+#: clientgui/sg_DlgMessages.cpp:185
+#: clientgui/sg_DlgMessages.cpp:189
+#: clientgui/ViewMessages.cpp:85
+#: clientgui/ViewMessagesGrid.cpp:103
+msgid "Copy all the messages to the clipboard."
+msgstr "複製全部訊息到剪貼簿。"
+
+#: clientgui/sg_DlgMessages.cpp:210
+#: clientgui/sg_DlgMessages.cpp:222
+#: clientgui/ViewMessages.cpp:93
+#: clientgui/ViewMessagesGrid.cpp:111
+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/sg_DlgMessages.cpp:214
+#: clientgui/sg_DlgMessages.cpp:226
+#: clientgui/ViewMessages.cpp:97
+#: clientgui/ViewMessagesGrid.cpp:115
+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/sg_DlgMessages.cpp:268
+#: clientgui/sg_DlgPreferences.cpp:506
+#: clientgui/sg_ProjectsComponent.cpp:116
+msgid "Get help with BOINC"
+msgstr "取得 BOINC 說明"
+
+#: clientgui/sg_DlgMessages.cpp:744
+msgid "BOINC Manager - Messages"
+msgstr "BOINC 管理員 - 訊息"
+
+#: clientgui/sg_DlgPreferences.cpp:92
+msgid "100 MB"
+msgstr "100 MB"
+
+#: clientgui/sg_DlgPreferences.cpp:93
+msgid "200 MB"
+msgstr "200 MB"
+
+#: clientgui/sg_DlgPreferences.cpp:94
+msgid "500 MB"
+msgstr "500 MB"
+
+#: clientgui/sg_DlgPreferences.cpp:95
+msgid "1 GB"
+msgstr "1 GB"
+
+#: clientgui/sg_DlgPreferences.cpp:96
+msgid "2 GB"
+msgstr "2 GB"
+
+#: clientgui/sg_DlgPreferences.cpp:97
+msgid "5 GB"
+msgstr "5 GB"
+
+#: clientgui/sg_DlgPreferences.cpp:98
+msgid "10 GB"
+msgstr "10 GB"
+
+#: clientgui/sg_DlgPreferences.cpp:99
+msgid "20 GB"
+msgstr "20 GB"
+
+#: clientgui/sg_DlgPreferences.cpp:100
+msgid "50 GB"
+msgstr "50 GB"
+
+#: clientgui/sg_DlgPreferences.cpp:101
+msgid "100 GB"
+msgstr "100 GB"
+
+#: clientgui/sg_DlgPreferences.cpp:132
+msgid "10%"
+msgstr "10%"
+
+#: clientgui/sg_DlgPreferences.cpp:133
+msgid "20%"
+msgstr "20%"
+
+#: clientgui/sg_DlgPreferences.cpp:134
+msgid "30%"
+msgstr "30%"
+
+#: clientgui/sg_DlgPreferences.cpp:135
+msgid "40%"
+msgstr "40%"
+
+#: clientgui/sg_DlgPreferences.cpp:136
+msgid "50%"
+msgstr "50%"
+
+#: clientgui/sg_DlgPreferences.cpp:137
+msgid "60%"
+msgstr "60%"
+
+#: clientgui/sg_DlgPreferences.cpp:138
+msgid "70%"
+msgstr "70%"
+
+#: clientgui/sg_DlgPreferences.cpp:139
+msgid "80%"
+msgstr "80%"
+
+#: clientgui/sg_DlgPreferences.cpp:140
+msgid "90%"
+msgstr "90%"
+
+#: clientgui/sg_DlgPreferences.cpp:141
+msgid "100%"
+msgstr "100%"
+
+#: clientgui/sg_DlgPreferences.cpp:166
+msgid "1"
+msgstr "1"
+
+#: clientgui/sg_DlgPreferences.cpp:167
+msgid "3"
+msgstr "3"
+
+#: clientgui/sg_DlgPreferences.cpp:168
+msgid "5"
+msgstr "5"
+
+#: clientgui/sg_DlgPreferences.cpp:169
+msgid "10"
+msgstr "10"
+
+#: clientgui/sg_DlgPreferences.cpp:170
+msgid "15"
+msgstr "15"
+
+#: clientgui/sg_DlgPreferences.cpp:171
+msgid "30"
+msgstr "30"
+
+#: clientgui/sg_DlgPreferences.cpp:172
+msgid "60"
+msgstr "60"
+
+#: clientgui/sg_DlgPreferences.cpp:281
+msgid "Skin"
+msgstr "面板"
+
+#: clientgui/sg_DlgPreferences.cpp:288
+msgid "Skin:"
+msgstr "面板:"
+
+#: clientgui/sg_DlgPreferences.cpp:304
+msgid "Preferences"
+msgstr "偏好設定"
+
+#: clientgui/sg_DlgPreferences.cpp:321
+msgid "I want to customize my preferences for this computer only."
+msgstr "我要自訂只適合這台電腦的偏好設定。"
+
+#: clientgui/sg_DlgPreferences.cpp:330
+msgid "Customized Preferences"
+msgstr "本機自訂偏好設定"
+
+#: clientgui/sg_DlgPreferences.cpp:346
+msgid "Do work only between:"
+msgstr "只在此時段執行工作:"
+
+#: clientgui/sg_DlgPreferences.cpp:359
+#: clientgui/sg_DlgPreferences.cpp:381
+msgid "and"
+msgstr "到"
+
+#: clientgui/sg_DlgPreferences.cpp:368
+msgid "Connect to internet only between:"
+msgstr "只在此時段連上網路:"
+
+#: clientgui/sg_DlgPreferences.cpp:390
+#: clientgui/sg_DlgPreferences.cpp:407
+msgid "Use no more than:"
+msgstr "資源耗用不超過:"
+
+#: clientgui/sg_DlgPreferences.cpp:403
+msgid "of disk space"
+msgstr "磁碟空間"
+
+#: clientgui/sg_DlgPreferences.cpp:420
+msgid "of the processor"
+msgstr "／CPU 使用率"
+
+#: clientgui/sg_DlgPreferences.cpp:424
+msgid "Do work while on battery?"
+msgstr "以電池供電時要執行工作嗎？"
+
+#: clientgui/sg_DlgPreferences.cpp:437
+msgid "Do work after idle for:"
+msgstr "閒置多久後執行工作:"
+
+#: clientgui/sg_DlgPreferences.cpp:450
+msgid "minutes"
+msgstr "分"
+
+#: clientgui/sg_DlgPreferences.cpp:670
+#: clientgui/sg_DlgPreferences.cpp:673
+#: clientgui/sg_DlgPreferences.cpp:733
+#: clientgui/sg_DlgPreferences.cpp:737
+#: clientgui/sg_DlgPreferences.cpp:749
+#: clientgui/sg_DlgPreferences.cpp:753
+#: clientgui/sg_DlgPreferences.cpp:911
+#: clientgui/sg_DlgPreferences.cpp:922
+msgid "Anytime"
+msgstr "隨時"
+
+#: clientgui/sg_DlgPreferences.cpp:769
+#, c-format
+msgid "%d MB"
+msgstr "%d MB"
+
+#: clientgui/sg_DlgPreferences.cpp:771
+#, c-format
+msgid "%4.2f GB"
+msgstr "%4.2f GB"
+
+#: clientgui/sg_DlgPreferences.cpp:812
+#, c-format
+msgid "%d%%"
+msgstr "%d%%"
+
+#: clientgui/sg_DlgPreferences.cpp:848
+msgid "0 (Run Always)"
+msgstr "0 (持續執行)"
+
+#: clientgui/sg_DlgPreferences.cpp:851
+#, c-format
+msgid "%d"
+msgstr "%d"
+
+#: clientgui/sg_DlgPreferences.cpp:1014
+msgid "BOINC Manager - Preferences"
+msgstr "BOINC 管理員 - 偏好設定"
+
+#: clientgui/sg_ProjectsComponent.cpp:99
+msgid "Attach to an additional project"
+msgstr "加入其他專案"
+
+#: clientgui/sg_ProjectsComponent.cpp:169
+#: clientgui/sg_ProjectsComponent.cpp:180
+msgid "Open a window to view messages"
+msgstr "開啟視窗以檢視訊息"
+
+#: clientgui/sg_ProjectsComponent.cpp:198
+msgid "Stop all activity"
+msgstr "停止所有活動"
+
+#: clientgui/sg_ProjectsComponent.cpp:210
+msgid "Resume activity"
+msgstr "繼續活動"
+
+#: clientgui/sg_ProjectsComponent.cpp:227
+msgid "Open a window to set your preferences"
+msgstr "開新視窗設置你的偏好設定"
+
+#: clientgui/sg_ProjectsComponent.cpp:244
+msgid "Switch to the BOINC advanced view"
+msgstr "切換到 BOINC 進階檢視"
+
+#: clientgui/sg_StatImageLoader.cpp:103
+#, c-format
+msgid "%s. Work done by %s: %0.2f"
+msgstr "%s，%s 已完成: %0.2f"
+
+#: clientgui/sg_StatImageLoader.cpp:218
+#: clientgui/ViewProjects.cpp:349
+#: clientgui/ViewProjectsGrid.cpp:368
+#, c-format
+msgid "Are you sure you want to detach from project '%s'?"
+msgstr "您確定從專案「%s」中退出嗎？"
+
+#: clientgui/sg_StatImageLoader.cpp:224
+#: clientgui/ViewProjects.cpp:355
+#: clientgui/ViewProjectsGrid.cpp:374
+msgid "Detach from Project"
+msgstr "退出專案"
+
+#: clientgui/sg_ViewTabPage.cpp:130
+#: clientgui/sg_ViewTabPage.cpp:268
+#, c-format
+msgid "%.1lf"
+msgstr "%.1lf"
+
+#: clientgui/sg_ViewTabPage.cpp:397
+#, c-format
+msgid "%d hr %d min %d sec"
+msgstr "%d 時 %d 分 %d 秒"
+
+#: clientgui/sg_ViewTabPage.cpp:411
+#: clientgui/ViewWork.cpp:214
+#: clientgui/ViewWorkGrid.cpp:228
+msgid "Are you sure you want to display graphics on a remote machine?"
+msgstr "您確定要顯示遠端電腦的圖形嗎？"
+
+#: clientgui/sg_ViewTabPage.cpp:412
+#: clientgui/ViewWork.cpp:106
+#: clientgui/ViewWork.cpp:215
+#: clientgui/ViewWorkGrid.cpp:107
+#: clientgui/ViewWorkGrid.cpp:229
+msgid "Show graphics"
+msgstr "顯示圖形"
+
+#: clientgui/SkinManager.cpp:975
+#, c-format
+msgid ""
+"This will shut down %s and its tasks entirely until either the\n"
+"%s application or the %s screen saver is run again.\n"
+"\n"
+"In most cases, it is better just to close the %s window\n"
+"rather than to exit the application; that will allow %s to run its\n"
+"tasks at the times you selected in your preferences."
+msgstr ""
+"這會完全關閉 %s 和其運算的工作直到 %s 程式或 %s 螢幕保護程式再次啟動。\n"
+"\n"
+"一般而言只關掉 %s 視窗會比完全離開程式來的好，\n"
+"這樣子可以讓 %s 依照你設置的偏好設定按時執行。"
+
+#: clientgui/UnavailablePage.cpp:186
 msgid "Project temporarily unavailable"
 msgstr "專案暫時無法使用"
 
-#: clientgui/UnavailablePage.cpp:181
+#: clientgui/UnavailablePage.cpp:189
 msgid ""
 "The project is temporarily unavailable.\n"
 "\n"
@@ -1319,11 +1712,11 @@ msgstr ""
 "\n"
 "請稍後重試。"
 
-#: clientgui/UnavailablePage.cpp:185
+#: clientgui/UnavailablePage.cpp:193
 msgid "Account manager temporarily unavailable"
 msgstr "帳號管理暫時無法使用"
 
-#: clientgui/UnavailablePage.cpp:188
+#: clientgui/UnavailablePage.cpp:196
 msgid ""
 "The account manager is temporarily unavailable.\n"
 "\n"
@@ -1334,7 +1727,6 @@ msgstr ""
 "請稍後重試。"
 
 #: clientgui/ValidateAccountKey.cpp:69
-#: clientgui/ValidateEmailAddress.cpp:78
 msgid "Please specify an account key to continue."
 msgstr "請輸入帳號金鑰以繼續。"
 
@@ -1343,11 +1735,15 @@ msgid "Invalid Account Key; please enter a valid Account Key"
 msgstr "無效的帳號金鑰；請輸入有效的帳號金鑰"
 
 #: clientgui/ValidateAccountKey.cpp:83
-#: clientgui/ValidateEmailAddress.cpp:92
+#: clientgui/ValidateEmailAddress.cpp:87
 msgid "Validation conflict"
 msgstr "驗證衝突"
 
-#: clientgui/ValidateEmailAddress.cpp:81
+#: clientgui/ValidateEmailAddress.cpp:73
+msgid "Please specify an email address"
+msgstr "請輸入電子郵件地址"
+
+#: clientgui/ValidateEmailAddress.cpp:76
 msgid "Invalid email address; please enter a valid email address"
 msgstr "無效的電子郵件位址；請輸入有效的電子郵件位址"
 
@@ -1397,348 +1793,456 @@ msgstr "「%s」不是有效的主機名稱。"
 msgid "'%s' does not contain a valid path."
 msgstr "「%s」不是有效的路徑。"
 
-#: clientgui/ViewMessages.cpp:78
-#: clientgui/ViewProjects.cpp:102
-#: clientgui/ViewStatistics.cpp:637
-#: clientgui/ViewTransfers.cpp:92
-#: clientgui/ViewWork.cpp:100
+#: clientgui/ViewMessages.cpp:80
+#: clientgui/ViewMessagesGrid.cpp:98
+#: clientgui/ViewProjects.cpp:105
+#: clientgui/ViewProjectsGrid.cpp:112
+#: clientgui/ViewStatistics.cpp:1599
+#: clientgui/ViewTransfers.cpp:94
+#: clientgui/ViewTransfersGrid.cpp:101
+#: clientgui/ViewWork.cpp:102
+#: clientgui/ViewWorkGrid.cpp:103
 msgid "Commands"
 msgstr "命令"
 
-#: clientgui/ViewMessages.cpp:82
+#: clientgui/ViewMessages.cpp:84
+#: clientgui/ViewMessagesGrid.cpp:102
 msgid "Copy all messages"
 msgstr "複製所有訊息"
 
-#: clientgui/ViewMessages.cpp:83
-msgid "Copy all the messages to the clipboard."
-msgstr "複製全部訊息到剪貼簿。"
-
-#: clientgui/ViewMessages.cpp:89
+#: clientgui/ViewMessages.cpp:91
+#: clientgui/ViewMessagesGrid.cpp:109
 msgid "Copy selected messages"
 msgstr "複製選取的訊息"
 
-#: clientgui/ViewMessages.cpp:90
-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/ViewMessages.cpp:102
-#: clientgui/ViewProjects.cpp:150
-#: clientgui/ViewResources.cpp:76
-#: clientgui/ViewStatistics.cpp:668
-#: clientgui/ViewTransfers.cpp:115
-#: clientgui/ViewWork.cpp:130
-msgid "Project"
-msgstr "專案"
-
-#: clientgui/ViewMessages.cpp:103
-msgid "Time"
-msgstr "時間"
-
-#: clientgui/ViewMessages.cpp:104
-msgid "Message"
-msgstr "訊息"
-
-#: clientgui/ViewMessages.cpp:128
+#: clientgui/ViewMessages.cpp:136
 msgid "Messages"
 msgstr "訊息"
 
-#: clientgui/ViewMessages.cpp:150
+#: clientgui/ViewMessages.cpp:158
+#: clientgui/ViewMessagesGrid.cpp:175
 msgid "Copying all messages to the clipboard..."
 msgstr "複製全部訊息到剪貼簿..."
 
-#: clientgui/ViewMessages.cpp:182
-#: clientgui/ViewTransfers.cpp:185
+#: clientgui/ViewMessages.cpp:190
+#: clientgui/ViewTransfers.cpp:190
+#: clientgui/ViewTransfersGrid.cpp:207
 msgid "Aborting transfer..."
 msgstr "中止檔案傳送中..."
 
-#: clientgui/ViewProjects.cpp:106
+#: clientgui/ViewMessagesGrid.cpp:132
+msgid "ID"
+msgstr "ID"
+
+#: clientgui/ViewMessagesGrid.cpp:132
+msgid "Priority"
+msgstr "優先順序"
+
+#: clientgui/ViewMessagesGrid.cpp:153
+msgid "MessagesGrid"
+msgstr "MessagesGrid"
+
+#: clientgui/ViewMessagesGrid.cpp:205
+msgid "Copying selected messages to Clipboard..."
+msgstr "複製所選訊息到剪貼簿..."
+
+#: clientgui/ViewProjects.cpp:109
+#: clientgui/ViewProjectsGrid.cpp:116
 msgid "Update"
 msgstr "更新"
 
-#: clientgui/ViewProjects.cpp:107
+#: clientgui/ViewProjects.cpp:110
+#: clientgui/ViewProjectsGrid.cpp:117
 msgid "Report all completed tasks, get latest credit, get latest preferences, and possibly get more tasks."
 msgstr "回報所有已完成的工作；取得最新的積分與偏好設定資訊且儘可能的取得工作。"
 
-#: clientgui/ViewProjects.cpp:114
-#: clientgui/ViewProjects.cpp:559
-#: clientgui/ViewWork.cpp:111
-#: clientgui/ViewWork.cpp:515
+#: clientgui/ViewProjects.cpp:117
+#: clientgui/ViewProjects.cpp:568
+#: clientgui/ViewProjectsGrid.cpp:124
+#: clientgui/ViewProjectsGrid.cpp:453
+#: clientgui/ViewWork.cpp:113
+#: clientgui/ViewWork.cpp:511
+#: clientgui/ViewWorkGrid.cpp:114
+#: clientgui/ViewWorkGrid.cpp:379
 msgid "Suspend"
 msgstr "暫止"
 
-#: clientgui/ViewProjects.cpp:115
-#: clientgui/ViewProjects.cpp:559
+#: clientgui/ViewProjects.cpp:118
+#: clientgui/ViewProjects.cpp:568
+#: clientgui/ViewProjectsGrid.cpp:125
+#: clientgui/ViewProjectsGrid.cpp:453
 msgid "Suspend tasks for this project."
 msgstr "暫止此專案的工作。"
 
-#: clientgui/ViewProjects.cpp:121
-#: clientgui/ViewProjects.cpp:571
+#: clientgui/ViewProjects.cpp:124
+#: clientgui/ViewProjects.cpp:580
+#: clientgui/ViewProjectsGrid.cpp:131
+#: clientgui/ViewProjectsGrid.cpp:465
 msgid "No new tasks"
 msgstr "不要新工作"
 
-#: clientgui/ViewProjects.cpp:122
+#: clientgui/ViewProjects.cpp:125
+#: clientgui/ViewProjectsGrid.cpp:132
 msgid "Don't get new tasks for this project."
 msgstr "不要取得新工作給此專案。"
 
-#: clientgui/ViewProjects.cpp:128
+#: clientgui/ViewProjects.cpp:131
+#: clientgui/ViewProjectsGrid.cpp:138
 msgid "Reset project"
 msgstr "重新開始專案"
 
-#: clientgui/ViewProjects.cpp:129
+#: clientgui/ViewProjects.cpp:132
+#: clientgui/ViewProjectsGrid.cpp:139
 msgid "Delete all files and tasks associated with this project, and get new tasks.  You can update the project first to report any completed tasks."
 msgstr "刪除所有和此專案相關的檔案和工作後取得新的工作。 在重新開始之前您可以先更新專案來回報已完成的工作。"
 
-#: clientgui/ViewProjects.cpp:138
+#: clientgui/ViewProjects.cpp:141
+#: clientgui/ViewProjectsGrid.cpp:148
 msgid "Detach"
 msgstr "退出"
 
-#: clientgui/ViewProjects.cpp:139
+#: clientgui/ViewProjects.cpp:142
+#: clientgui/ViewProjectsGrid.cpp:149
 msgid "Detach computer from this project.  Tasks in progress will be lost (use 'Update' first to report any completed tasks)."
 msgstr "從專案中退出這台電腦。進行中的工作將會遺失。(在退出之前您可以先按一下「更新」來回報已完成的工作。)"
 
-#: clientgui/ViewProjects.cpp:151
+#: clientgui/ViewProjects.cpp:154
+#: clientgui/ViewProjectsGrid.cpp:164
+#: clientgui/ViewStatistics.cpp:385
 msgid "Account"
 msgstr "帳號"
 
-#: clientgui/ViewProjects.cpp:153
+#: clientgui/ViewProjects.cpp:156
+#: clientgui/ViewProjectsGrid.cpp:164
 msgid "Work done"
 msgstr "運算完成"
 
-#: clientgui/ViewProjects.cpp:154
+#: clientgui/ViewProjects.cpp:157
+#: clientgui/ViewProjectsGrid.cpp:164
 msgid "Avg. work done"
-msgstr "平均完成的工作"
+msgstr "平均完成"
 
-#: clientgui/ViewProjects.cpp:155
+#: clientgui/ViewProjects.cpp:158
+#: clientgui/ViewProjectsGrid.cpp:164
 msgid "Resource share"
 msgstr "資源分享"
 
-#: clientgui/ViewProjects.cpp:156
-#: clientgui/ViewTransfers.cpp:121
-#: clientgui/ViewWork.cpp:137
+#: clientgui/ViewProjects.cpp:159
+#: clientgui/ViewProjectsGrid.cpp:164
+#: clientgui/ViewTransfers.cpp:123
+#: clientgui/ViewTransfersGrid.cpp:128
+#: clientgui/ViewWork.cpp:139
+#: clientgui/ViewWorkGrid.cpp:139
 msgid "Status"
 msgstr "狀態"
 
-#: clientgui/ViewProjects.cpp:169
+#: clientgui/ViewProjects.cpp:172
 msgid "Projects"
 msgstr "專案"
 
-#: clientgui/ViewProjects.cpp:192
+#: clientgui/ViewProjects.cpp:195
+#: clientgui/ViewProjectsGrid.cpp:209
 msgid "Updating project..."
 msgstr "正在更新專案..."
 
-#: clientgui/ViewProjects.cpp:220
+#: clientgui/ViewProjects.cpp:223
+#: clientgui/ViewProjectsGrid.cpp:239
 msgid "Resuming project..."
 msgstr "正在繼續專案..."
 
-#: clientgui/ViewProjects.cpp:224
+#: clientgui/ViewProjects.cpp:227
+#: clientgui/ViewProjectsGrid.cpp:243
 msgid "Suspending project..."
 msgstr "正在暫止專案..."
 
-#: clientgui/ViewProjects.cpp:252
+#: clientgui/ViewProjects.cpp:255
+#: clientgui/ViewProjectsGrid.cpp:272
 msgid "Telling project to allow additional task downloads..."
 msgstr "通知專案可以下載額外的工作..."
 
-#: clientgui/ViewProjects.cpp:256
+#: clientgui/ViewProjects.cpp:259
+#: clientgui/ViewProjectsGrid.cpp:276
 msgid "Telling project to not fetch any additional tasks..."
 msgstr "通知專案不要取得額外的工作..."
 
-#: clientgui/ViewProjects.cpp:287
+#: clientgui/ViewProjects.cpp:293
+#: clientgui/ViewProjectsGrid.cpp:310
 msgid "Resetting project..."
 msgstr "正在重新設定專案..."
 
-#: clientgui/ViewProjects.cpp:293
+#: clientgui/ViewProjects.cpp:299
+#: clientgui/ViewProjectsGrid.cpp:317
 #, c-format
 msgid "Are you sure you want to reset project '%s'?"
 msgstr "您確定要重新開始專案「%s」嗎？"
 
-#: clientgui/ViewProjects.cpp:299
+#: clientgui/ViewProjects.cpp:305
+#: clientgui/ViewProjectsGrid.cpp:323
 msgid "Reset Project"
 msgstr "重新開始專案"
 
-#: clientgui/ViewProjects.cpp:334
+#: clientgui/ViewProjects.cpp:343
+#: clientgui/ViewProjectsGrid.cpp:361
 msgid "Detaching from project..."
 msgstr "正在退出專案..."
 
-#: clientgui/ViewProjects.cpp:340
-#, c-format
-msgid "Are you sure you want to detach from project '%s'?"
-msgstr "您確定從專案「%s」中退出嗎？"
-
-#: clientgui/ViewProjects.cpp:346
-msgid "Detach from Project"
-msgstr "退出專案"
-
-#: clientgui/ViewProjects.cpp:375
-#: clientgui/ViewWork.cpp:322
+#: clientgui/ViewProjects.cpp:384
+#: clientgui/ViewProjectsGrid.cpp:403
+#: clientgui/ViewWork.cpp:318
+#: clientgui/ViewWorkGrid.cpp:336
 msgid "Launching browser..."
 msgstr "啟動瀏覽器..."
 
-#: clientgui/ViewProjects.cpp:555
-#: clientgui/ViewWork.cpp:509
+#: clientgui/ViewProjects.cpp:564
+#: clientgui/ViewProjectsGrid.cpp:449
+#: clientgui/ViewWork.cpp:505
+#: clientgui/ViewWorkGrid.cpp:373
 msgid "Resume"
 msgstr "繼續"
 
-#: clientgui/ViewProjects.cpp:555
+#: clientgui/ViewProjects.cpp:564
+#: clientgui/ViewProjectsGrid.cpp:449
 msgid "Resume tasks for this project."
 msgstr "繼續此專案的工作。"
 
-#: clientgui/ViewProjects.cpp:567
+#: clientgui/ViewProjects.cpp:576
+#: clientgui/ViewProjectsGrid.cpp:461
 msgid "Allow new tasks"
 msgstr "允許新工作"
 
-#: clientgui/ViewProjects.cpp:567
+#: clientgui/ViewProjects.cpp:576
+#: clientgui/ViewProjectsGrid.cpp:461
 msgid "Allow fetching new tasks for this project."
 msgstr "允許此專案取得新工作。"
 
-#: clientgui/ViewProjects.cpp:571
+#: clientgui/ViewProjects.cpp:580
+#: clientgui/ViewProjectsGrid.cpp:465
 msgid "Don't fetch new tasks for this project."
 msgstr "不要取得新工作給此專案。"
 
-#: clientgui/ViewProjects.cpp:673
-#: clientgui/ViewWork.cpp:755
+#: clientgui/ViewProjects.cpp:682
+#: clientgui/ViewProjectsGrid.cpp:629
 msgid "Suspended by user"
 msgstr "被使用者暫止"
 
-#: clientgui/ViewProjects.cpp:676
+#: clientgui/ViewProjects.cpp:685
+#: clientgui/ViewProjectsGrid.cpp:632
 msgid "Won't get new tasks"
 msgstr "無法取得新工作"
 
-#: clientgui/ViewProjects.cpp:679
+#: clientgui/ViewProjects.cpp:688
+#: clientgui/ViewProjectsGrid.cpp:635
 msgid "Scheduler request pending"
 msgstr "排程器請求中"
 
-#: clientgui/ViewProjects.cpp:685
+#: clientgui/ViewProjects.cpp:695
+#: clientgui/ViewProjectsGrid.cpp:642
 msgid "Communication deferred "
 msgstr "已擱置通訊 "
 
-#: clientgui/ViewResources.cpp:77
-msgid "Disk Space"
-msgstr "磁碟空間"
+#: clientgui/ViewProjectsGrid.cpp:186
+msgid "ProjectsGrid"
+msgstr "ProjectsGrid"
 
-#: clientgui/ViewResources.cpp:90
+#: clientgui/ViewResources.cpp:95
+msgid "total disk usage"
+msgstr "總磁碟空間"
+
+#: clientgui/ViewResources.cpp:112
+msgid "disk usage by BOINC projects"
+msgstr "BOINC 專案所用的磁碟空間"
+
+#: clientgui/ViewResources.cpp:141
 msgid "Disk"
 msgstr "磁碟"
 
-#: clientgui/ViewStatistics.cpp:44
-#: clientgui/ViewStatistics.cpp:62
-#: clientgui/ViewStatistics.cpp:737
+#: clientgui/ViewResources.cpp:235
+msgid "not attached to any BOINC project - 0 bytes"
+msgstr "未加入任何 BOINC 專案 - 0 位元組"
+
+#: clientgui/ViewResources.cpp:251
+msgid "free disk space - "
+msgstr "可用磁碟空間 - "
+
+#: clientgui/ViewResources.cpp:257
+msgid "used by BOINC - "
+msgstr "BOINC 所使用 - "
+
+#: clientgui/ViewResources.cpp:263
+msgid "used by other programs - "
+msgstr "其他程式所使用 - "
+
+#: clientgui/ViewStatistics.cpp:1126
 msgid "User Total"
 msgstr "使用者總計"
 
-#: clientgui/ViewStatistics.cpp:641
-msgid "Show user total"
-msgstr "顯示使用者總計"
-
-#: clientgui/ViewStatistics.cpp:648
-msgid "Show user average"
-msgstr "顯示使用者平均"
-
-#: clientgui/ViewStatistics.cpp:655
-msgid "Show host total"
-msgstr "顯示此主機總計"
-
-#: clientgui/ViewStatistics.cpp:662
-msgid "Show host average"
-msgstr "顯示此主機平均"
-
-#: clientgui/ViewStatistics.cpp:672
-msgid "< &Previous project"
-msgstr "< 上一個專案(&P)"
-
-#: clientgui/ViewStatistics.cpp:678
-msgid "&Next project >"
-msgstr "下一個專案(&N) >"
-
-#: clientgui/ViewStatistics.cpp:684
-msgid "Mode view"
-msgstr "模式檢視"
-
-#: clientgui/ViewStatistics.cpp:687
-msgid "All projects"
-msgstr "所有專案"
-
-#: clientgui/ViewStatistics.cpp:694
-msgid "One project"
-msgstr "單一專案"
-
-#: clientgui/ViewStatistics.cpp:701
-msgid "All projects(sum)"
-msgstr "所有專案 (總計)"
-
-#: clientgui/ViewStatistics.cpp:719
-msgid "Statistics"
-msgstr "統計"
-
-#: clientgui/ViewStatistics.cpp:736
-#: clientgui/ViewStatistics.cpp:755
-#: clientgui/ViewStatistics.cpp:774
-#: clientgui/ViewStatistics.cpp:794
-#: clientgui/ViewStatistics.cpp:813
-#: clientgui/ViewStatistics.cpp:833
-#: clientgui/ViewStatistics.cpp:853
-#: clientgui/ViewStatistics.cpp:873
-#: clientgui/ViewStatistics.cpp:891
-msgid "Updating charts..."
-msgstr "更新圖表中..."
-
-#: clientgui/ViewStatistics.cpp:756
+#: clientgui/ViewStatistics.cpp:1127
 msgid "User Average"
 msgstr "使用者平均"
 
-#: clientgui/ViewStatistics.cpp:775
+#: clientgui/ViewStatistics.cpp:1128
 msgid "Host Total"
 msgstr "此主機總計"
 
-#: clientgui/ViewStatistics.cpp:795
+#: clientgui/ViewStatistics.cpp:1129
 msgid "Host Average"
 msgstr "此主機平均"
 
-#: clientgui/ViewTransfers.cpp:96
+#: clientgui/ViewStatistics.cpp:1234
+#, c-format
+msgid "Last update: %.0f days ago"
+msgstr "上次更新: %.0f 天前"
+
+#: clientgui/ViewStatistics.cpp:1603
+msgid "Show user total"
+msgstr "顯示使用者總計"
+
+#: clientgui/ViewStatistics.cpp:1604
+msgid "Show total credit for user"
+msgstr "顯示使用者的總積分"
+
+#: clientgui/ViewStatistics.cpp:1610
+msgid "Show user average"
+msgstr "顯示使用者平均"
+
+#: clientgui/ViewStatistics.cpp:1611
+msgid "Show average credit for user"
+msgstr "顯示使用者的平均積分"
+
+#: clientgui/ViewStatistics.cpp:1617
+msgid "Show host total"
+msgstr "顯示此主機總計"
+
+#: clientgui/ViewStatistics.cpp:1618
+msgid "Show total credit for host"
+msgstr "顯示主機的總積分"
+
+#: clientgui/ViewStatistics.cpp:1624
+msgid "Show host average"
+msgstr "顯示此主機平均"
+
+#: clientgui/ViewStatistics.cpp:1625
+msgid "Show average credit for host"
+msgstr "顯示主機的平均積分"
+
+#: clientgui/ViewStatistics.cpp:1634
+msgid "< &Previous project"
+msgstr "< 上一個專案(&P)"
+
+#: clientgui/ViewStatistics.cpp:1635
+msgid "Show chart for previous project"
+msgstr "顯示上個專案的統計圖"
+
+#: clientgui/ViewStatistics.cpp:1640
+msgid "&Next project >"
+msgstr "下一個專案(&N) >"
+
+#: clientgui/ViewStatistics.cpp:1641
+msgid "Show chart for next project"
+msgstr "顯示下個專案的統計圖"
+
+#: clientgui/ViewStatistics.cpp:1646
+msgid "Mode view"
+msgstr "模式檢視"
+
+#: clientgui/ViewStatistics.cpp:1649
+msgid "All projects"
+msgstr "所有專案"
+
+#: clientgui/ViewStatistics.cpp:1650
+msgid "Show all projects, one chart per project"
+msgstr "顯示所選專案於個別統計圖"
+
+#: clientgui/ViewStatistics.cpp:1656
+msgid "One project"
+msgstr "單一專案"
+
+#: clientgui/ViewStatistics.cpp:1657
+msgid "Show one chart with selected project"
+msgstr "顯示所選專案於同一統計圖"
+
+#: clientgui/ViewStatistics.cpp:1663
+msgid "All projects(sum)"
+msgstr "所有專案 (總計)"
+
+#: clientgui/ViewStatistics.cpp:1664
+msgid "Show one chart with all projects"
+msgstr "顯示所有專案於同一統計圖"
+
+#: clientgui/ViewStatistics.cpp:1681
+msgid "Statistics"
+msgstr "統計"
+
+#: clientgui/ViewStatistics.cpp:1701
+#: clientgui/ViewStatistics.cpp:1722
+#: clientgui/ViewStatistics.cpp:1743
+#: clientgui/ViewStatistics.cpp:1765
+#: clientgui/ViewStatistics.cpp:1786
+#: clientgui/ViewStatistics.cpp:1809
+#: clientgui/ViewStatistics.cpp:1832
+#: clientgui/ViewStatistics.cpp:1855
+#: clientgui/ViewStatistics.cpp:1877
+msgid "Updating charts..."
+msgstr "更新圖表中..."
+
+#: clientgui/ViewTransfers.cpp:98
+#: clientgui/ViewTransfersGrid.cpp:105
 msgid "Retry Now"
 msgstr "立即重試"
 
-#: clientgui/ViewTransfers.cpp:97
+#: clientgui/ViewTransfers.cpp:99
+#: clientgui/ViewTransfersGrid.cpp:106
 msgid "Click 'Retry now' to transfer the file now"
 msgstr "按一下「立即重試」可以立即上傳檔案。"
 
-#: clientgui/ViewTransfers.cpp:103
+#: clientgui/ViewTransfers.cpp:105
+#: clientgui/ViewTransfersGrid.cpp:112
 msgid "Abort Transfer"
 msgstr "中止檔案傳送"
 
-#: clientgui/ViewTransfers.cpp:104
+#: clientgui/ViewTransfers.cpp:106
+#: clientgui/ViewTransfersGrid.cpp:113
 msgid "Click 'Abort transfer' to delete the file from the transfer queue. This will prevent you from being granted credit for this result."
 msgstr "按一下「中止傳送」可以從上傳佇列中刪除這個檔案。 這個動作會使您無法從這個運算結果中獲取積分。"
 
-#: clientgui/ViewTransfers.cpp:116
+#: clientgui/ViewTransfers.cpp:118
+#: clientgui/ViewTransfersGrid.cpp:128
 msgid "File"
 msgstr "檔案"
 
-#: clientgui/ViewTransfers.cpp:117
-#: clientgui/ViewWork.cpp:134
+#: clientgui/ViewTransfers.cpp:119
+#: clientgui/ViewTransfersGrid.cpp:128
+#: clientgui/ViewWork.cpp:136
+#: clientgui/ViewWorkGrid.cpp:139
 msgid "Progress"
 msgstr "進度"
 
-#: clientgui/ViewTransfers.cpp:118
+#: clientgui/ViewTransfers.cpp:120
+#: clientgui/ViewTransfersGrid.cpp:128
 msgid "Size"
 msgstr "大小"
 
-#: clientgui/ViewTransfers.cpp:119
+#: clientgui/ViewTransfers.cpp:121
+#: clientgui/ViewTransfersGrid.cpp:128
 msgid "Elapsed Time"
 msgstr "剩餘時間"
 
-#: clientgui/ViewTransfers.cpp:120
+#: clientgui/ViewTransfers.cpp:122
+#: clientgui/ViewTransfersGrid.cpp:128
 msgid "Speed"
 msgstr "速度"
 
-#: clientgui/ViewTransfers.cpp:134
+#: clientgui/ViewTransfers.cpp:136
 msgid "Transfers"
 msgstr "傳送"
 
-#: clientgui/ViewTransfers.cpp:157
+#: clientgui/ViewTransfers.cpp:159
+#: clientgui/ViewTransfersGrid.cpp:174
 msgid "Retrying transfer now..."
 msgstr "立即重試檔案傳送..."
 
-#: clientgui/ViewTransfers.cpp:188
+#: clientgui/ViewTransfers.cpp:193
+#: clientgui/ViewTransfersGrid.cpp:211
 #, c-format
 msgid ""
 "Are you sure you want to abort this file transfer '%s'?\n"
@@ -1748,113 +2252,137 @@ msgstr ""
 "您確定要中止「%s」 的檔案傳輸嗎？\n"
 "提示: 終止傳輸會使此工作無效且不會收到任何積分。"
 
-#: clientgui/ViewTransfers.cpp:196
+#: clientgui/ViewTransfers.cpp:201
+#: clientgui/ViewTransfersGrid.cpp:219
 msgid "Abort File Transfer"
 msgstr "中止檔案傳送"
 
-#: clientgui/ViewTransfers.cpp:520
+#: clientgui/ViewTransfers.cpp:522
+#: clientgui/ViewTransfersGrid.cpp:406
 msgid "Retry in "
 msgstr "重試於 "
 
-#: clientgui/ViewTransfers.cpp:522
-#: clientgui/ViewWork.cpp:744
+#: clientgui/ViewTransfers.cpp:524
+#: clientgui/ViewTransfersGrid.cpp:408
+#: clientgui/ViewWork.cpp:742
+#: clientgui/ViewWorkGrid.cpp:652
 msgid "Download failed"
 msgstr "下載失敗"
 
-#: clientgui/ViewTransfers.cpp:524
-#: clientgui/ViewWork.cpp:782
+#: clientgui/ViewTransfers.cpp:526
+#: clientgui/ViewTransfersGrid.cpp:410
+#: clientgui/ViewWork.cpp:791
+#: clientgui/ViewWorkGrid.cpp:701
 msgid "Upload failed"
 msgstr "上傳失敗"
 
-#: clientgui/ViewTransfers.cpp:527
-#: clientgui/ViewTransfers.cpp:540
+#: clientgui/ViewTransfers.cpp:529
+#: clientgui/ViewTransfers.cpp:542
+#: clientgui/ViewTransfersGrid.cpp:413
+#: clientgui/ViewTransfersGrid.cpp:426
+#: clientgui/ViewWork.cpp:753
+#: clientgui/ViewWorkGrid.cpp:663
 msgid "Suspended"
 msgstr "已暫止"
 
-#: clientgui/ViewTransfers.cpp:530
-#: clientgui/ViewWork.cpp:784
+#: clientgui/ViewTransfers.cpp:532
+#: clientgui/ViewTransfersGrid.cpp:416
+#: clientgui/ViewWork.cpp:793
+#: clientgui/ViewWorkGrid.cpp:703
 msgid "Uploading"
 msgstr "上傳中"
 
-#: clientgui/ViewTransfers.cpp:530
-#: clientgui/ViewWork.cpp:746
+#: clientgui/ViewTransfers.cpp:532
+#: clientgui/ViewTransfersGrid.cpp:416
+#: clientgui/ViewWork.cpp:744
+#: clientgui/ViewWorkGrid.cpp:654
 msgid "Downloading"
 msgstr "下載中"
 
-#: clientgui/ViewTransfers.cpp:532
+#: clientgui/ViewTransfers.cpp:534
+#: clientgui/ViewTransfersGrid.cpp:418
 msgid "Upload pending"
 msgstr "上傳資料中"
 
-#: clientgui/ViewTransfers.cpp:532
+#: clientgui/ViewTransfers.cpp:534
+#: clientgui/ViewTransfersGrid.cpp:418
 msgid "Download pending"
 msgstr "下載資料中"
 
-#: clientgui/ViewWork.cpp:104
-#: clientgui/ViewWork.cpp:213
-msgid "Show graphics"
-msgstr "顯示圖形"
+#: clientgui/ViewTransfersGrid.cpp:151
+msgid "TransfersGrid"
+msgstr "TransfersGrid"
 
-#: clientgui/ViewWork.cpp:105
+#: clientgui/ViewWork.cpp:107
+#: clientgui/ViewWorkGrid.cpp:108
 msgid "Show application graphics in a window."
 msgstr "於新視窗中顯示應用程式的圖形。"
 
-#: clientgui/ViewWork.cpp:112
+#: clientgui/ViewWork.cpp:114
+#: clientgui/ViewWorkGrid.cpp:115
 msgid "Suspend work for this result."
 msgstr "暫止這個結果的工作。"
 
-#: clientgui/ViewWork.cpp:118
+#: clientgui/ViewWork.cpp:120
+#: clientgui/ViewWorkGrid.cpp:121
 msgid "Abort"
 msgstr "中止"
 
-#: clientgui/ViewWork.cpp:119
+#: clientgui/ViewWork.cpp:121
+#: clientgui/ViewWorkGrid.cpp:122
 msgid "Abandon work on the result. You will get no credit for it."
 msgstr "放棄這個結果的工作。您將不會取得任何積分。"
 
-#: clientgui/ViewWork.cpp:131
+#: clientgui/ViewWork.cpp:133
+#: clientgui/ViewWorkGrid.cpp:139
 msgid "Application"
 msgstr "應用程式"
 
-#: clientgui/ViewWork.cpp:132
+#: clientgui/ViewWork.cpp:134
+#: clientgui/ViewWorkGrid.cpp:139
 msgid "Name"
 msgstr "名稱"
 
-#: clientgui/ViewWork.cpp:133
+#: clientgui/ViewWork.cpp:135
+#: clientgui/ViewWorkGrid.cpp:139
 msgid "CPU time"
 msgstr "CPU 時間"
 
-#: clientgui/ViewWork.cpp:135
+#: clientgui/ViewWork.cpp:137
+#: clientgui/ViewWorkGrid.cpp:139
 msgid "To completion"
 msgstr "剩餘時間"
 
-#: clientgui/ViewWork.cpp:136
+#: clientgui/ViewWork.cpp:138
+#: clientgui/ViewWorkGrid.cpp:139
 msgid "Report deadline"
 msgstr "回報期限"
 
-#: clientgui/ViewWork.cpp:150
+#: clientgui/ViewWork.cpp:152
 msgid "Tasks"
 msgstr "工作"
 
-#: clientgui/ViewWork.cpp:175
+#: clientgui/ViewWork.cpp:177
+#: clientgui/ViewWorkGrid.cpp:191
 msgid "Resuming task..."
 msgstr "繼續工作中..."
 
-#: clientgui/ViewWork.cpp:179
+#: clientgui/ViewWork.cpp:181
+#: clientgui/ViewWorkGrid.cpp:195
 msgid "Suspending task..."
 msgstr "暫止工作中..."
 
-#: clientgui/ViewWork.cpp:205
+#: clientgui/ViewWork.cpp:207
+#: clientgui/ViewWorkGrid.cpp:221
 msgid "Showing graphics for task..."
 msgstr "顯示此工作圖形..."
 
-#: clientgui/ViewWork.cpp:212
-msgid "Are you sure you want to display graphics on a remote machine?"
-msgstr "您確定要顯示遠端電腦的圖形嗎？"
-
-#: clientgui/ViewWork.cpp:277
+#: clientgui/ViewWork.cpp:272
+#: clientgui/ViewWorkGrid.cpp:287
 msgid "Aborting result..."
 msgstr "中止結果中..."
 
-#: clientgui/ViewWork.cpp:285
+#: clientgui/ViewWork.cpp:280
 #, c-format
 msgid ""
 "Are you sure you want to abort this task '%s'?\n"
@@ -1863,157 +2391,237 @@ msgstr ""
 "您確定要中止這個工作「%s」嗎？\n"
 "(進度: %s，狀態: %s)"
 
-#: clientgui/ViewWork.cpp:294
+#: clientgui/ViewWork.cpp:289
+#: clientgui/ViewWorkGrid.cpp:307
 msgid "Abort task"
 msgstr "中止工作"
 
-#: clientgui/ViewWork.cpp:510
+#: clientgui/ViewWork.cpp:506
+#: clientgui/ViewWorkGrid.cpp:374
 msgid "Resume work for this task."
 msgstr "繼續這個工作的動作。"
 
-#: clientgui/ViewWork.cpp:516
+#: clientgui/ViewWork.cpp:512
+#: clientgui/ViewWorkGrid.cpp:380
 msgid "Suspend work for this task."
 msgstr "暫止這個工作的動作。"
 
-#: clientgui/ViewWork.cpp:740
+#: clientgui/ViewWork.cpp:738
+#: clientgui/ViewWorkGrid.cpp:648
 msgid "New"
 msgstr "新工作"
 
-#: clientgui/ViewWork.cpp:751
-#: clientgui/ViewWork.cpp:775
-msgid "Aborted by user"
-msgstr "被使用者中止"
-
-#: clientgui/ViewWork.cpp:753
+#: clientgui/ViewWork.cpp:749
+#: clientgui/ViewWorkGrid.cpp:659
 msgid "Project suspended by user"
 msgstr "專案被使用者暫止"
 
-#: clientgui/ViewWork.cpp:757
-msgid "Activities suspended"
-msgstr "活動已暫止"
+#: clientgui/ViewWork.cpp:751
+#: clientgui/ViewWorkGrid.cpp:661
+msgid "Task suspended by user"
+msgstr "被使用者暫止"
 
-#: clientgui/ViewWork.cpp:760
+#: clientgui/ViewWork.cpp:755
+#: clientgui/ViewWorkGrid.cpp:665
+msgid " - on batteries"
+msgstr " - 正以電池供電"
+
+#: clientgui/ViewWork.cpp:758
+#: clientgui/ViewWorkGrid.cpp:668
+msgid " - user active"
+msgstr " - 使用者正在操作"
+
+#: clientgui/ViewWork.cpp:761
+#: clientgui/ViewWorkGrid.cpp:671
+msgid " - computation suspended"
+msgstr "- 運算已暫止"
+
+#: clientgui/ViewWork.cpp:764
+#: clientgui/ViewWorkGrid.cpp:674
+msgid " - time of day"
+msgstr " - 不在設定時間內"
+
+#: clientgui/ViewWork.cpp:767
+#: clientgui/ViewWorkGrid.cpp:677
+msgid " - CPU benchmarks"
+msgstr " - CPU 效能測試"
+
+#: clientgui/ViewWork.cpp:770
+#: clientgui/ViewWorkGrid.cpp:680
+msgid " - need disk space"
+msgstr " - 需要磁碟空間"
+
+#: clientgui/ViewWork.cpp:774
+#: clientgui/ViewWorkGrid.cpp:684
+msgid "Waiting for memory"
+msgstr "等待記憶體釋放"
+
+#: clientgui/ViewWork.cpp:776
+#: clientgui/ViewWorkGrid.cpp:686
 msgid "Running"
 msgstr "運行中"
 
-#: clientgui/ViewWork.cpp:762
-msgid "Preempted"
-msgstr "被先佔"
+#: clientgui/ViewWork.cpp:778
+#: clientgui/ViewWorkGrid.cpp:688
+msgid "Waiting to run"
+msgstr "等待執行"
 
-#: clientgui/ViewWork.cpp:764
-#: clientgui/ViewWork.cpp:767
-msgid "Ready to run"
-msgstr "準備執行"
+#: clientgui/ViewWork.cpp:780
+#: clientgui/ViewWork.cpp:783
+#: clientgui/ViewWorkGrid.cpp:690
+#: clientgui/ViewWorkGrid.cpp:693
+msgid "Ready to start"
+msgstr "準備開始"
 
-#: clientgui/ViewWork.cpp:777
+#: clientgui/ViewWork.cpp:787
+#: clientgui/ViewWorkGrid.cpp:697
 msgid "Computation error"
 msgstr "運算錯誤"
 
-#: clientgui/ViewWork.cpp:789
+#: clientgui/ViewWork.cpp:799
+#: clientgui/ViewWorkGrid.cpp:709
+msgid "Aborted by user"
+msgstr "被使用者中止"
+
+#: clientgui/ViewWork.cpp:802
+#: clientgui/ViewWorkGrid.cpp:712
+msgid "Aborted by project"
+msgstr "被專案中止"
+
+#: clientgui/ViewWork.cpp:805
+#: clientgui/ViewWorkGrid.cpp:715
+msgid "Aborted"
+msgstr "已中止"
+
+#: clientgui/ViewWork.cpp:810
+#: clientgui/ViewWorkGrid.cpp:720
 msgid "Acknowledged"
 msgstr "已認可"
 
-#: clientgui/ViewWork.cpp:791
+#: clientgui/ViewWork.cpp:812
+#: clientgui/ViewWorkGrid.cpp:722
 msgid "Ready to report"
 msgstr "準備回報"
 
-#: clientgui/ViewWork.cpp:793
+#: clientgui/ViewWork.cpp:814
+#: clientgui/ViewWorkGrid.cpp:724
 #, c-format
 msgid "Error: invalid state '%d'"
 msgstr "錯誤: 無效狀態「%d」"
 
-#: clientgui/ViewWork.cpp:801
+#: clientgui/ViewWork.cpp:822
+#: clientgui/ViewWorkGrid.cpp:732
 msgid "Activities suspended by user"
 msgstr "被使用者暫止活動"
 
-#: clientgui/WelcomePage.cpp:307
-msgid "We'll now guide you through the process of attaching to a project."
-msgstr "現在我們會引導您進行加入專案的步驟。"
+#: clientgui/ViewWorkGrid.cpp:165
+msgid "TasksGrid"
+msgstr "TasksGrid"
 
-#: clientgui/WelcomePage.cpp:318
+#: clientgui/ViewWorkGrid.cpp:298
 #, c-format
 msgid ""
-"We'll now remove this computer from %s.  You will\n"
-"be responsible for managing the BOINC client software from\n"
-"now on."
+"Are you sure you want to abort this task '%s'?\n"
+"(Progress: %s %%, Status: %s)"
 msgstr ""
-"我們正從 %s 中移除此電腦。\n"
-"從現在起您將自己負責管理此 BOINC 用戶端。"
+"您確定要中止工作「%s」嗎？\n"
+"(進度: %s，狀態: %s)"
 
-#: clientgui/WelcomePage.cpp:328
+#: clientgui/WelcomePage.cpp:317
+msgid ""
+"We'll now guide you through the process of attaching\n"
+"to a project."
+msgstr "現在我們會引導您進行加入專案的步驟。"
+
+#: clientgui/WelcomePage.cpp:329
+#, c-format
+msgid ""
+"We'll now remove this computer from %s.  From now on,\n"
+"attach and detach projects directly from this computer.\n"
+msgstr ""
+"我們會從 %s 移除這台電腦。\n"
+"從現在起，這台電腦能直接加入或退出專案。\n"
+
+#: clientgui/WelcomePage.cpp:339
 msgid "Account manager"
 msgstr "帳號管理員(&A)"
 
-#: clientgui/WelcomePage.cpp:331
+#: clientgui/WelcomePage.cpp:342
 msgid ""
-"We'll now guide you through the process of adding an account\n"
-"manager."
-msgstr "現在我們會引導您進行加入帳號管理員的步驟。"
+"We'll now guide you through the process of attaching\n"
+"to an account manager.\n"
+"\n"
+"If you want to attach to a single project, click Cancel,\n"
+"then select the 'Attach to project' menu item instead."
+msgstr ""
+"現在我們會引導您進行加入帳號管理員的步驟。\n"
+"\n"
+"如果你只想加入單一專案，請按「取消」，然後從功能表裡選擇「加入專案」。"
 
-#: clientgui/WelcomePage.cpp:340
+#: clientgui/WelcomePage.cpp:354
 msgid "Debug Flags"
 msgstr "除錯旗標"
 
-#: clientgui/WelcomePage.cpp:343
+#: clientgui/WelcomePage.cpp:357
 msgid "Project Properties Failure"
 msgstr "專案內容失敗"
 
-#: clientgui/WelcomePage.cpp:346
+#: clientgui/WelcomePage.cpp:360
 msgid "Project Comm Failure"
 msgstr "專案通訊失敗"
 
-#: clientgui/WelcomePage.cpp:349
+#: clientgui/WelcomePage.cpp:363
 msgid "Project Properties URL Failure"
 msgstr "專案內容網址失敗"
 
-#: clientgui/WelcomePage.cpp:352
+#: clientgui/WelcomePage.cpp:366
 msgid "Account Creation Disabled"
 msgstr "帳號建立已停止。"
 
-#: clientgui/WelcomePage.cpp:355
+#: clientgui/WelcomePage.cpp:369
 msgid "Client Account Creation Disabled"
 msgstr "用戶端帳號建立已停止"
 
-#: clientgui/WelcomePage.cpp:358
+#: clientgui/WelcomePage.cpp:372
 msgid "Account Already Exists"
 msgstr "帳號已存在。"
 
-#: clientgui/WelcomePage.cpp:361
+#: clientgui/WelcomePage.cpp:375
 msgid "Project Already Attached"
 msgstr "專案已加入。"
 
-#: clientgui/WelcomePage.cpp:364
+#: clientgui/WelcomePage.cpp:378
 msgid "Project Attach Failure"
 msgstr "加入專案失敗"
 
-#: clientgui/WelcomePage.cpp:367
+#: clientgui/WelcomePage.cpp:381
 msgid "Google Comm Failure"
 msgstr "Google 通訊失敗"
 
-#: clientgui/WelcomePage.cpp:370
+#: clientgui/WelcomePage.cpp:384
 msgid "Yahoo Comm Failure"
 msgstr "Yahoo 通訊失敗"
 
-#: clientgui/WelcomePage.cpp:373
+#: clientgui/WelcomePage.cpp:387
 msgid "Net Detection Failure"
 msgstr "網路偵測失敗"
 
-#: clientgui/WelcomePage.cpp:378
+#: clientgui/WelcomePage.cpp:392
 msgid "To continue, click Next."
 msgstr "請按「下一步」繼續。"
 
-#: clientgui/WizardAccountManager.cpp:434
-#: clientgui/WizardAttachProject.cpp:445
+#: clientgui/WizardAccountManager.cpp:437
+#: clientgui/WizardAttachProject.cpp:474
 msgid "Do you really want to cancel?"
 msgstr "您真的要取消嗎？"
 
-#: clientgui/WizardAccountManager.cpp:435
-#: clientgui/WizardAttachProject.cpp:446
+#: clientgui/WizardAccountManager.cpp:438
+#: clientgui/WizardAttachProject.cpp:475
 msgid "Question"
 msgstr "問題"
 
 #: clientgui/wizardex.cpp:359
-#: clientgui/wizardex.cpp:551
+#: clientgui/wizardex.cpp:548
 msgid "&Next >"
 msgstr "下一步(&N) >"
 
@@ -2021,18 +2629,38 @@ msgstr "下一步(&N) >"
 msgid "< &Back"
 msgstr "< 上一步(&B)"
 
-#: clientgui/wizardex.cpp:549
+#: clientgui/wizardex.cpp:546
 msgid "&Finish"
 msgstr "完成(&F)"
 
+#: clientgui/common/wxFlatNotebook.cpp:182
+#, c-format
+msgid "New page inserted. Index = %i"
+msgstr "New page inserted. Index = %i"
+
+#: clientgui/common/wxFlatNotebook.cpp:187
+#, c-format
+msgid "New page appended. Index = %i"
+msgstr "New page appended. Index = %i"
+
+#: clientgui/common/wxFlatNotebook.cpp:2048
+#, c-format
+msgid "Old Page Index = %i"
+msgstr "Old Page Index = %i"
+
+#: clientgui/common/wxFlatNotebook.cpp:2053
+#, c-format
+msgid "OnDropTarget: index by HitTest = %i"
+msgstr "OnDropTarget: index by HitTest = %i"
+
+#: clientgui/common/wxPieCtrl.cpp:196
+msgid "Pie Ctrl"
+msgstr "Pie Ctrl"
+
 #: clientgui/DlgAbout.h:52
 msgid "About BOINC Manager"
 msgstr "關於 BOINC 管理員..."
 
-#: clientgui/DlgDialupCredentials.h:49
-msgid "BOINC Manager - Dialup Logon"
-msgstr "BOINC 管理員 - 撥號登入"
-
 #: clientgui/DlgOptions.h:49
 msgid "BOINC Manager - Options"
 msgstr "BOINC 管理員 - 選項"