diff --git a/locale/zh_TW/BOINC-Manager.po b/locale/zh_TW/BOINC-Manager.po
index 1c2c68a93c..5fb6492c28 100644
--- a/locale/zh_TW/BOINC-Manager.po
+++ b/locale/zh_TW/BOINC-Manager.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: boinc\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-02-02 00:00-0800\n"
-"PO-Revision-Date: 2015-02-09 11:54+0000\n"
+"PO-Revision-Date: 2015-02-15 15:57+0000\n"
 "Last-Translator: willy Wu <df910105@yahoo.com.tw>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/boinc/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -21,23 +21,23 @@ msgstr ""
 #: AccountInfoPage.cpp:387
 #, c-format
 msgid "Identify your account at %s"
-msgstr "確認您的帳號於 %s"
+msgstr "驗證您的 %s 帳號"
 
 #: AccountInfoPage.cpp:393
 msgid ""
 "Please enter your account information\n"
 "(to create an account, visit the project's web site)"
-msgstr "請輸入您的帳號資訊\n(要建立帳號，請前往專案網站)"
+msgstr "請輸入您的帳號資訊\n(欲建立帳號，請前往專案網站)"
 
 #: AccountInfoPage.cpp:397
 msgid ""
 "This project is not currently accepting new accounts.\n"
 "You can add it only if you already have an account."
-msgstr "該計畫暫不接受新帳號註冊，\n只能加入已存在的帳號。"
+msgstr "該計畫暫不接受新帳號註冊，\n您只能使用已存在的帳號。"
 
 #: AccountInfoPage.cpp:401
 msgid "Are you already running this project?"
-msgstr "您準備好執行此專案了嗎？"
+msgstr "您準備好執行此專案了嗎?"
 
 #: AccountInfoPage.cpp:405
 msgid "&No, new user"
@@ -93,7 +93,7 @@ msgstr "最小字元長度 %d"
 
 #: AccountInfoPage.cpp:522
 msgid "Forgot your password?"
-msgstr "遺忘您的密嗎？"
+msgstr "忘記密碼?"
 
 #: AccountInfoPage.cpp:529
 msgid ""
@@ -219,19 +219,19 @@ msgstr "顯示專案"
 
 #: AdvancedFrame.cpp:383
 msgid "&Tasks\tCtrl+Shift+T"
-msgstr "工作 (&T)\tCtrl+Shift+T"
+msgstr "任務 (&T)\tCtrl+Shift+T"
 
 #: AdvancedFrame.cpp:384
 msgid "Display tasks"
-msgstr "顯示工作"
+msgstr "顯示任務"
 
 #: AdvancedFrame.cpp:389
 msgid "Trans&fers\tCtrl+Shift+X"
-msgstr "傳送 (&F)\tCtrl+Shift+X"
+msgstr "傳輸 (&F)\tCtrl+Shift+X"
 
 #: AdvancedFrame.cpp:390
 msgid "Display transfers"
-msgstr "顯示傳送"
+msgstr "顯示傳輸"
 
 #: AdvancedFrame.cpp:395
 msgid "&Statistics\tCtrl+Shift+S"
@@ -259,7 +259,7 @@ msgstr "顯示精簡 BOINC 圖形介面。"
 
 #: AdvancedFrame.cpp:424
 msgid "&Add project or account manager..."
-msgstr "加入帳號管理服務(&A)..."
+msgstr "加入帳號管理服務 (&A)..."
 
 #: AdvancedFrame.cpp:425 sg_ProjectPanel.cpp:76
 msgid "Volunteer for any or all of 30+ projects in many areas of science"
@@ -277,7 +277,7 @@ msgstr "從 %s 取得現在的設定"
 
 #: AdvancedFrame.cpp:443
 msgid "&Add project..."
-msgstr "新增專案 (&A)"
+msgstr "新增專案... (&A)"
 
 #: AdvancedFrame.cpp:444
 msgid "Add a project"
@@ -286,11 +286,11 @@ msgstr "新增一個專案"
 #: AdvancedFrame.cpp:447
 #, c-format
 msgid "S&top using %s..."
-msgstr "停止使用 %s(&S)..."
+msgstr "停止使用 %s (&S)..."
 
 #: AdvancedFrame.cpp:453
 msgid "Remove this computer from account manager control."
-msgstr "從帳號管理服務中移除用戶端。"
+msgstr "從用戶端中移除帳號管理服務。"
 
 #: AdvancedFrame.cpp:458 sg_BoincSimpleFrame.cpp:178
 msgid "&Options..."
@@ -302,7 +302,7 @@ msgstr "配置顯示選項和 Proxy 設定"
 
 #: AdvancedFrame.cpp:463 sg_BoincSimpleFrame.cpp:172
 msgid "Computing &preferences..."
-msgstr "運算偏好(&P)..."
+msgstr "運算偏好設定 (&P)..."
 
 #: AdvancedFrame.cpp:464 sg_BoincSimpleFrame.cpp:173
 msgid "Configure computing preferences"
@@ -314,7 +314,7 @@ msgstr "持續執行 (&R)"
 
 #: AdvancedFrame.cpp:473
 msgid "Allow work regardless of preferences"
-msgstr "不管偏好設定運行工作"
+msgstr "不管偏好設定運行任務"
 
 #: AdvancedFrame.cpp:477
 msgid "Run based on &preferences"
@@ -322,15 +322,15 @@ msgstr "依照偏好設定執行(&P)"
 
 #: AdvancedFrame.cpp:478
 msgid "Allow work according to preferences"
-msgstr "依照您的偏好設定執行工作"
+msgstr "依照您的偏好設定執行任務"
 
 #: AdvancedFrame.cpp:482
 msgid "&Suspend"
-msgstr "暫止 (&S)"
+msgstr "暫停 (&S)"
 
 #: AdvancedFrame.cpp:483
 msgid "Stop work regardless of preferences"
-msgstr "不管偏好設定停止工作"
+msgstr "不管偏好設定停止任務"
 
 #: AdvancedFrame.cpp:508
 msgid "Use GPU always"
@@ -338,23 +338,23 @@ msgstr "持續執行 GPU"
 
 #: AdvancedFrame.cpp:509
 msgid "Allow GPU work regardless of preferences"
-msgstr "不管偏好設定運行工作"
+msgstr "不管偏好設定運行任務"
 
 #: AdvancedFrame.cpp:513
 msgid "Use GPU based on preferences"
-msgstr "依照偏好設定使用GPU(&P)"
+msgstr "依照偏好設定使用 GPU (&P)"
 
 #: AdvancedFrame.cpp:514
 msgid "Allow GPU work according to preferences"
-msgstr "依照您的偏好設定運行GPU工作"
+msgstr "依照您的偏好設定運行 GPU 任務"
 
 #: AdvancedFrame.cpp:518
 msgid "Suspend GPU"
-msgstr "暫止GPU"
+msgstr "暫停 GPU"
 
 #: AdvancedFrame.cpp:519
 msgid "Stop GPU work regardless of preferences"
-msgstr "不管偏好設定停止GPU工作"
+msgstr "不管偏好設定停止 GPU 任務"
 
 #: AdvancedFrame.cpp:543
 msgid "Network activity always available"
@@ -374,7 +374,7 @@ msgstr "依照您的偏好設定進行網路活動"
 
 #: AdvancedFrame.cpp:553
 msgid "Network activity suspended"
-msgstr "暫止網路活動"
+msgstr "暫停網路活動"
 
 #: AdvancedFrame.cpp:554
 msgid "Stop BOINC network activity"
@@ -442,7 +442,7 @@ msgstr "開啟新的 %s"
 
 #: AdvancedFrame.cpp:614
 msgid "Event Log...\tCtrl+Shift+E"
-msgstr "事件記錄...\tCtrl+Shift+E"
+msgstr "事件記錄檔... Ctrl+Shift+E"
 
 #: AdvancedFrame.cpp:615
 msgid "Display diagnostic messages."
@@ -665,7 +665,7 @@ msgstr "%s 無法啟動 %s 客戶端的程式。 \n請依次 控制面板->管
 msgid ""
 "%s is not able to start a %s client.\n"
 "Please start the daemon and try again."
-msgstr "%s 無法啟動 %s 客戶端的應用程式。\n請手動啟動應用程式後再重試。"
+msgstr "%s 無法啟動 %s 客戶端。\n請手動啟動程式後再重試。"
 
 #: BOINCBaseFrame.cpp:689
 #, c-format
@@ -728,7 +728,7 @@ msgstr "%s 連線到網路失敗。"
 msgid ""
 "%s has detected it is now connected to the Internet.\n"
 "Updating all projects and retrying all transfers."
-msgstr "%s 偵測到現在處於連線狀態。\n正在更新所有專案並重試所有檔案傳送。"
+msgstr "%s 偵測到現在處於連線狀態。\n正在更新所有專案並重試所有檔案傳輸。"
 
 #: BOINCDialupManager.cpp:417
 #, c-format
@@ -877,7 +877,7 @@ msgstr "運算已啟用"
 
 #: BOINCTaskBar.cpp:717
 msgid "Computing is suspended - "
-msgstr "運算已暫止 - "
+msgstr "運算已暫停 - "
 
 #: BOINCTaskBar.cpp:727
 msgid "GPU computing is enabled"
@@ -885,7 +885,7 @@ msgstr "GPU 運算已啟用"
 
 #: BOINCTaskBar.cpp:730
 msgid "GPU computing is suspended - "
-msgstr "GPU 運算已暫止 - "
+msgstr "GPU 運算已暫停 - "
 
 #: BOINCTaskBar.cpp:739
 msgid "Network is enabled"
@@ -893,7 +893,7 @@ msgstr "網路已啟用"
 
 #: BOINCTaskBar.cpp:742
 msgid "Network is suspended - "
-msgstr "網路已暫止 - "
+msgstr "網路已暫停 - "
 
 #: BOINCTaskBar.cpp:750
 msgid "Reconnecting to client."
@@ -1148,7 +1148,7 @@ msgstr "當電腦使用電池電源時"
 #: DlgAdvPreferencesBase.cpp:142
 msgid ""
 "check this if you want this computer to do work while it runs on batteries"
-msgstr "若您想讓電腦使用電池電源時執行工作，請打勾"
+msgstr "若您想讓電腦使用電池電源時執行任務，請打勾"
 
 #: DlgAdvPreferencesBase.cpp:148
 msgid "While computer is in use"
@@ -1157,7 +1157,7 @@ msgstr "當電腦正被使用時"
 #: DlgAdvPreferencesBase.cpp:151
 msgid ""
 "check this if you want this computer to do work even when you're using it"
-msgstr "若您想在使用電腦時執行工作，請打勾"
+msgstr "若您想在使用電腦時執行任務，請打勾"
 
 #: DlgAdvPreferencesBase.cpp:157
 msgid "Use GPU while computer is in use"
@@ -1171,12 +1171,12 @@ msgstr "若您想在使用電腦時執行 GPU 運算，請打勾"
 
 #: DlgAdvPreferencesBase.cpp:172
 msgid "Only after computer has been idle for"
-msgstr "電腦閒置幾分鐘後才執行工作: "
+msgstr "電腦閒置幾分鐘後才執行任務: "
 
 #: DlgAdvPreferencesBase.cpp:182
 msgid ""
 "do work only after you haven't used the computer for this number of minutes"
-msgstr "設定您不使用電腦幾分鐘後才執行工作"
+msgstr "設定您不使用電腦幾分鐘後才執行任務"
 
 #: DlgAdvPreferencesBase.cpp:187 DlgAdvPreferencesBase.cpp:336
 #: sg_DlgPreferences.cpp:417
@@ -1197,11 +1197,11 @@ msgstr "% (0 代表不限制 )"
 
 #: DlgAdvPreferencesBase.cpp:235 DlgAdvPreferencesBase.cpp:496
 msgid "Every day between hours of"
-msgstr "每天執行工作的時間區間："
+msgstr "每天執行任務的時間區間："
 
 #: DlgAdvPreferencesBase.cpp:239
 msgid "start work at this time"
-msgstr "開始執行工作的時間"
+msgstr "開始執行任務的時間"
 
 #: DlgAdvPreferencesBase.cpp:243 DlgAdvPreferencesBase.cpp:504
 #: sg_DlgPreferences.cpp:326 sg_DlgPreferences.cpp:348
@@ -1210,7 +1210,7 @@ msgstr "到"
 
 #: DlgAdvPreferencesBase.cpp:247
 msgid "stop work at this time"
-msgstr "停止執行工作的時間"
+msgstr "停止執行任務的時間"
 
 #: DlgAdvPreferencesBase.cpp:251 DlgAdvPreferencesBase.cpp:512
 msgid "(no restriction if equal)"
@@ -1222,7 +1222,7 @@ msgstr "每日分別設定："
 
 #: DlgAdvPreferencesBase.cpp:261 DlgAdvPreferencesBase.cpp:522
 msgid "check box to specify hours for this day of week"
-msgstr "打勾可設定該日要運行工作的時間"
+msgstr "打勾可設定該日要運行任務的時間"
 
 #: DlgAdvPreferencesBase.cpp:267 DlgAdvPreferencesBase.cpp:528
 msgid "Monday"
@@ -1315,19 +1315,19 @@ msgstr "天"
 
 #: DlgAdvPreferencesBase.cpp:429
 msgid "Minimum work buffer"
-msgstr "最少的工作緩衝時間"
+msgstr "最少的任務緩衝時間"
 
 #: DlgAdvPreferencesBase.cpp:438
 msgid "Try to maintain enough tasks to keep busy for this many days"
-msgstr "嘗試持有這些天數所需要的工作數量"
+msgstr "嘗試持有這些天數所需要的任務數量"
 
 #: DlgAdvPreferencesBase.cpp:450
 msgid "Max additional work buffer"
-msgstr "取得額外工作的緩衝時間"
+msgstr "取得額外任務的緩衝時間"
 
 #: DlgAdvPreferencesBase.cpp:459
 msgid "In addition, maintain enough tasks for up to this many days"
-msgstr "額外取得這些天數所需要的工作數量"
+msgstr "額外取得這些天數所需要的任務數量"
 
 #: DlgAdvPreferencesBase.cpp:466
 msgid "Skip image file verification"
@@ -1408,7 +1408,7 @@ msgstr "% 總硬碟空間"
 
 #: DlgAdvPreferencesBase.cpp:639
 msgid "Tasks checkpoint to disk at most every"
-msgstr "工作最短的儲存時間間隔"
+msgstr "任務最短的儲存時間間隔"
 
 #: DlgAdvPreferencesBase.cpp:645
 msgid "seconds"
@@ -1435,11 +1435,11 @@ msgstr "% 於電腦閒置中"
 
 #: DlgAdvPreferencesBase.cpp:691
 msgid "Leave applications in memory while suspended"
-msgstr "當暫止時保留應用程式於記憶體中"
+msgstr "當暫停時保留應用程式於記憶體中"
 
 #: DlgAdvPreferencesBase.cpp:693
 msgid "if checked, suspended work units are left in memory"
-msgstr "若勾選此方塊，暫止的工作會留在記憶體中"
+msgstr "若勾選此方塊，暫停的任務會留在記憶體中"
 
 #: DlgAdvPreferencesBase.cpp:713
 msgid ""
@@ -1470,7 +1470,7 @@ msgstr "更多詳細的設定，請前往"
 #: DlgEventLog.cpp:219
 #, c-format
 msgid "%s - Event Log"
-msgstr "%s - 訊息記錄"
+msgstr "%s - 事件記錄檔"
 
 #: DlgEventLog.cpp:232 ViewMessages.cpp:117 ViewProjects.cpp:219
 #: ViewStatistics.cpp:435 ViewStatistics.cpp:2009 ViewTransfers.cpp:182
@@ -1551,7 +1551,7 @@ msgid ""
 "\n"
 "If you also want to stop running the tasks,\n"
 "choose from the following options:"
-msgstr "您剛才請求關閉 %s，\n他的用途是查看與管理在您電腦上執行的工作。\n\n如果您想要停止執行中的工作，\n請從下列的選項中選擇："
+msgstr "您剛才請求關閉 %s，\n他的用途是查看與管理在您電腦上執行的任務。\n\n如果您想要停止執行中的任務，\n請從下列的選項中選擇："
 
 #: DlgExitMessage.cpp:135
 #, c-format
@@ -1562,12 +1562,12 @@ msgid ""
 "In most cases, it is better just to close the %s window\n"
 "rather than to exit the application; that will allow %s to run its\n"
 "tasks at the times you selected in your preferences."
-msgstr "這會完全關閉 %s 和其運算的工作直到 %s 程式\n或 %s 螢幕保護程式再次啟動。\n\n一般而言只關掉 %s 視窗會比完全離開程式來的好，\n這樣子可以讓 %s 依照你設置的偏好設定按時執行。"
+msgstr "這會完全關閉 %s 和其運算的任務直到 %s 程式\n或 %s 螢幕保護程式再次啟動。\n\n一般而言只關掉 %s 視窗會比完全離開程式來的好，\n這樣子可以讓 %s 依照你設置的偏好設定按時執行。"
 
 #: DlgExitMessage.cpp:153
 #, c-format
 msgid "Stop running tasks when exiting the %s"
-msgstr "當離開 %s 的時候停止所有運算中的工作"
+msgstr "當離開 %s 時停止所有運算中的任務"
 
 #: DlgExitMessage.cpp:165
 msgid "Remember this decision and do not show this dialog."
@@ -1585,7 +1585,7 @@ msgstr "不要再顯示這提示訊息。"
 #: DlgItemProperties.cpp:168 DlgItemProperties.cpp:171
 #: DlgItemProperties.cpp:174 DlgItemProperties.cpp:177
 msgid "Don't fetch tasks for "
-msgstr "禁止取得新工作"
+msgstr "禁止取得新任務"
 
 #: DlgItemProperties.cpp:168
 msgid "Project preference"
@@ -1605,11 +1605,11 @@ msgstr "用戶端帳號建立已停止"
 
 #: DlgItemProperties.cpp:181
 msgid " work fetch deferred for"
-msgstr " 閒置多久後執行工作"
+msgstr " 閒置多久後執行任務"
 
 #: DlgItemProperties.cpp:182
 msgid " work fetch deferral interval"
-msgstr " 工作的延遲間隔"
+msgstr " 任務的延遲間隔"
 
 #: DlgItemProperties.cpp:213
 msgid "Properties of project "
@@ -1672,7 +1672,7 @@ msgstr "否"
 
 #: DlgItemProperties.cpp:237
 msgid "Don't request more work"
-msgstr "不允許新的工作"
+msgstr "不允許新的任務"
 
 #: DlgItemProperties.cpp:239
 msgid "Scheduler call in progress"
@@ -1696,7 +1696,7 @@ msgstr "加入帳號管理服務"
 
 #: DlgItemProperties.cpp:254
 msgid "Remove when tasks done"
-msgstr "工作完成後退出"
+msgstr "任務完成後退出"
 
 #: DlgItemProperties.cpp:257
 msgid "Ended"
@@ -1732,7 +1732,7 @@ msgstr "時間校正參數"
 
 #: DlgItemProperties.cpp:316
 msgid "Properties of task "
-msgstr "工作細節"
+msgstr "任務細節"
 
 #: DlgItemProperties.cpp:328 ViewWork.cpp:238
 msgid "Application"
@@ -1760,7 +1760,7 @@ msgstr "資源"
 
 #: DlgItemProperties.cpp:341
 msgid "Estimated computation size"
-msgstr "預估的工作大小"
+msgstr "預估任務大小"
 
 #: DlgItemProperties.cpp:344
 msgid "CPU time at last checkpoint"
@@ -1792,7 +1792,7 @@ msgstr "記憶體大小"
 
 #: DlgItemProperties.cpp:354
 msgid "Directory"
-msgstr "工作目錄"
+msgstr "任務目錄"
 
 #: DlgItemProperties.cpp:357
 msgid "Process ID"
@@ -1994,7 +1994,7 @@ msgstr "您的結果"
 
 #: Localization.cpp:49 Localization.cpp:91
 msgid "View your last week (or more) of computational results and work"
-msgstr "檢視您上週或更久之前所完成的運算結果與工作"
+msgstr "檢視您上週或更久之前所完成的運算結果"
 
 #: Localization.cpp:51 Localization.cpp:93
 msgid "Your computers"
@@ -2225,7 +2225,7 @@ msgstr "沒有可用的 GPU，"
 
 #: MainDocument.cpp:2474
 msgid "New"
-msgstr "新工作"
+msgstr "新任務"
 
 #: MainDocument.cpp:2478
 msgid "Download failed"
@@ -2237,23 +2237,23 @@ msgstr "下載中"
 
 #: MainDocument.cpp:2482 MainDocument.cpp:2552
 msgid " (suspended - "
-msgstr " (已暫止 - "
+msgstr " (已暫停 - "
 
 #: MainDocument.cpp:2490
 msgid "Project suspended by user"
-msgstr "專案被使用者暫止"
+msgstr "專案被使用者暫停"
 
 #: MainDocument.cpp:2492
 msgid "Task suspended by user"
-msgstr "被使用者暫止"
+msgstr "被使用者暫停"
 
 #: MainDocument.cpp:2494
 msgid "Suspended - "
-msgstr "已暫止 -"
+msgstr "已暫停 -"
 
 #: MainDocument.cpp:2500
 msgid "GPU suspended - "
-msgstr "GPU 已暫止 -"
+msgstr "GPU 已暫停 -"
 
 #: MainDocument.cpp:2507
 msgid "Waiting for memory"
@@ -2309,31 +2309,31 @@ msgstr "上傳中"
 
 #: MainDocument.cpp:2561
 msgid "Aborted by user"
-msgstr "被使用者中止"
+msgstr "被使用者停止"
 
 #: MainDocument.cpp:2564
 msgid "Aborted by project"
-msgstr "被專案中止"
+msgstr "被專案停止"
 
 #: MainDocument.cpp:2567
 msgid "Aborted: not started by deadline"
-msgstr "已中止：回報期限前尚未執行"
+msgstr "已停止：回報期限前尚未執行"
 
 #: MainDocument.cpp:2570
 msgid "Aborted: disk limit exceeded"
-msgstr "已中止：硬碟配置容量不足"
+msgstr "已停止：硬碟配置容量不足"
 
 #: MainDocument.cpp:2573
 msgid "Aborted: run time limit exceeded"
-msgstr "已中止：超過回報期限"
+msgstr "已停止：超過回報期限"
 
 #: MainDocument.cpp:2576
 msgid "Aborted: memory limit exceeded"
-msgstr "已中止：記憶體不足"
+msgstr "已停止：記憶體不足"
 
 #: MainDocument.cpp:2579
 msgid "Aborted"
-msgstr "已中止"
+msgstr "已停止"
 
 #: MainDocument.cpp:2584
 msgid "Acknowledged"
@@ -2377,7 +2377,7 @@ msgid ""
 "manager.\n"
 "\n"
 "Please check the URL and try again."
-msgstr "您所輸入的網址並非基於 BOINC 的帳號管理員。\n請檢查網址後再試一次。"
+msgstr "您所輸入的網址並非基於 BOINC 的帳號管理服務。\n請檢查網址後再試一次。"
 
 #: NotFoundPage.cpp:181
 msgid "Login Failed."
@@ -2443,7 +2443,7 @@ msgstr "專案網址："
 msgid ""
 "This project may not have work for your type of computer.  Do you want to "
 "add it anyway?"
-msgstr "這個專案可能沒有符合您電腦的工作。您確定要加入嗎？"
+msgstr "這個專案可能沒有符合您電腦的任務。您確定要加入嗎？"
 
 #: ProjectInfoPage.cpp:850
 msgid "You already added this project. Please choose a different project."
@@ -2681,28 +2681,28 @@ msgstr "更新"
 msgid ""
 "Report all completed tasks, get latest credit, get latest preferences, and "
 "possibly get more tasks."
-msgstr "回報所有已完成的工作；取得最新的積分與偏好設定資訊且儘可能的取得工作。"
+msgstr "回報所有已完成的任務；取得最新的積分與偏好設定資訊且儘可能的取得任務。"
 
 #: ViewProjects.cpp:181 ViewProjects.cpp:722 ViewWork.cpp:208 ViewWork.cpp:801
 #: sg_BoincSimpleFrame.cpp:757 sg_ProjectCommandPopup.cpp:67
 #: sg_ProjectCommandPopup.cpp:113 sg_TaskCommandPopup.cpp:66
 #: sg_TaskCommandPopup.cpp:106
 msgid "Suspend"
-msgstr "暫止"
+msgstr "暫停"
 
 #: ViewProjects.cpp:182 ViewProjects.cpp:722 sg_ProjectCommandPopup.cpp:68
 #: sg_ProjectCommandPopup.cpp:114
 msgid "Suspend tasks for this project."
-msgstr "暫止此專案的工作。"
+msgstr "暫停此專案的任務。"
 
 #: ViewProjects.cpp:188 ViewProjects.cpp:741 sg_ProjectCommandPopup.cpp:73
 #: sg_ProjectCommandPopup.cpp:121
 msgid "No new tasks"
-msgstr "不要新工作"
+msgstr "不要新任務"
 
 #: ViewProjects.cpp:189 sg_ProjectCommandPopup.cpp:74
 msgid "Don't get new tasks for this project."
-msgstr "不要取得新工作給此專案。"
+msgstr "不要取得新任務給此專案。"
 
 #: ViewProjects.cpp:195 sg_ProjectCommandPopup.cpp:79
 msgid "Reset project"
@@ -2712,13 +2712,13 @@ msgstr "重新開始專案"
 msgid ""
 "Delete all files and tasks associated with this project, and get new tasks."
 "  You can update the project first to report any completed tasks."
-msgstr "刪除所有和此專案相關的檔案和工作後取得新的工作。 在重新開始之前您可以先更新專案來回報已完成的工作。"
+msgstr "刪除所有和此專案相關的檔案和任務後取得新的任務。 在重新開始之前您可以先更新專案來回報已完成的任務。"
 
 #: ViewProjects.cpp:203 sg_ProjectCommandPopup.cpp:86
 msgid ""
 "Remove this project.  Tasks in progress will be lost (use 'Update' first to "
 "report any completed tasks)."
-msgstr "從計畫中退出這台電腦。進行中的工作將會遺失。(在退出之前您可以先按一下「更新」來回報已完成的工作。)"
+msgstr "移除此專案。進行中的任務將會遺失。(您可以先按一下「更新」來回報已完成的任務。)"
 
 #: ViewProjects.cpp:209 ViewWork.cpp:222 sg_ProjectCommandPopup.cpp:91
 #: sg_TaskCommandPopup.cpp:78
@@ -2759,15 +2759,15 @@ msgstr "正在繼續專案..."
 
 #: ViewProjects.cpp:348
 msgid "Suspending project..."
-msgstr "正在暫止專案..."
+msgstr "正在暫停專案..."
 
 #: ViewProjects.cpp:385
 msgid "Telling project to allow additional task downloads..."
-msgstr "通知專案可以下載額外的工作..."
+msgstr "通知專案可以下載額外任務..."
 
 #: ViewProjects.cpp:389
 msgid "Telling project to not fetch any additional tasks..."
-msgstr "通知專案不要取得額外的工作..."
+msgstr "通知專案不要取得額外任務..."
 
 #: ViewProjects.cpp:425
 msgid "Resetting project..."
@@ -2801,19 +2801,19 @@ msgstr "啟動瀏覽器..."
 
 #: ViewProjects.cpp:718 sg_ProjectCommandPopup.cpp:111
 msgid "Resume tasks for this project."
-msgstr "繼續此專案的工作。"
+msgstr "繼續此專案的任務。"
 
 #: ViewProjects.cpp:737 sg_ProjectCommandPopup.cpp:118
 msgid "Allow new tasks"
-msgstr "允許新工作"
+msgstr "允許新任務"
 
 #: ViewProjects.cpp:737 sg_ProjectCommandPopup.cpp:119
 msgid "Allow fetching new tasks for this project."
-msgstr "允許此專案取得新工作。"
+msgstr "允許此專案取得新任務。"
 
 #: ViewProjects.cpp:741 sg_ProjectCommandPopup.cpp:122
 msgid "Don't fetch new tasks for this project."
-msgstr "不要取得新工作給此專案。"
+msgstr "不要取得新任務給此專案。"
 
 #: ViewProjects.cpp:1058
 msgid "Requested by user"
@@ -2821,7 +2821,7 @@ msgstr "用戶的請求"
 
 #: ViewProjects.cpp:1059
 msgid "To fetch work"
-msgstr "取得工作"
+msgstr "取得任務"
 
 #: ViewProjects.cpp:1060
 msgid "To report completed tasks"
@@ -2849,11 +2849,11 @@ msgstr "未知原因"
 
 #: ViewProjects.cpp:1079
 msgid "Suspended by user"
-msgstr "被使用者暫止"
+msgstr "被使用者暫停"
 
 #: ViewProjects.cpp:1082
 msgid "Won't get new tasks"
-msgstr "無法取得新工作"
+msgstr "無法取得新任務"
 
 #: ViewProjects.cpp:1085
 msgid "Project ended - OK to remove"
@@ -2861,7 +2861,7 @@ msgstr "專案已結束 - 按 OK 移除"
 
 #: ViewProjects.cpp:1088
 msgid "Will remove when tasks done"
-msgstr "工作完成後移除"
+msgstr "任務完成後移除"
 
 #: ViewProjects.cpp:1091
 msgid "Scheduler request pending"
@@ -3053,15 +3053,15 @@ msgstr "立即重試"
 
 #: ViewTransfers.cpp:165
 msgid "Retry the file transfer now"
-msgstr "立即重試檔案傳送"
+msgstr "立即重試檔案傳輸"
 
 #: ViewTransfers.cpp:171
 msgid "Abort Transfer"
-msgstr "中止檔案傳送"
+msgstr "停止檔案傳輸"
 
 #: ViewTransfers.cpp:172
 msgid "Abort this file transfer.  You won't get credit for the task."
-msgstr "中止檔案傳送。此工作將不會獲得任何積分。"
+msgstr "停止檔案傳輸。此任務將不會獲得任何積分。"
 
 #: ViewTransfers.cpp:183
 msgid "File"
@@ -3085,11 +3085,11 @@ msgstr "速度"
 
 #: ViewTransfers.cpp:213
 msgid "Transfers"
-msgstr "傳送"
+msgstr "傳輸"
 
 #: ViewTransfers.cpp:280
 msgid "Network activity is suspended - "
-msgstr "網路活動已暫止 -"
+msgstr "網路活動已暫停 -"
 
 #: ViewTransfers.cpp:282
 msgid ""
@@ -3103,11 +3103,11 @@ msgstr "BOINC"
 
 #: ViewTransfers.cpp:292
 msgid "Retrying transfer now..."
-msgstr "立即重試檔案傳送..."
+msgstr "立即重試檔案傳輸..."
 
 #: ViewTransfers.cpp:330
 msgid "Aborting transfer..."
-msgstr "中止檔案傳送中..."
+msgstr "停止檔案傳輸中..."
 
 #: ViewTransfers.cpp:343
 #, c-format
@@ -3115,11 +3115,11 @@ msgid ""
 "Are you sure you want to abort this file transfer '%s'?\n"
 "NOTE: Aborting a transfer will invalidate a task and you\n"
 "will not receive credit for it."
-msgstr "您確定要中止「%s」 的檔案傳輸嗎？\n提示: 終止傳輸會使此工作無效且不會收到任何積分。"
+msgstr "您確定要停止「%s」 的檔案傳輸嗎？\n提示: 終止傳輸會使此任務無效且不會收到任何積分。"
 
 #: ViewTransfers.cpp:349
 msgid "Abort File Transfer"
-msgstr "中止檔案傳送"
+msgstr "停止檔案傳輸"
 
 #: ViewTransfers.cpp:780
 msgid "Upload"
@@ -3139,7 +3139,7 @@ msgstr "失敗"
 
 #: ViewTransfers.cpp:789
 msgid "suspended"
-msgstr "已暫止"
+msgstr "已暫停"
 
 #: ViewTransfers.cpp:794
 msgid "active"
@@ -3159,7 +3159,7 @@ msgstr "顯示運行中"
 
 #: ViewWork.cpp:188 ViewWork.cpp:778
 msgid "Show only active tasks."
-msgstr "只顯示運行中的工作。"
+msgstr "只顯示運行中的任務。"
 
 #: ViewWork.cpp:194 sg_TaskCommandPopup.cpp:60
 msgid "Show graphics"
@@ -3179,19 +3179,19 @@ msgstr "於新視窗中顯示應用程式的圖形。"
 
 #: ViewWork.cpp:209
 msgid "Suspend work for this result."
-msgstr "暫止這個結果的工作。"
+msgstr "暫停此任務。"
 
 #: ViewWork.cpp:215 sg_TaskCommandPopup.cpp:72
 msgid "Abort"
-msgstr "中止"
+msgstr "停止"
 
 #: ViewWork.cpp:216
 msgid "Abandon work on the result. You will get no credit for it."
-msgstr "放棄這個結果的工作。您將不會取得任何積分。"
+msgstr "放棄此任務。您將不會取得任何積分。"
 
 #: ViewWork.cpp:223 sg_TaskCommandPopup.cpp:79
 msgid "Show task details."
-msgstr "顯示工作細節"
+msgstr "顯示任務細節"
 
 #: ViewWork.cpp:235
 msgid "Elapsed"
@@ -3207,59 +3207,59 @@ msgstr "上傳期限"
 
 #: ViewWork.cpp:264
 msgid "Tasks"
-msgstr "工作"
+msgstr "任務"
 
 #: ViewWork.cpp:357
 msgid "Resuming task..."
-msgstr "繼續工作中..."
+msgstr "繼續任務中..."
 
 #: ViewWork.cpp:360
 msgid "Suspending task..."
-msgstr "暫止工作中..."
+msgstr "暫停任務中..."
 
 #: ViewWork.cpp:389
 msgid "Showing graphics for task..."
-msgstr "顯示此工作圖形..."
+msgstr "顯示此任務圖形..."
 
 #: ViewWork.cpp:426
 msgid "Showing VM console for task..."
-msgstr "顯示此工作圖形..."
+msgstr "顯示此任務圖形..."
 
 #: ViewWork.cpp:479
 #, c-format
 msgid ""
 "Are you sure you want to abort this task '%s'?\n"
 "(Progress: %s, Status: %s)"
-msgstr "您確定要中止這個工作「%s」嗎？\n(進度: %s，狀態: %s)"
+msgstr "您確定要停止這個任務「%s」嗎？\n(進度: %s，狀態: %s)"
 
 #: ViewWork.cpp:485
 #, c-format
 msgid "Are you sure you want to abort these %d tasks?"
-msgstr "您確定您要中止 %d 這個工作嗎？"
+msgstr "您確定您要停止 %d 這個任務嗎？"
 
 #: ViewWork.cpp:490 sg_TaskCommandPopup.cpp:256
 msgid "Abort task"
-msgstr "中止工作"
+msgstr "停止任務"
 
 #: ViewWork.cpp:499
 msgid "Aborting task..."
-msgstr "中止檔案傳送中..."
+msgstr "停止任務中..."
 
 #: ViewWork.cpp:771
 msgid "Show all tasks"
-msgstr "顯示所有工作"
+msgstr "顯示所有任務"
 
 #: ViewWork.cpp:772
 msgid "Show all tasks."
-msgstr "顯示所有工作。"
+msgstr "顯示所有任務。"
 
 #: ViewWork.cpp:796 sg_TaskCommandPopup.cpp:103
 msgid "Resume work for this task."
-msgstr "繼續這個工作的動作。"
+msgstr "繼續此任務。"
 
 #: ViewWork.cpp:802 sg_TaskCommandPopup.cpp:107
 msgid "Suspend work for this task."
-msgstr "暫止這個工作的動作。"
+msgstr "暫停此任務。"
 
 #: WelcomePage.cpp:284
 msgid "Add project or account manager"
@@ -3393,7 +3393,7 @@ msgstr "更多的偏好設定，請切換至進階模式。"
 
 #: sg_DlgPreferences.cpp:313
 msgid "Do work only between:"
-msgstr "只在此時段執行工作:"
+msgstr "只在此時段執行任務:"
 
 #: sg_DlgPreferences.cpp:335
 msgid "Connect to internet only between:"
@@ -3413,11 +3413,11 @@ msgstr "CPU 使用率"
 
 #: sg_DlgPreferences.cpp:391
 msgid "Do work while on battery?"
-msgstr "以電池供電時要執行工作嗎？"
+msgstr "以電池供電時要執行任務嗎？"
 
 #: sg_DlgPreferences.cpp:404
 msgid "Do work after idle for:"
-msgstr "閒置多久後執行工作:"
+msgstr "閒置多久後執行任務:"
 
 #: sg_DlgPreferences.cpp:429
 msgid "Clear all local preferences listed above and close the dialog"
@@ -3508,7 +3508,7 @@ msgstr "同步"
 
 #: sg_ProjectPanel.cpp:74
 msgid "Work done for this project"
-msgstr "已完成該專案工作"
+msgstr "已完成該專案任務"
 
 #: sg_ProjectPanel.cpp:77
 msgid "Synchronize projects with account manager system"
@@ -3538,18 +3538,18 @@ msgstr "跳出一個 %s 專案的指令選單"
 
 #: sg_TaskCommandPopup.cpp:67
 msgid "Suspend this task."
-msgstr "已暫止這個工作"
+msgstr "已暫停此任務"
 
 #: sg_TaskCommandPopup.cpp:73
 msgid "Abandon this task. You will get no credit for it."
-msgstr "放棄這個工作。您將不會獲得任何積分。"
+msgstr "放棄此任務。您將不會獲得任何積分。"
 
 #: sg_TaskCommandPopup.cpp:251
 #, c-format
 msgid ""
 "Are you sure you want to abort this task '%s'?\n"
 "(Progress: %.1lf%%, Status: %s)"
-msgstr "您確定要停止此工作 '%s' 嗎?\n(進度: %.1lf%%，狀態: %s)"
+msgstr "您確定要停止此任務 '%s' 嗎?\n(進度: %.1lf%%，狀態: %s)"
 
 #: sg_TaskPanel.cpp:464
 msgid "You don't have any projects.  Please Add a Project."
@@ -3561,11 +3561,11 @@ msgstr "不可行"
 
 #: sg_TaskPanel.cpp:476
 msgid "Tasks:"
-msgstr "工作："
+msgstr "任務："
 
 #: sg_TaskPanel.cpp:482
 msgid "Select a task to access"
-msgstr "選擇要觀看的工作"
+msgstr "選擇要觀看的任務"
 
 #: sg_TaskPanel.cpp:493
 msgid "From:"
@@ -3573,15 +3573,15 @@ msgstr "專案："
 
 #: sg_TaskPanel.cpp:547
 msgid "This task's progress"
-msgstr "本工作的進度"
+msgstr "此任務進度"
 
 #: sg_TaskPanel.cpp:565
 msgid "Task Commands"
-msgstr "工作指令"
+msgstr "任務指令"
 
 #: sg_TaskPanel.cpp:566
 msgid "Pop up a menu of commands to apply to this task"
-msgstr "跳出一個適用於目前工作的指令選單"
+msgstr "跳出一個適用於目前任務的指令選單"
 
 #: sg_TaskPanel.cpp:701
 #, c-format
@@ -3622,31 +3622,31 @@ msgstr "取回目前狀態中。"
 
 #: sg_TaskPanel.cpp:1229
 msgid "Downloading work from the server."
-msgstr "正從伺服器下載工作。"
+msgstr "正從伺服器下載任務。"
 
 #: sg_TaskPanel.cpp:1234
 msgid "Processing Suspended:  Running On Batteries."
-msgstr "處理已暫止: 正以電池供電"
+msgstr "處理已暫停: 正以電池供電"
 
 #: sg_TaskPanel.cpp:1236
 msgid "Processing Suspended:  User Active."
-msgstr "處理已暫止: 使用者正在操作"
+msgstr "處理已暫停: 使用者正在操作"
 
 #: sg_TaskPanel.cpp:1238
 msgid "Processing Suspended:  User paused processing."
-msgstr "處理已暫止: 被使用者暫停"
+msgstr "處理已暫停: 被使用者暫停"
 
 #: sg_TaskPanel.cpp:1240
 msgid "Processing Suspended:  Time of Day."
-msgstr "處理已暫止: 不在設定時間內"
+msgstr "處理已暫停: 不在設定時間內"
 
 #: sg_TaskPanel.cpp:1242
 msgid "Processing Suspended:  Benchmarks Running."
-msgstr "處理已暫止: 正在執行效能測試"
+msgstr "處理已暫停: 正在執行效能測試"
 
 #: sg_TaskPanel.cpp:1244
 msgid "Processing Suspended."
-msgstr "處理已暫止。"
+msgstr "已暫停處理。"
 
 #: sg_TaskPanel.cpp:1248
 msgid "Waiting to contact project servers."
@@ -3658,7 +3658,7 @@ msgstr "取回目前狀態中"
 
 #: sg_TaskPanel.cpp:1256
 msgid "No work available to process"
-msgstr "無工作可用"
+msgstr "無任務可執行"
 
 #: sg_TaskPanel.cpp:1258
 msgid "Unable to connect to the core client"