Commit from Sugar Labs: Translation System by user fallwind.: 371 of 371 messages translated (0 fuzzy).

1 files changed, 764 insertions, 314 deletions

diff --git a/po/zh_TW.po b/po/zh_TW.po
index 1a2b113..fc12fc3 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,58 +6,54 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sugar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-11 00:32-0500\n"
-"PO-Revision-Date: 2010-03-28 16:09+0200\n"
-"Last-Translator: Yuan Chao <yuanchao@gmail.com>\n"
+"POT-Creation-Date: 2011-06-01 00:30-0400\n"
+"PO-Revision-Date: 2011-07-24 18:49+0200\n"
+"Last-Translator: Kenzen <fallwind@seed.net.tw>\n"
 "Language-Team: Yuan CHAO <yuanchao@gmail.com>\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Pootle 2.0.3\n"
+"X-Generator: Pootle 2.0.1\n"
 
 #: ../extensions/cpsection/aboutme/__init__.py:24
 msgid "About Me"
 msgstr "關於我"
 
-#: ../extensions/cpsection/aboutme/model.py:43
+#: ../extensions/cpsection/aboutme/model.py:48
 msgid "You must enter a name."
 msgstr "請輸入姓名"
 
-#: ../extensions/cpsection/aboutme/model.py:68
+#: ../extensions/cpsection/aboutme/model.py:75
 #, python-format
 msgid "stroke:   color=%s hue=%s"
 msgstr "畫筆：   顏色=%s 色澤明暗=%s"
 
-#: ../extensions/cpsection/aboutme/model.py:71
+#: ../extensions/cpsection/aboutme/model.py:78
 #, python-format
 msgid "stroke:   %s"
 msgstr "畫筆：   %s"
 
-#: ../extensions/cpsection/aboutme/model.py:73
+#: ../extensions/cpsection/aboutme/model.py:80
 #, python-format
 msgid "fill:     color=%s hue=%s"
 msgstr "填滿：   顏色=%s 色澤明暗=%s"
 
-#: ../extensions/cpsection/aboutme/model.py:75
+#: ../extensions/cpsection/aboutme/model.py:82
 #, python-format
 msgid "fill:     %s"
 msgstr "填滿：     %s"
 
-#: ../extensions/cpsection/aboutme/model.py:86
+#: ../extensions/cpsection/aboutme/model.py:94
 msgid "Error in specified color modifiers."
 msgstr "指定增修顏色時發生錯誤"
 
-#: ../extensions/cpsection/aboutme/model.py:89
+#: ../extensions/cpsection/aboutme/model.py:97
 msgid "Error in specified colors."
 msgstr "指定顏色時發生錯誤"
 
-#: ../extensions/cpsection/aboutme/view.py:94 ../src/jarabe/intro/window.py:93
-msgid "Name:"
-msgstr "姓名:"
-
-#: ../extensions/cpsection/aboutme/view.py:128
+#: ../extensions/cpsection/aboutme/view.py:235
 msgid "Click to change your color:"
 msgstr "點選改變顏色"
 
@@ -65,43 +61,48 @@ msgstr "點選改變顏色"
 msgid "About my Computer"
 msgstr "我的電腦"
 
-#: ../extensions/cpsection/aboutcomputer/model.py:28
+#: ../extensions/cpsection/aboutcomputer/model.py:37
 msgid "Not available"
 msgstr "不存在"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:60
+#: ../extensions/cpsection/aboutcomputer/model.py:158
+#, python-format
+msgid "%(interface)s: %(version)s"
+msgstr "%(介面): %(版本)"
+
+#: ../extensions/cpsection/aboutcomputer/view.py:61
 msgid "Identity"
 msgstr "身份識別"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:69
+#: ../extensions/cpsection/aboutcomputer/view.py:70
 msgid "Serial Number:"
 msgstr "序號"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:91
+#: ../extensions/cpsection/aboutcomputer/view.py:92
 msgid "Software"
 msgstr "軟體"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:100
+#: ../extensions/cpsection/aboutcomputer/view.py:101
 msgid "Build:"
 msgstr "建立："
 
-#: ../extensions/cpsection/aboutcomputer/view.py:115
+#: ../extensions/cpsection/aboutcomputer/view.py:116
 msgid "Sugar:"
 msgstr "Sugar:"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:131
+#: ../extensions/cpsection/aboutcomputer/view.py:132
 msgid "Firmware:"
 msgstr "韌體："
 
-#: ../extensions/cpsection/aboutcomputer/view.py:146
+#: ../extensions/cpsection/aboutcomputer/view.py:147
 msgid "Wireless Firmware:"
 msgstr "無線網路韌體："
 
-#: ../extensions/cpsection/aboutcomputer/view.py:169
+#: ../extensions/cpsection/aboutcomputer/view.py:170
 msgid "Copyright and License"
 msgstr "版權與授權資料"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:184
+#: ../extensions/cpsection/aboutcomputer/view.py:188
 msgid ""
 "Sugar is the graphical user interface that you are looking at. Sugar is free "
 "software, covered by the GNU General Public License, and you are welcome to "
@@ -109,7 +110,7 @@ msgid ""
 "therein."
 msgstr "Sugar 是您目前所看到的使用者界面，Sugar 是一個自由軟體，以 GNU 的 GPL 授權。歡迎您依據授權條例修改與散佈本軟體。"
 
-#: ../extensions/cpsection/aboutcomputer/view.py:196
+#: ../extensions/cpsection/aboutcomputer/view.py:200
 msgid "Full license:"
 msgstr "完整授權條例："
 
@@ -117,11 +118,11 @@ msgstr "完整授權條例："
 msgid "Date & Time"
 msgstr "日期與時間"
 
-#: ../extensions/cpsection/datetime/model.py:87
+#: ../extensions/cpsection/datetime/model.py:92
 msgid "Error timezone does not exist."
 msgstr "錯誤,時區資料不存在."
 
-#: ../extensions/cpsection/datetime/view.py:68 ../data/sugar.schemas.in.h:33
+#: ../extensions/cpsection/datetime/view.py:70 ../data/sugar.schemas.in.h:52
 msgid "Timezone"
 msgstr "時區"
 
@@ -129,50 +130,50 @@ msgstr "時區"
 msgid "Frame"
 msgstr "畫面"
 
-#: ../extensions/cpsection/frame/model.py:38
-#: ../extensions/cpsection/frame/model.py:60
+#: ../extensions/cpsection/frame/model.py:41
+#: ../extensions/cpsection/frame/model.py:66
 msgid "Value must be an integer."
 msgstr "指定數值必需為整數"
 
-#: ../extensions/cpsection/frame/view.py:26
+#: ../extensions/cpsection/frame/view.py:27
 msgid "never"
 msgstr "永不"
 
-#: ../extensions/cpsection/frame/view.py:27
+#: ../extensions/cpsection/frame/view.py:28
 msgid "instantaneous"
 msgstr "即時"
 
-#: ../extensions/cpsection/frame/view.py:28
+#: ../extensions/cpsection/frame/view.py:29
 #, python-format
 msgid "%s seconds"
 msgstr "%s秒"
 
-#: ../extensions/cpsection/frame/view.py:52
+#: ../extensions/cpsection/frame/view.py:54
 msgid "Activation Delay"
 msgstr "啟用延遲"
 
-#: ../extensions/cpsection/frame/view.py:76
+#: ../extensions/cpsection/frame/view.py:78
 msgid "Corner"
 msgstr "角落"
 
-#: ../extensions/cpsection/frame/view.py:111
+#: ../extensions/cpsection/frame/view.py:113
 msgid "Edge"
 msgstr "邊緣"
 
 #: ../extensions/cpsection/keyboard/__init__.py:21
-#: ../extensions/cpsection/keyboard/view.py:31
+#: ../extensions/cpsection/keyboard/view.py:32
 msgid "Keyboard"
 msgstr "鍵盤"
 
-#: ../extensions/cpsection/keyboard/view.py:189
+#: ../extensions/cpsection/keyboard/view.py:190
 msgid "Keyboard Model"
 msgstr "鍵盤型式"
 
-#: ../extensions/cpsection/keyboard/view.py:248
+#: ../extensions/cpsection/keyboard/view.py:250
 msgid "Key(s) to change layout"
 msgstr "按鍵改變樣式"
 
-#: ../extensions/cpsection/keyboard/view.py:318
+#: ../extensions/cpsection/keyboard/view.py:319
 msgid "Keyboard Layout(s)"
 msgstr "鍵盤樣式"
 
@@ -181,21 +182,21 @@ msgstr "鍵盤樣式"
 msgid "Language"
 msgstr "語言"
 
-#: ../extensions/cpsection/language/model.py:28
+#: ../extensions/cpsection/language/model.py:30
 msgid "Could not access ~/.i18n. Create standard settings."
 msgstr "無法讀取 ~/.i18n。 建立標準設定。"
 
-#: ../extensions/cpsection/language/model.py:124
+#: ../extensions/cpsection/language/model.py:129
 #, python-format
 msgid "Language for code=%s could not be determined."
 msgstr "語系編碼 %s 無法判定"
 
-#: ../extensions/cpsection/language/model.py:144
+#: ../extensions/cpsection/language/model.py:152
 #, python-format
 msgid "Sorry I do not speak '%s'."
 msgstr "抱歉我不會說'%s'."
 
-#: ../extensions/cpsection/language/view.py:56
+#: ../extensions/cpsection/language/view.py:57
 msgid ""
 "Add languages in the order you prefer. If a translation is not available, "
 "the next in the list will be used."
@@ -205,71 +206,85 @@ msgstr "請依序加入你使用的語言。如果優先選定的語言缺少翻
 msgid "Modem Configuration"
 msgstr "數據機設定"
 
-#: ../extensions/cpsection/modemconfiguration/view.py:90
+#: ../extensions/cpsection/modemconfiguration/view.py:94
 msgid "Username:"
 msgstr "使用者帳號："
 
-#: ../extensions/cpsection/modemconfiguration/view.py:101
+#: ../extensions/cpsection/modemconfiguration/view.py:106
 msgid "Password:"
 msgstr "密碼："
 
-#: ../extensions/cpsection/modemconfiguration/view.py:112
+#: ../extensions/cpsection/modemconfiguration/view.py:118
 msgid "Number:"
 msgstr "撥接號碼："
 
-#: ../extensions/cpsection/modemconfiguration/view.py:123
-msgid "APN:"
-msgstr "接取點名稱(APN)："
+#: ../extensions/cpsection/modemconfiguration/view.py:130
+msgid "Access Point Name (APN):"
+msgstr "連接點名稱（apn）"
+
+#: ../extensions/cpsection/modemconfiguration/view.py:142
+msgid "Personal Identity Number (PIN):"
+msgstr "手機個人識別碼（pin）"
+
+#: ../extensions/cpsection/modemconfiguration/view.py:154
+msgid "Personal Unblocking Key (PUK):"
+msgstr "手機硬體解鎖碼（puk）"
+
+#: ../extensions/cpsection/modemconfiguration/view.py:175
+msgid ""
+"You will need to provide the following information to set up a mobile "
+"broadband connection to a cellular (3G) network."
+msgstr "你需要提供下列資訊以設定手機的3G寬頻網路。"
 
 #: ../extensions/cpsection/network/__init__.py:21
-#: ../extensions/cpsection/network/view.py:28
+#: ../extensions/cpsection/network/view.py:29
 msgid "Network"
 msgstr "網路"
 
-#: ../extensions/cpsection/network/model.py:79
+#: ../extensions/cpsection/network/model.py:71
 msgid "State is unknown."
 msgstr "未知狀態"
 
-#: ../extensions/cpsection/network/model.py:105
+#: ../extensions/cpsection/network/model.py:99
 msgid "Error in specified radio argument use on/off."
 msgstr "錯誤的無線網路信號開關設定，請指定on/off。"
 
-#: ../extensions/cpsection/network/model.py:137
+#: ../extensions/cpsection/network/model.py:140
 msgid "Error in specified argument use 0/1."
 msgstr "無線網路信號開關只能設為 0/1。"
 
-#: ../extensions/cpsection/network/view.py:59
+#: ../extensions/cpsection/network/view.py:61
 msgid "Wireless"
 msgstr "無線網路"
 
-#: ../extensions/cpsection/network/view.py:67
+#: ../extensions/cpsection/network/view.py:69
 msgid "Turn off the wireless radio to save battery life"
 msgstr "關閉無線網路信號來增加電池使用時間"
 
-#: ../extensions/cpsection/network/view.py:80
+#: ../extensions/cpsection/network/view.py:82
 msgid "Radio"
 msgstr "無線網路信號"
 
-#: ../extensions/cpsection/network/view.py:96
+#: ../extensions/cpsection/network/view.py:98
 msgid "Discard network history if you have trouble connecting to the network"
 msgstr "如果您遇到連線上的問題，請嘗試清除舊的網路歷史資料"
 
-#: ../extensions/cpsection/network/view.py:105
+#: ../extensions/cpsection/network/view.py:107
 msgid "Discard network history"
 msgstr "清除舊的網路歷史資料"
 
-#: ../extensions/cpsection/network/view.py:118
+#: ../extensions/cpsection/network/view.py:122
 msgid "Collaboration"
 msgstr "協同合作"
 
-#: ../extensions/cpsection/network/view.py:126
+#: ../extensions/cpsection/network/view.py:130
 msgid ""
 "The server is the equivalent of what room you are in; people on the same "
 "server will be able to see each other, even when they aren't on the same "
 "network."
 msgstr "伺服器就等同於你所在的房間，在同一個伺服器上的使用者可以互相看見彼此，即使是實際上他們不在同一個網路中。"
 
-#: ../extensions/cpsection/network/view.py:136
+#: ../extensions/cpsection/network/view.py:140
 msgid "Server:"
 msgstr "伺服器"
 
@@ -277,23 +292,23 @@ msgstr "伺服器"
 msgid "Power"
 msgstr "電源"
 
-#: ../extensions/cpsection/power/model.py:54
+#: ../extensions/cpsection/power/model.py:90
 msgid "Error in automatic pm argument, use on/off."
 msgstr "自動省電管理開關發生錯誤"
 
-#: ../extensions/cpsection/power/model.py:81
+#: ../extensions/cpsection/power/model.py:120
 msgid "Error in extreme pm argument, use on/off."
 msgstr "極度省電管理開關發生錯誤"
 
-#: ../extensions/cpsection/power/view.py:47
+#: ../extensions/cpsection/power/view.py:48
 msgid "Power management"
 msgstr "電源管理"
 
-#: ../extensions/cpsection/power/view.py:57
+#: ../extensions/cpsection/power/view.py:58
 msgid "Automatic power management (increases battery life)"
 msgstr "自動電源管理模式 (增加電池使用時間)"
 
-#: ../extensions/cpsection/power/view.py:85
+#: ../extensions/cpsection/power/view.py:86
 msgid ""
 "Extreme power management (disableswireless radio, increases battery life)"
 msgstr "積極電源管理模式 (關閉無線網路，增加電池使用時間)"
@@ -341,24 +356,25 @@ msgstr "檢查更新中…"
 msgid "Installing updates..."
 msgstr "安裝更新中…"
 
-#: ../extensions/cpsection/updater/view.py:172
+#: ../extensions/cpsection/updater/view.py:173
 #, python-format
 msgid "%s update was installed"
 msgid_plural "%s updates were installed"
 msgstr[0] "已安裝 %s 個更新"
 
-#: ../extensions/cpsection/updater/view.py:253
+#: ../extensions/cpsection/updater/view.py:255
 msgid "Install selected"
 msgstr "安裝選用的"
 
-#: ../extensions/cpsection/updater/view.py:274
+#: ../extensions/cpsection/updater/view.py:276
 #, python-format
 msgid "Download size: %s"
 msgstr "下載檔案大小：%s"
 
-#: ../extensions/cpsection/updater/view.py:362
+#: ../extensions/cpsection/updater/view.py:364
 #, python-format
-msgid "From version %(current)d to %(new)s (Size: %(size)s)"
+#, python-format,
+msgid "From version %(current)s to %(new)s (Size: %(size)s)"
 msgstr "由版本 %(current)d 更新至 %(new)s (大小： %(size)s)"
 
 #. TRANS: download size is 0
@@ -383,28 +399,28 @@ msgstr "%.0f KB"
 msgid "%.1f MB"
 msgstr "%.1f MB"
 
-#: ../extensions/deviceicon/battery.py:58
+#: ../extensions/deviceicon/battery.py:70
 msgid "My Battery"
 msgstr "我的電池狀態"
 
-#: ../extensions/deviceicon/battery.py:137
+#: ../extensions/deviceicon/battery.py:146
 msgid "Removed"
 msgstr "移除"
 
-#: ../extensions/deviceicon/battery.py:140
+#: ../extensions/deviceicon/battery.py:149
 msgid "Charging"
 msgstr "充電中"
 
-#: ../extensions/deviceicon/battery.py:143
+#: ../extensions/deviceicon/battery.py:152
 msgid "Very little power remaining"
 msgstr "電池電源即將用完"
 
-#: ../extensions/deviceicon/battery.py:149
+#: ../extensions/deviceicon/battery.py:157
 #, python-format
 msgid "%(hour)d:%(min).2d remaining"
 msgstr "剩餘 %(hour)d:%(min).2d"
 
-#: ../extensions/deviceicon/battery.py:152
+#: ../extensions/deviceicon/battery.py:160
 msgid "Charged"
 msgstr "充電完成"
 
@@ -417,122 +433,178 @@ msgstr "網路地址： %s"
 # priority over the normal wireless device.  NM doesn't have a "disconnect"
 # method for a device either (for various reasons) so this doesn't
 # have a good mapping
-#: ../extensions/deviceicon/network.py:111
+#: ../extensions/deviceicon/network.py:104
 msgid "Disconnect..."
 msgstr "切斷連線…"
 
-#: ../extensions/deviceicon/network.py:116
-msgid "Create new wireless network"
-msgstr "新增無線網路"
-
 # Only show disconnect when there's a mesh device, because mesh takes
 # priority over the normal wireless device.  NM doesn't have a "disconnect"
 # method for a device either (for various reasons) so this doesn't
 # have a good mapping
-#: ../extensions/deviceicon/network.py:122
-#: ../extensions/deviceicon/network.py:284
-#: ../src/jarabe/desktop/meshbox.py:248 ../src/jarabe/desktop/meshbox.py:537
+#: ../extensions/deviceicon/network.py:112
+#: ../extensions/deviceicon/network.py:290
+#: ../src/jarabe/desktop/networkviews.py:241
+#: ../src/jarabe/desktop/networkviews.py:543
+#: ../src/jarabe/desktop/networkviews.py:671
 msgid "Connecting..."
 msgstr "連線中…"
 
 # TODO: show the channel number
-#: ../extensions/deviceicon/network.py:126
-#: ../extensions/deviceicon/network.py:198
-#: ../extensions/deviceicon/network.py:288
-#: ../src/jarabe/desktop/meshbox.py:254 ../src/jarabe/desktop/meshbox.py:543
+#: ../extensions/deviceicon/network.py:116
+#: ../extensions/deviceicon/network.py:182
+#: ../src/jarabe/desktop/networkviews.py:251
+#: ../src/jarabe/desktop/networkviews.py:549
+#: ../src/jarabe/desktop/networkviews.py:677
 msgid "Connected"
 msgstr "已連線"
 
-#: ../extensions/deviceicon/network.py:158
+#: ../extensions/deviceicon/network.py:142
 msgid "Channel"
 msgstr "頻道"
 
-#: ../extensions/deviceicon/network.py:173
+#: ../extensions/deviceicon/network.py:157
 msgid "Wired Network"
 msgstr "有線網路"
 
-#: ../extensions/deviceicon/network.py:201
+#: ../extensions/deviceicon/network.py:185
 msgid "Speed"
 msgstr "速度"
 
-#: ../extensions/deviceicon/network.py:228
+#: ../extensions/deviceicon/network.py:211
 msgid "Wireless modem"
 msgstr "無線網路數據機"
 
-#: ../extensions/deviceicon/network.py:276
+#: ../extensions/deviceicon/network.py:278
 msgid "Please wait..."
 msgstr "請稍待…"
 
-#: ../extensions/deviceicon/network.py:279
-#: ../src/jarabe/desktop/meshbox.py:164 ../src/jarabe/desktop/meshbox.py:494
+#: ../extensions/deviceicon/network.py:282
+#: ../src/jarabe/desktop/networkviews.py:134
+#: ../src/jarabe/desktop/networkviews.py:500
+#: ../src/jarabe/desktop/networkviews.py:628
 msgid "Connect"
 msgstr "連線"
 
-#: ../extensions/deviceicon/network.py:280
+#: ../extensions/deviceicon/network.py:283
 msgid "Disconnected"
 msgstr "已切斷"
 
-#: ../extensions/deviceicon/network.py:283
-#: ../src/jarabe/controlpanel/toolbar.py:115
-#: ../src/jarabe/desktop/homebox.py:68
-#: ../src/jarabe/frame/activitiestray.py:700
-#: ../src/jarabe/frame/activitiestray.py:799
-#: ../src/jarabe/frame/activitiestray.py:827
+#: ../extensions/deviceicon/network.py:289
+#: ../src/jarabe/controlpanel/toolbar.py:119
+#: ../src/jarabe/desktop/homebox.py:70
+#: ../src/jarabe/frame/activitiestray.py:592
+#: ../src/jarabe/frame/activitiestray.py:692
+#: ../src/jarabe/frame/activitiestray.py:720
 msgid "Cancel"
 msgstr "取消"
 
-#: ../extensions/deviceicon/network.py:287
-#: ../src/jarabe/desktop/meshbox.py:168
+#: ../extensions/deviceicon/network.py:297
+#: ../src/jarabe/desktop/networkviews.py:138
+#: ../src/jarabe/desktop/networkviews.py:504
 msgid "Disconnect"
 msgstr "切斷連線"
 
-#: ../extensions/deviceicon/network.py:530
+#: ../extensions/deviceicon/network.py:327
+msgid "Try connection again"
+msgstr "重試連線"
+
+#: ../extensions/deviceicon/network.py:330
 #, python-format
-msgid "%s's network"
-msgstr "%s 的網路"
+msgid "Error: %s"
+msgstr "錯誤：%s"
+
+#: ../extensions/deviceicon/network.py:334
+#, python-format
+msgid "Suggestion: %s"
+msgstr "建議：%s"
+
+#: ../extensions/deviceicon/network.py:340
+#: ../extensions/deviceicon/network.py:343
+#, python-format
+msgid "Connected for %s"
+msgstr "連線到%s"
+
+#: ../extensions/deviceicon/network.py:348
+#: ../extensions/deviceicon/network.py:349
+#, python-format
+#, python-format,
+msgid "%d KB"
+msgstr "%dKB"
+
+#: ../extensions/deviceicon/network.py:354
+msgid "Check your Pin/Puk configuration."
+msgstr "檢查你的pin/puk設定資訊"
+
+#: ../extensions/deviceicon/network.py:357
+msgid "Check your Access Point Name (APN) configuration"
+msgstr "檢查你的連線點（apn）名稱"
 
-#: ../extensions/deviceicon/network.py:597
-#: ../extensions/deviceicon/network.py:656
+#: ../extensions/deviceicon/network.py:361
+msgid "Check the Number configuration."
+msgstr "檢查撥號號碼"
+
+#: ../extensions/deviceicon/network.py:363
+msgid "Check your configuration."
+msgstr "檢查你的設定"
+
+#: ../extensions/deviceicon/network.py:605
 msgid "Mesh Network"
 msgstr "網狀網路"
 
-#: ../extensions/deviceicon/network.py:857
+#: ../extensions/deviceicon/network.py:648
 #, python-format
-msgid "Data sent %d kb / received %d kb"
-msgstr "資料發送 %d kb / 接收 %d kb"
+#, python-format,
+msgid "Mesh Network %s"
+msgstr "mesh網路 %d"
+
+#: ../extensions/deviceicon/network.py:771
+msgid "No GSM connection available."
+msgstr "沒有gsm連線"
 
-#: ../extensions/deviceicon/network.py:868
-msgid "Connection time "
-msgstr "連線時間 "
+#: ../extensions/deviceicon/network.py:772
+msgid "Create a connection in the control panel."
+msgstr "在控制台建立新連線"
 
-#: ../extensions/deviceicon/speaker.py:59
+#: ../extensions/deviceicon/speaker.py:60
 msgid "My Speakers"
 msgstr "我的喇叭"
 
-#: ../extensions/deviceicon/speaker.py:133
+#: ../extensions/deviceicon/speaker.py:136
 msgid "Unmute"
 msgstr "取消靜音"
 
-#: ../extensions/deviceicon/speaker.py:136
+#: ../extensions/deviceicon/speaker.py:139
 msgid "Mute"
 msgstr "喇叭靜音"
 
+#: ../extensions/deviceicon/touchpad.py:37
+msgid "finger"
+msgstr "手指"
+
+#: ../extensions/deviceicon/touchpad.py:38
+msgid "stylus"
+msgstr "形式"
+
+#: ../extensions/deviceicon/touchpad.py:67
+msgid "My touchpad"
+msgstr "我的觸控版"
+
 #: ../extensions/globalkey/screenshot.py:59
 msgid "Mesh"
 msgstr "網狀網路"
 
 #: ../extensions/globalkey/screenshot.py:61
-#: ../src/jarabe/frame/zoomtoolbar.py:39
+#: ../src/jarabe/frame/zoomtoolbar.py:40
 msgid "Group"
 msgstr "我的群組"
 
 #: ../extensions/globalkey/screenshot.py:63
-#: ../src/jarabe/frame/zoomtoolbar.py:41
+#: ../src/jarabe/frame/zoomtoolbar.py:42
 msgid "Home"
 msgstr "我的家"
 
 #: ../extensions/globalkey/screenshot.py:69
-#: ../src/jarabe/frame/zoomtoolbar.py:43
+#: ../src/jarabe/frame/zoomtoolbar.py:44
 msgid "Activity"
 msgstr "活動"
 
@@ -552,168 +624,254 @@ msgid ""
 msgstr "點選「停用」將於啟動時詢問代號，點選「系統」則恢復使用 UNIX 名稱。"
 
 #: ../data/sugar.schemas.in.h:2
+msgid "Additional directories which can contain updated translations."
+msgstr "能包含新版翻譯的額外目錄"
+
+#: ../data/sugar.schemas.in.h:3
 msgid "Backup URL"
 msgstr "備份網址"
 
-#: ../data/sugar.schemas.in.h:3
+#: ../data/sugar.schemas.in.h:4
+msgid "Bundle IDs of protected activities"
+msgstr "保護活動的Bundle ID"
+
+#: ../data/sugar.schemas.in.h:5
 msgid ""
 "Color for the XO icon that is used throughout the desktop. The string is "
-"composed of the stroke color and fill color, format is that of rbg colors. "
+"composed of the stroke color and fill color, format is that of rgb colors. "
 "Example: #AC32FF,#9A5200"
 msgstr "您選取的顏色將使用在整個桌面當中。顏色指定字串包含了筆畫顏色與填充顏色，格式為紅藍綠三原色的強度。例如： #AC32FF,#9A5200"
 
-#: ../data/sugar.schemas.in.h:4
+#: ../data/sugar.schemas.in.h:6
 msgid "Corner Delay"
 msgstr "角落觸發延遲"
 
-#: ../data/sugar.schemas.in.h:5
+#: ../data/sugar.schemas.in.h:7
 msgid "Default font face"
 msgstr "預設字型"
 
-#: ../data/sugar.schemas.in.h:6
+#: ../data/sugar.schemas.in.h:8
 msgid "Default font size"
 msgstr "預設字體大小"
 
-#: ../data/sugar.schemas.in.h:7
+#: ../data/sugar.schemas.in.h:9
 msgid "Default nick"
 msgstr "預設代號"
 
-#: ../data/sugar.schemas.in.h:8
+#: ../data/sugar.schemas.in.h:10
 msgid "Delay for the activation of the frame using the corners."
 msgstr "當游標移到畫面四角時浮現邊框的延遲時間"
 
-#: ../data/sugar.schemas.in.h:9
+#: ../data/sugar.schemas.in.h:11
 msgid "Delay for the activation of the frame using the edges."
 msgstr "當游標移到畫面邊緣時浮現邊框的延遲時間"
 
-#: ../data/sugar.schemas.in.h:10
+#: ../data/sugar.schemas.in.h:12
+msgid "Directory to search for translations"
+msgstr "到檢索翻譯的目錄"
+
+#: ../data/sugar.schemas.in.h:13
 msgid "Edge Delay"
 msgstr "邊緣觸發延遲"
 
-#: ../data/sugar.schemas.in.h:11
+#: ../data/sugar.schemas.in.h:14
 msgid "Favorites Layout"
 msgstr "偏好的顯示方式"
 
-#: ../data/sugar.schemas.in.h:12
+#: ../data/sugar.schemas.in.h:15
 msgid "Favorites resume mode"
 msgstr "偏好的回復模式"
 
-#: ../data/sugar.schemas.in.h:13
+#: ../data/sugar.schemas.in.h:16
 msgid "Font face that is used throughout the desktop."
 msgstr "預設字型將套用於整個桌面環境"
 
-#: ../data/sugar.schemas.in.h:14
+#: ../data/sugar.schemas.in.h:17
 msgid "Font size that is used throughout the desktop."
 msgstr "預設字體大小將套用於整個桌面環境"
 
-#: ../data/sugar.schemas.in.h:15
+#: ../data/sugar.schemas.in.h:18
+msgid "GSM network APN"
+msgstr "GSM網路的APN"
+
+#: ../data/sugar.schemas.in.h:19
+msgid "GSM network PIN"
+msgstr "GSM網路的PIN"
+
+#: ../data/sugar.schemas.in.h:20
+msgid "GSM network PUK"
+msgstr "GSM網路的PUK"
+
+#: ../data/sugar.schemas.in.h:21
+msgid "GSM network access point name configuration"
+msgstr "GSM網路連接點名稱設定"
+
+#: ../data/sugar.schemas.in.h:22
+msgid "GSM network number"
+msgstr "GSM網路號碼"
+
+#: ../data/sugar.schemas.in.h:23
+msgid "GSM network password"
+msgstr "GSM網路密碼"
+
+#: ../data/sugar.schemas.in.h:24
+msgid "GSM network password configuration"
+msgstr "GSM網路密碼設定"
+
+#: ../data/sugar.schemas.in.h:25
+msgid "GSM network personal identification number configuration"
+msgstr "GSM網路的PIN碼設定"
+
+#: ../data/sugar.schemas.in.h:26
+msgid "GSM network personal unlock key configuration"
+msgstr "GSM網路的PUK碼設定"
+
+#: ../data/sugar.schemas.in.h:27
+msgid "GSM network telephone number configuration"
+msgstr "GSM網路的電話號碼設定"
+
+#: ../data/sugar.schemas.in.h:28
+msgid "GSM network username"
+msgstr "GSM網路的使用者名稱"
+
+#: ../data/sugar.schemas.in.h:29
+msgid "GSM network username configuration"
+msgstr "GSM網路的使用者名稱設定"
+
+#: ../data/sugar.schemas.in.h:30
 msgid ""
 "If TRUE, Sugar will make us searchable for the other users of the Jabber "
 "server."
 msgstr "選擇「是」的話，Sugar 將會讓其他 Jabber 伺服器的使用者可以搜尋到我們"
 
-#: ../data/sugar.schemas.in.h:16
+#: ../data/sugar.schemas.in.h:31
 msgid "If TRUE, Sugar will show a \"Log out\" option."
 msgstr "選擇「是」的話，Sugar 將會顯示『登出』的選項"
 
-#: ../data/sugar.schemas.in.h:17
+#: ../data/sugar.schemas.in.h:32
+msgid "If TRUE, Sugar will show a \"Restart\" option."
+msgstr "選擇「是」的話，Sugar 將會顯示『重新啟動』的選項"
+
+#: ../data/sugar.schemas.in.h:33
+msgid ""
+"If TRUE, Sugar will show default Ad-hoc networks for channel 1,6 and 11. If "
+"Sugar sees no \"known\" network when it starts, it does autoconnect to an Ad-"
+"hoc network."
+msgstr ""
+"選擇「是」的話，Sugar 將會顯示預設在頻道1, 6, 和11的『Ad-hoc』網路。（如果Sugar找不到已知網路，就會自動連到其中一個Ad-"
+"hoc網路。"
+
+#: ../data/sugar.schemas.in.h:34
 msgid "Jabber Server"
 msgstr "Jabber 伺服器"
 
-#: ../data/sugar.schemas.in.h:18
+#: ../data/sugar.schemas.in.h:35
 msgid "Keyboard layouts"
 msgstr "鍵盤排列"
 
-#: ../data/sugar.schemas.in.h:19
+#: ../data/sugar.schemas.in.h:36
 msgid "Keyboard model"
 msgstr "鍵盤型號"
 
-#: ../data/sugar.schemas.in.h:20
+#: ../data/sugar.schemas.in.h:37
 msgid "Keyboard options"
 msgstr "鍵盤選項"
 
-#: ../data/sugar.schemas.in.h:21
+#: ../data/sugar.schemas.in.h:38
 msgid "Layout of the favorites view."
 msgstr "我的最愛顯示方式"
 
-#: ../data/sugar.schemas.in.h:22
+#: ../data/sugar.schemas.in.h:39
 msgid ""
 "List of keyboard layouts. Each entry should be in the form layout(variant)"
 msgstr "鍵盤排列列表，每個項目應該在排列列表中"
 
-#: ../data/sugar.schemas.in.h:23
+#: ../data/sugar.schemas.in.h:40
 msgid "List of keyboard options."
 msgstr "鍵盤排列列表"
 
-#: ../data/sugar.schemas.in.h:24
+#: ../data/sugar.schemas.in.h:41
 msgid "Power Automatic"
 msgstr "自動省電模式"
 
-#: ../data/sugar.schemas.in.h:25
+#: ../data/sugar.schemas.in.h:42
 msgid "Power Automatic."
 msgstr "自動省電模式。"
 
-#: ../data/sugar.schemas.in.h:26
+#: ../data/sugar.schemas.in.h:43
 msgid "Power Extreme"
 msgstr "極度省電模式"
 
-#: ../data/sugar.schemas.in.h:27
+#: ../data/sugar.schemas.in.h:44
 msgid "Power Extreme."
 msgstr "極度省電模式。"
 
-#: ../data/sugar.schemas.in.h:28
+#: ../data/sugar.schemas.in.h:45
 msgid "Publish to Gadget"
 msgstr "發佈到小工具"
 
-#: ../data/sugar.schemas.in.h:29
+#: ../data/sugar.schemas.in.h:46
 msgid "Setting for muting the sound device."
 msgstr "音效設備靜音設定。"
 
-#: ../data/sugar.schemas.in.h:30
+#: ../data/sugar.schemas.in.h:47
 msgid "Show Log out"
 msgstr "顯示登出"
 
-#: ../data/sugar.schemas.in.h:31
+#: ../data/sugar.schemas.in.h:48
+msgid "Show Restart"
+msgstr "顯示重新啟動"
+
+#: ../data/sugar.schemas.in.h:49
+msgid "Show Sugar Ad-hoc networks"
+msgstr "顯示Sugar的Ad-hoc網路"
+
+#: ../data/sugar.schemas.in.h:50
 msgid "Sound Muted"
 msgstr "靜音"
 
-#: ../data/sugar.schemas.in.h:32
+#: ../data/sugar.schemas.in.h:51
 msgid "The keyboard model to be used"
 msgstr "選用的鍵盤型式"
 
-#: ../data/sugar.schemas.in.h:34
+#: ../data/sugar.schemas.in.h:53
 msgid "Timezone setting for the system."
 msgstr "系統的時區設定"
 
-#: ../data/sugar.schemas.in.h:35
+#: ../data/sugar.schemas.in.h:54
 msgid "Url of the jabber server to use."
 msgstr "Jabber 伺服器的網址。"
 
-#: ../data/sugar.schemas.in.h:36
+#: ../data/sugar.schemas.in.h:55
 msgid "Url where the backup is saved to."
 msgstr "備份主機的網址。"
 
-#: ../data/sugar.schemas.in.h:37
+#: ../data/sugar.schemas.in.h:56
 msgid "User Color"
 msgstr "使用者顏色"
 
-#: ../data/sugar.schemas.in.h:38
+#: ../data/sugar.schemas.in.h:57
 msgid "User Name"
 msgstr "使用者名稱"
 
-#: ../data/sugar.schemas.in.h:39
+#: ../data/sugar.schemas.in.h:58
 msgid "User name that is used throughout the desktop."
 msgstr "使用者名稱將用於整個桌面上"
 
-#: ../data/sugar.schemas.in.h:40
+#: ../data/sugar.schemas.in.h:59
+msgid ""
+"Users will not be allowed to erase these activities through the list view."
+msgstr "使用者將不允許在列表檢視中刪除這些活動"
+
+#: ../data/sugar.schemas.in.h:60
 msgid "Volume Level"
 msgstr "音量"
 
-#: ../data/sugar.schemas.in.h:41
+#: ../data/sugar.schemas.in.h:61
 msgid "Volume level for the sound device."
 msgstr "音效設備的音量"
 
-#: ../data/sugar.schemas.in.h:42
+#: ../data/sugar.schemas.in.h:62
 msgid ""
 "When in resume mode, clicking on a favorite icon will cause the last entry "
 "for that activity to be resumed."
@@ -740,7 +898,7 @@ msgstr "Sugar控制台: %s"
 # which must appear in the translated string (msgstr) as well.
 #. TRANS: Translators, there's a empty line at the end of this string,
 #. which must appear in the translated string (msgstr) as well.
-#: ../src/jarabe/controlpanel/cmd.py:37
+#: ../src/jarabe/controlpanel/cmd.py:38
 msgid ""
 "Usage: sugar-control-panel [ option ] key [ args ... ] \n"
 "    Control for the sugar environment. \n"
@@ -764,50 +922,53 @@ msgstr ""
 "    -c key       清除本鍵值的資料 \n"
 "    "
 
-#: ../src/jarabe/controlpanel/cmd.py:50
+#: ../src/jarabe/controlpanel/cmd.py:52
 msgid "To apply your changes you have to restart sugar.\n"
 msgstr "需要重新啟動系統使變更生效.\n"
 
-#: ../src/jarabe/controlpanel/gui.py:281
+#: ../src/jarabe/controlpanel/gui.py:296
+#: ../src/jarabe/journal/journaltoolbox.py:437
+#: ../src/jarabe/journal/palettes.py:150
+#: ../src/jarabe/journal/volumestoolbar.py:289
 msgid "Warning"
 msgstr "警告"
 
-#: ../src/jarabe/controlpanel/gui.py:282
-#: ../src/jarabe/controlpanel/sectionview.py:42
+#: ../src/jarabe/controlpanel/gui.py:297
+#: ../src/jarabe/controlpanel/sectionview.py:41
 msgid "Changes require restart"
 msgstr "改變須要重新啟動才能生效"
 
-#: ../src/jarabe/controlpanel/gui.py:285
+#: ../src/jarabe/controlpanel/gui.py:300
 msgid "Cancel changes"
 msgstr "取消改變"
 
-#: ../src/jarabe/controlpanel/gui.py:290 ../src/jarabe/desktop/homebox.py:70
+#: ../src/jarabe/controlpanel/gui.py:305 ../src/jarabe/desktop/homebox.py:72
 msgid "Later"
 msgstr "稍候"
 
-#: ../src/jarabe/controlpanel/gui.py:294
+#: ../src/jarabe/controlpanel/gui.py:309
 msgid "Restart now"
 msgstr "馬上重新啟動"
 
-#: ../src/jarabe/controlpanel/toolbar.py:61 ../src/jarabe/intro/window.py:206
+#: ../src/jarabe/controlpanel/toolbar.py:63 ../src/jarabe/intro/window.py:201
 msgid "Done"
 msgstr "完成"
 
-#: ../src/jarabe/controlpanel/toolbar.py:121
-#: ../src/jarabe/desktop/favoritesview.py:333
+#: ../src/jarabe/controlpanel/toolbar.py:125
+#: ../src/jarabe/desktop/favoritesview.py:336
 msgid "Ok"
 msgstr "確定"
 
-#: ../src/jarabe/desktop/activitieslist.py:236
+#: ../src/jarabe/desktop/activitieslist.py:230
 #, python-format
 msgid "Version %s"
 msgstr "版本 %s"
 
-#: ../src/jarabe/desktop/activitieslist.py:357
+#: ../src/jarabe/desktop/activitieslist.py:354
 msgid "Confirm erase"
 msgstr "確認刪除"
 
-#: ../src/jarabe/desktop/activitieslist.py:359
+#: ../src/jarabe/desktop/activitieslist.py:356
 #, python-format
 msgid "Confirm erase: Do you want to permanently erase %s?"
 msgstr "確認刪除：您確定要永久地刪除 %s 嗎？"
@@ -816,251 +977,268 @@ msgstr "確認刪除：您確定要永久地刪除 %s 嗎？"
 # TODO: Implement stopping downloads
 # self._stop_item.connect('activate', self._stop_item_activate_cb)
 # self.append_menu_item(self._stop_item)
-#: ../src/jarabe/desktop/activitieslist.py:363
-#: ../src/jarabe/frame/clipboardmenu.py:63
-#: ../src/jarabe/view/viewsource.py:218
+#: ../src/jarabe/desktop/activitieslist.py:360
+#: ../src/jarabe/frame/clipboardmenu.py:64
+#: ../src/jarabe/view/viewsource.py:221
 msgid "Keep"
 msgstr "保存"
 
-#: ../src/jarabe/desktop/activitieslist.py:366
-#: ../src/jarabe/desktop/activitieslist.py:409
-#: ../src/jarabe/journal/journaltoolbox.py:360
-#: ../src/jarabe/journal/palettes.py:105
+#: ../src/jarabe/desktop/activitieslist.py:363
+#: ../src/jarabe/desktop/activitieslist.py:417
+#: ../src/jarabe/journal/journaltoolbox.py:391
+#: ../src/jarabe/journal/palettes.py:112
 msgid "Erase"
 msgstr "刪除"
 
-#: ../src/jarabe/desktop/activitieslist.py:430
+#: ../src/jarabe/desktop/activitieslist.py:433
 msgid "Remove favorite"
 msgstr "移除偏好活動"
 
-#: ../src/jarabe/desktop/activitieslist.py:434
+#: ../src/jarabe/desktop/activitieslist.py:437
 msgid "Make favorite"
 msgstr "指定偏好活動"
 
 # TRANS: label for the freeform layout in the favorites view
 #. TRANS: label for the freeform layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:116
+#: ../src/jarabe/desktop/favoriteslayout.py:127
 msgid "Freeform"
 msgstr "自由格式"
 
 # TRANS: label for the ring layout in the favorites view
 #. TRANS: label for the ring layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:198
+#: ../src/jarabe/desktop/favoriteslayout.py:215
 msgid "Ring"
 msgstr "活動環"
 
 # TRANS: label for the spiral layout in the favorites view
 #. TRANS: label for the spiral layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:337
+#: ../src/jarabe/desktop/favoriteslayout.py:402
 msgid "Spiral"
 msgstr "螺旋"
 
 # TRANS: label for the box layout in the favorites view
 #. TRANS: label for the box layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:404
+#: ../src/jarabe/desktop/favoriteslayout.py:472
 msgid "Box"
 msgstr "方型"
 
 # TRANS: label for the box layout in the favorites view
 #. TRANS: label for the box layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:445
+#: ../src/jarabe/desktop/favoriteslayout.py:515
 msgid "Triangle"
 msgstr "三角形"
 
-#: ../src/jarabe/desktop/favoritesview.py:324
+#: ../src/jarabe/desktop/favoritesview.py:327
 msgid "Registration Failed"
 msgstr "註冊失敗"
 
-#: ../src/jarabe/desktop/favoritesview.py:325
+#: ../src/jarabe/desktop/favoritesview.py:328
 #, python-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/jarabe/desktop/favoritesview.py:327
+#: ../src/jarabe/desktop/favoritesview.py:330
 msgid "Registration Successful"
 msgstr "註冊成功"
 
-#: ../src/jarabe/desktop/favoritesview.py:328
+#: ../src/jarabe/desktop/favoritesview.py:331
 msgid "You are now registered with your school server."
 msgstr "您已經成功註冊到校園主機"
 
-#: ../src/jarabe/desktop/favoritesview.py:630
+#: ../src/jarabe/desktop/favoritesview.py:629
 msgid "Register"
 msgstr "註冊"
 
-#: ../src/jarabe/desktop/homebox.py:63
+#: ../src/jarabe/desktop/favoritesview.py:631
+#: ../src/jarabe/desktop/favoritesview.py:648
+msgid "Register again"
+msgstr "重新註冊"
+
+#: ../src/jarabe/desktop/homebox.py:65
 msgid "Software Update"
 msgstr "軟體更新"
 
-#: ../src/jarabe/desktop/homebox.py:64
+#: ../src/jarabe/desktop/homebox.py:66
 msgid "Update your activities to ensure compatibility with your new software"
 msgstr "更新您的活動來確保新軟體的相容性"
 
-#: ../src/jarabe/desktop/homebox.py:73
+#: ../src/jarabe/desktop/homebox.py:75
 msgid "Check now"
 msgstr "現在就檢查"
 
-#: ../src/jarabe/desktop/homebox.py:192
+#: ../src/jarabe/desktop/homebox.py:193
 msgid "List view"
 msgstr "檢視清單"
 
-#: ../src/jarabe/desktop/homebox.py:193
+#: ../src/jarabe/desktop/homebox.py:194
 msgid "<Ctrl>2"
 msgstr "<Ctrl>2"
 
-#: ../src/jarabe/desktop/homebox.py:255
+#: ../src/jarabe/desktop/homebox.py:257
 msgid "Favorites view"
 msgstr "偏好檢視"
 
-#: ../src/jarabe/desktop/homebox.py:256
+#: ../src/jarabe/desktop/homebox.py:258
 msgid "<Ctrl>1"
 msgstr "<Ctrl>1"
 
-#: ../src/jarabe/desktop/keydialog.py:135
+#: ../src/jarabe/desktop/keydialog.py:143
 msgid "Key Type:"
 msgstr "金鑰類型:"
 
-#: ../src/jarabe/desktop/keydialog.py:155
+#: ../src/jarabe/desktop/keydialog.py:163
 msgid "Authentication Type:"
 msgstr "認證類型:"
 
-#: ../src/jarabe/desktop/keydialog.py:220
+#: ../src/jarabe/desktop/keydialog.py:229
 msgid "WPA & WPA2 Personal"
 msgstr "個人的 WPA & WPA2 加密"
 
-#: ../src/jarabe/desktop/keydialog.py:229
+#: ../src/jarabe/desktop/keydialog.py:238
 msgid "Wireless Security:"
 msgstr "無線網路加密："
 
-#: ../src/jarabe/desktop/meshbox.py:492
-#, python-format
-msgid "Mesh Network %d"
-msgstr "網狀網路 %d"
-
 # TRANS: Action label for resuming an activity.
 #. TRANS: Action label for resuming an activity.
-#: ../src/jarabe/desktop/meshbox.py:629
-#: ../src/jarabe/frame/activitiestray.py:735
-#: ../src/jarabe/journal/journaltoolbox.py:428
-#: ../src/jarabe/journal/palettes.py:65 ../src/jarabe/view/palettes.py:67
+#: ../src/jarabe/desktop/meshbox.py:109
+#: ../src/jarabe/frame/activitiestray.py:627
+#: ../src/jarabe/journal/journaltoolbox.py:488
+#: ../src/jarabe/journal/palettes.py:66 ../src/jarabe/view/palettes.py:78
 msgid "Resume"
 msgstr "回復"
 
-#: ../src/jarabe/desktop/meshbox.py:634
-#: ../src/jarabe/frame/activitiestray.py:233
+#: ../src/jarabe/desktop/meshbox.py:114
+#: ../src/jarabe/frame/activitiestray.py:173
 msgid "Join"
 msgstr "加入"
 
-#: ../src/jarabe/desktop/schoolserver.py:103
+#: ../src/jarabe/desktop/networkviews.py:497
+#, python-format
+msgid "Ad-hoc Network %d"
+msgstr "Ad-hoc 網路 %d"
+
+#: ../src/jarabe/desktop/networkviews.py:626
+#, python-format
+msgid "Mesh Network %d"
+msgstr "網狀網路 %d"
+
+#: ../src/jarabe/desktop/schoolserver.py:131
 msgid "Cannot connect to the server."
 msgstr "無法連線到伺服器"
 
-#: ../src/jarabe/desktop/schoolserver.py:108
+#: ../src/jarabe/desktop/schoolserver.py:136
 msgid "The server could not complete the request."
 msgstr "伺服器無法完成查尋動作"
 
-#: ../src/jarabe/frame/activitiestray.py:238
-#: ../src/jarabe/frame/activitiestray.py:672
+#: ../src/jarabe/frame/activitiestray.py:178
+#: ../src/jarabe/frame/activitiestray.py:564
 msgid "Decline"
 msgstr "拒絕"
 
-#: ../src/jarabe/frame/activitiestray.py:624
+#: ../src/jarabe/frame/activitiestray.py:514
 #, python-format
 msgid "%dB"
 msgstr "%dB"
 
-#: ../src/jarabe/frame/activitiestray.py:626
+#: ../src/jarabe/frame/activitiestray.py:516
 #, python-format
 msgid "%dKB"
 msgstr "%dKB"
 
-#: ../src/jarabe/frame/activitiestray.py:628
+#: ../src/jarabe/frame/activitiestray.py:518
 #, python-format
 msgid "%dMB"
 msgstr "%dMB"
 
-#: ../src/jarabe/frame/activitiestray.py:645
+#: ../src/jarabe/frame/activitiestray.py:535
 #, python-format
 msgid "%s of %s"
 msgstr "%s 之 %s"
 
-#: ../src/jarabe/frame/activitiestray.py:657
+#: ../src/jarabe/frame/activitiestray.py:549
 #, python-format
-msgid "Transfer from %r"
-msgstr "傳送自 %r"
+#, python-format,
+msgid "Transfer from %s"
+msgstr "傳送自 %s"
 
-#: ../src/jarabe/frame/activitiestray.py:667
+#: ../src/jarabe/frame/activitiestray.py:559
 msgid "Accept"
 msgstr "接受"
 
-#: ../src/jarabe/frame/activitiestray.py:690
-#: ../src/jarabe/frame/activitiestray.py:817
+#: ../src/jarabe/frame/activitiestray.py:582
+#: ../src/jarabe/frame/activitiestray.py:710
 #, python-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../src/jarabe/frame/activitiestray.py:724
-#: ../src/jarabe/frame/activitiestray.py:852
+#: ../src/jarabe/frame/activitiestray.py:616
+#: ../src/jarabe/frame/activitiestray.py:745
 msgid "Dismiss"
 msgstr "拒絕"
 
-#: ../src/jarabe/frame/activitiestray.py:787
+#: ../src/jarabe/frame/activitiestray.py:680
 #, python-format
-msgid "Transfer to %r"
-msgstr "傳送給 %r"
+#, python-format,
+msgid "Transfer to %s"
+msgstr "傳送給 %s"
 
-#: ../src/jarabe/frame/clipboardmenu.py:53 ../src/jarabe/view/palettes.py:221
+#: ../src/jarabe/frame/clipboardmenu.py:54 ../src/jarabe/view/palettes.py:220
 msgid "Remove"
 msgstr "移除"
 
-#: ../src/jarabe/frame/clipboardmenu.py:58
-#: ../src/jarabe/frame/clipboardmenu.py:81
+#: ../src/jarabe/frame/clipboardmenu.py:59
+#: ../src/jarabe/frame/clipboardmenu.py:82
 msgid "Open"
 msgstr "開啟"
 
-#: ../src/jarabe/frame/clipboardmenu.py:86
+#: ../src/jarabe/frame/clipboardmenu.py:87
 msgid "Open with"
 msgstr "開啟使用"
 
-#: ../src/jarabe/frame/clipboardobject.py:49
+#: ../src/jarabe/frame/clipboardobject.py:50
 #, python-format
 msgid "%s clipping"
 msgstr "%s 裁剪"
 
-#: ../src/jarabe/frame/zoomtoolbar.py:37
+#: ../src/jarabe/frame/zoomtoolbar.py:38
 msgid "Neighborhood"
 msgstr "我的鄰居"
 
-#: ../src/jarabe/frame/zoomtoolbar.py:37
+#: ../src/jarabe/frame/zoomtoolbar.py:38
 msgid "F1"
 msgstr "F1"
 
-#: ../src/jarabe/frame/zoomtoolbar.py:39
+#: ../src/jarabe/frame/zoomtoolbar.py:40
 msgid "F2"
 msgstr "F2"
 
-#: ../src/jarabe/frame/zoomtoolbar.py:41
+#: ../src/jarabe/frame/zoomtoolbar.py:42
 msgid "F3"
 msgstr "F3"
 
-#: ../src/jarabe/frame/zoomtoolbar.py:43
+#: ../src/jarabe/frame/zoomtoolbar.py:44
 msgid "F4"
 msgstr "F4"
 
-#: ../src/jarabe/intro/window.py:128
+#: ../src/jarabe/intro/window.py:90
+msgid "Name:"
+msgstr "姓名:"
+
+#: ../src/jarabe/intro/window.py:126
 msgid "Click to change color:"
 msgstr "點選改變顏色:"
 
-#: ../src/jarabe/intro/window.py:192 ../src/jarabe/journal/detailview.py:103
+#: ../src/jarabe/intro/window.py:187 ../src/jarabe/journal/detailview.py:105
 msgid "Back"
 msgstr "上一步"
 
-#: ../src/jarabe/intro/window.py:209
+#: ../src/jarabe/intro/window.py:204
 msgid "Next"
 msgstr "下一步"
 
-#: ../src/jarabe/journal/expandedentry.py:152
-#: ../src/jarabe/journal/palettes.py:59
+#: ../src/jarabe/journal/expandedentry.py:154
+#: ../src/jarabe/journal/listmodel.py:144 ../src/jarabe/journal/palettes.py:59
+#: ../src/jarabe/journal/volumestoolbar.py:129
 msgid "Untitled"
 msgstr "未命名"
 
@@ -1074,6 +1252,9 @@ msgid "Kind: %s"
 msgstr "類別: %s"
 
 #: ../src/jarabe/journal/expandedentry.py:262
+#: ../src/jarabe/journal/listmodel.py:150
+#: ../src/jarabe/journal/listmodel.py:158
+#: ../src/jarabe/journal/listmodel.py:166
 msgid "Unknown"
 msgstr "未知"
 
@@ -1087,112 +1268,156 @@ msgstr "日期: %s"
 msgid "Size: %s"
 msgstr "大小: %s"
 
-#: ../src/jarabe/journal/expandedentry.py:286 ../src/jarabe/journal/misc.py:93
+#: ../src/jarabe/journal/expandedentry.py:292
+#: ../src/jarabe/journal/misc.py:108
 msgid "No date"
 msgstr "無日期"
 
-#: ../src/jarabe/journal/expandedentry.py:293
+#: ../src/jarabe/journal/expandedentry.py:299
 msgid "Participants:"
 msgstr "參與者"
 
-#: ../src/jarabe/journal/expandedentry.py:316
+#: ../src/jarabe/journal/expandedentry.py:321
 msgid "Description:"
 msgstr "說明:"
 
-#: ../src/jarabe/journal/expandedentry.py:341
+#: ../src/jarabe/journal/expandedentry.py:346
 msgid "Tags:"
 msgstr "標籤:"
 
-#: ../src/jarabe/journal/journalactivity.py:108
-#: ../src/jarabe/journal/volumestoolbar.py:47
+#: ../src/jarabe/journal/journalactivity.py:115
+#: ../src/jarabe/journal/journaltoolbox.py:456
+#: ../src/jarabe/journal/volumestoolbar.py:350
 msgid "Journal"
 msgstr "日誌"
 
-#: ../src/jarabe/journal/journaltoolbox.py:67
+#: ../src/jarabe/journal/journaltoolbox.py:69
 msgid "Search"
 msgstr "搜尋"
 
-#: ../src/jarabe/journal/journaltoolbox.py:126
+#: ../src/jarabe/journal/journaltoolbox.py:136
 msgid "Anytime"
 msgstr "任何時間"
 
-#: ../src/jarabe/journal/journaltoolbox.py:128
+#: ../src/jarabe/journal/journaltoolbox.py:138
 msgid "Today"
 msgstr "今天"
 
-#: ../src/jarabe/journal/journaltoolbox.py:130
+#: ../src/jarabe/journal/journaltoolbox.py:140
 msgid "Since yesterday"
 msgstr "一天內"
 
 # TRANS: Filter entries modified during the last 7 days.
 #. TRANS: Filter entries modified during the last 7 days.
-#: ../src/jarabe/journal/journaltoolbox.py:132
+#: ../src/jarabe/journal/journaltoolbox.py:142
 msgid "Past week"
 msgstr "一週內"
 
 # TRANS: Filter entries modified during the last 30 days.
 #. TRANS: Filter entries modified during the last 30 days.
-#: ../src/jarabe/journal/journaltoolbox.py:134
+#: ../src/jarabe/journal/journaltoolbox.py:144
 msgid "Past month"
 msgstr "一個月內"
 
 # TRANS: Filter entries modified during the last 356 days.
 #. TRANS: Filter entries modified during the last 356 days.
-#: ../src/jarabe/journal/journaltoolbox.py:136
+#: ../src/jarabe/journal/journaltoolbox.py:146
 msgid "Past year"
 msgstr "一年內"
 
-#: ../src/jarabe/journal/journaltoolbox.py:143
+#: ../src/jarabe/journal/journaltoolbox.py:153
 msgid "Anyone"
 msgstr "任何人"
 
-#: ../src/jarabe/journal/journaltoolbox.py:145
+#: ../src/jarabe/journal/journaltoolbox.py:155
 msgid "My friends"
 msgstr "我的好友"
 
-#: ../src/jarabe/journal/journaltoolbox.py:146
+#: ../src/jarabe/journal/journaltoolbox.py:156
 msgid "My class"
 msgstr "我的類別"
 
 # TRANS: Item in a combo box that filters by entry type.
-#: ../src/jarabe/journal/journaltoolbox.py:274
+#: ../src/jarabe/journal/journaltoolbox.py:298
 msgid "Anything"
 msgstr "所有類別"
 
 # TODO: Add "Start with" menu item
-#: ../src/jarabe/journal/journaltoolbox.py:350
-#: ../src/jarabe/journal/palettes.py:83
+#: ../src/jarabe/journal/journaltoolbox.py:381
+#: ../src/jarabe/journal/palettes.py:90
 msgid "Copy"
 msgstr "複製"
 
+#: ../src/jarabe/journal/journaltoolbox.py:436
+#: ../src/jarabe/journal/volumestoolbar.py:288
+msgid "Entries without a file cannot be copied."
+msgstr "沒有選擇要複製的檔案"
+
+#: ../src/jarabe/journal/journaltoolbox.py:445
+#: ../src/jarabe/journal/volumestoolbar.py:297
+#, python-format
+msgid "Error while copying the entry. %s"
+msgstr "拷貝這個檔案（%s）發生錯誤"
+
+#: ../src/jarabe/journal/journaltoolbox.py:446
+#: ../src/jarabe/journal/volumestoolbar.py:298
+msgid "Error"
+msgstr "錯誤"
+
 # TRANS: Action label for starting an entry.
 #. TRANS: Action label for starting an entry.
-#: ../src/jarabe/journal/journaltoolbox.py:431
-#: ../src/jarabe/journal/palettes.py:68
+#: ../src/jarabe/journal/journaltoolbox.py:491
+#: ../src/jarabe/journal/palettes.py:69
 msgid "Start"
 msgstr "啟動"
 
-#: ../src/jarabe/journal/listview.py:373
+#: ../src/jarabe/journal/journaltoolbox.py:519
+msgid "Sort by date modified"
+msgstr "以日期變更來排序"
+
+#: ../src/jarabe/journal/journaltoolbox.py:520
+msgid "Sort by date created"
+msgstr "以建立日期來排序"
+
+#: ../src/jarabe/journal/journaltoolbox.py:521
+msgid "Sort by size"
+msgstr "以大小排序"
+
+#: ../src/jarabe/journal/journaltoolbox.py:530
+msgid "Sort view"
+msgstr "以檢視來排序"
+
+#: ../src/jarabe/journal/listview.py:380
 msgid "Your Journal is empty"
 msgstr "空白的日誌內容"
 
-#: ../src/jarabe/journal/listview.py:375
+#: ../src/jarabe/journal/listview.py:382
 msgid "No matching entries"
 msgstr "沒有相符的紀錄"
 
-#: ../src/jarabe/journal/listview.py:386
+#: ../src/jarabe/journal/listview.py:393
 msgid "Clear search"
 msgstr "清除搜尋項目"
 
-#: ../src/jarabe/journal/modalalert.py:63
+#: ../src/jarabe/journal/misc.py:273
+#, python-format
+msgid "Older Version Of %s Activity"
+msgstr "更早版本的 %s 活動"
+
+#: ../src/jarabe/journal/misc.py:274
+#, python-format
+msgid "Do you want to downgrade to version %s"
+msgstr "是否想要把版本降回 %s ？"
+
+#: ../src/jarabe/journal/modalalert.py:64
 msgid "Your Journal is full"
 msgstr "日誌空間已滿"
 
-#: ../src/jarabe/journal/modalalert.py:67
+#: ../src/jarabe/journal/modalalert.py:68
 msgid "Please delete some old Journal entries to make space for new ones."
 msgstr "請刪除一些舊的日誌內容來騰出空間給新的日誌"
 
-#: ../src/jarabe/journal/modalalert.py:79
+#: ../src/jarabe/journal/modalalert.py:80
 msgid "Show Journal"
 msgstr "顯示日誌"
 
@@ -1201,110 +1426,316 @@ msgid "Choose an object"
 msgstr "選擇物件"
 
 #: ../src/jarabe/journal/objectchooser.py:151
-#: ../src/jarabe/view/viewsource.py:308
+#: ../src/jarabe/view/viewsource.py:311
 msgid "Close"
 msgstr "關閉"
 
-#: ../src/jarabe/journal/palettes.py:66
+#: ../src/jarabe/journal/palettes.py:67
 msgid "Resume with"
 msgstr "回復活動"
 
-#: ../src/jarabe/journal/palettes.py:69
+#: ../src/jarabe/journal/palettes.py:70
 msgid "Start with"
 msgstr "開始活動"
 
-#: ../src/jarabe/journal/palettes.py:91
+#: ../src/jarabe/journal/palettes.py:83 ../src/jarabe/journal/palettes.py:223
+msgid "No activity to start entry"
+msgstr "找不到可以開始的活動"
+
+#: ../src/jarabe/journal/palettes.py:98
 msgid "Send to"
 msgstr "傳送給"
 
-#: ../src/jarabe/journal/palettes.py:100
+#: ../src/jarabe/journal/palettes.py:107
 msgid "View Details"
 msgstr "檢視詳細內容"
 
-#: ../src/jarabe/journal/palettes.py:178
+#: ../src/jarabe/journal/palettes.py:149
+msgid "Entries without a file cannot be sent."
+msgstr "未選擇檔案前無法送出"
+
+#: ../src/jarabe/journal/palettes.py:188
 msgid "No friends present"
 msgstr "沒有好友上線"
 
-#: ../src/jarabe/journal/palettes.py:183
+#: ../src/jarabe/journal/palettes.py:193
 msgid "No valid connection found"
 msgstr "找不到有效的網路連線"
 
-#: ../src/jarabe/journal/palettes.py:211
+#: ../src/jarabe/journal/palettes.py:221
 msgid "No activity to resume entry"
 msgstr "找不到可以回復的活動"
 
-#: ../src/jarabe/journal/palettes.py:213
-msgid "No activity to start entry"
-msgstr "找不到可以開始的活動"
+#: ../src/jarabe/journal/volumestoolbar.py:373
+#: ../src/jarabe/view/palettes.py:194 ../src/jarabe/view/palettes.py:245
+#, python-format
+msgid "%(free_space)d MB Free"
+msgstr "剩餘 %(free_space)d MB 空間"
+
+#: ../src/jarabe/model/network.py:163
+msgid "The reason for the device state change is unknown."
+msgstr "未知設備改變的理由"
+
+#: ../src/jarabe/model/network.py:165
+msgid "The state change is normal."
+msgstr "正常的狀態改變"
+
+#: ../src/jarabe/model/network.py:167
+msgid "The device is now managed."
+msgstr "設備已經受到管理"
+
+#: ../src/jarabe/model/network.py:169
+msgid "The device is no longer managed."
+msgstr "設備尚未被管理"
+
+#: ../src/jarabe/model/network.py:171
+msgid "The device could not be readied for configuration."
+msgstr "設備還不能被設定"
+
+#: ../src/jarabe/model/network.py:173
+msgid ""
+"IP configuration could not be reserved (no available address, timeout, etc)."
+msgstr "無法預留ip設定（可能為無可用位址或逾時等因素）"
 
-#: ../src/jarabe/view/buddymenu.py:62
+#: ../src/jarabe/model/network.py:176
+msgid "The IP configuration is no longer valid."
+msgstr "這個ip設定不再可用"
+
+#: ../src/jarabe/model/network.py:178
+msgid "Secrets were required, but not provided."
+msgstr "連線需要加密，但是密碼未提供"
+
+#: ../src/jarabe/model/network.py:180
+msgid ""
+"The 802.1X supplicant disconnected from the access point or authentication "
+"server."
+msgstr "802.1X被連接點或認證伺服器斷線"
+
+#: ../src/jarabe/model/network.py:183
+msgid "Configuration of the 802.1X supplicant failed."
+msgstr "802.1X設定失敗"
+
+#: ../src/jarabe/model/network.py:185
+msgid "The 802.1X supplicant quit or failed unexpectedly."
+msgstr "802.1X無預警退出或失敗"
+
+#: ../src/jarabe/model/network.py:187
+msgid "The 802.1X supplicant took too long to authenticate."
+msgstr "802.1X認證時間逾期"
+
+#: ../src/jarabe/model/network.py:189
+msgid "The PPP service failed to start within the allowed time."
+msgstr "ppp撥接服務逾期"
+
+#: ../src/jarabe/model/network.py:191
+msgid "The PPP service disconnected unexpectedly."
+msgstr "ppp服務無預警斷線"
+
+#: ../src/jarabe/model/network.py:193
+msgid "The PPP service quit or failed unexpectedly."
+msgstr "ppp服務無預警失敗或退出"
+
+#: ../src/jarabe/model/network.py:195
+msgid "The DHCP service failed to start within the allowed time."
+msgstr "dhcp服務未在預定時間內開啟"
+
+#: ../src/jarabe/model/network.py:197
+msgid "The DHCP service reported an unexpected error."
+msgstr "dhcp服務回報預期以外的錯誤"
+
+#: ../src/jarabe/model/network.py:199
+msgid "The DHCP service quit or failed unexpectedly."
+msgstr "dhcp服務無預警的退出或失敗"
+
+#: ../src/jarabe/model/network.py:201
+msgid "The shared connection service failed to start."
+msgstr "無法啟動共享連線"
+
+#: ../src/jarabe/model/network.py:203
+msgid "The shared connection service quit or failed unexpectedly."
+msgstr "共享連線無預警的退出或斷線"
+
+#: ../src/jarabe/model/network.py:206
+msgid "The AutoIP service failed to start."
+msgstr "AutoIP服務無法啟動"
+
+#: ../src/jarabe/model/network.py:208
+msgid "The AutoIP service reported an unexpected error."
+msgstr "AutoIP服務回報無預警錯誤"
+
+#: ../src/jarabe/model/network.py:210
+msgid "The AutoIP service quit or failed unexpectedly."
+msgstr "AutoIP服務無預警退出或失敗"
+
+#: ../src/jarabe/model/network.py:212
+msgid "Dialing failed because the line was busy."
+msgstr "撥號失敗，忙線中"
+
+#: ../src/jarabe/model/network.py:214
+msgid "Dialing failed because there was no dial tone."
+msgstr "撥號失敗，無撥號音"
+
+#: ../src/jarabe/model/network.py:216
+msgid "Dialing failed because there was no carrier."
+msgstr "撥號失敗，無連線"
+
+#: ../src/jarabe/model/network.py:218
+msgid "Dialing timed out."
+msgstr "撥號失敗，逾時"
+
+#: ../src/jarabe/model/network.py:220
+msgid "Dialing failed."
+msgstr "撥號失敗"
+
+#: ../src/jarabe/model/network.py:222
+msgid "Modem initialization failed."
+msgstr "數據機初始化失敗"
+
+#: ../src/jarabe/model/network.py:224
+msgid "Failed to select the specified GSM APN"
+msgstr "無法選擇指定的GSM APN"
+
+#: ../src/jarabe/model/network.py:226
+msgid "Not searching for networks."
+msgstr "沒有搜尋網路"
+
+#: ../src/jarabe/model/network.py:228
+msgid "Network registration was denied."
+msgstr "網路註冊失敗"
+
+#: ../src/jarabe/model/network.py:230
+msgid "Network registration timed out."
+msgstr "網路註冊逾時"
+
+#: ../src/jarabe/model/network.py:232
+msgid "Failed to register with the requested GSM network."
+msgstr "向指定的GSM網路註冊失敗"
+
+#: ../src/jarabe/model/network.py:234
+msgid "PIN check failed."
+msgstr "未通過pin檢查"
+
+#: ../src/jarabe/model/network.py:236
+msgid "Necessary firmware for the device may be missing."
+msgstr "遺漏必要的軔體"
+
+#: ../src/jarabe/model/network.py:238
+msgid "The device was removed."
+msgstr "裝置已經移除"
+
+#: ../src/jarabe/model/network.py:240
+msgid "NetworkManager went to sleep."
+msgstr "網路管理員睡眠中"
+
+#: ../src/jarabe/model/network.py:242
+msgid "The device's active connection was removed or disappeared."
+msgstr "裝置的主動連線被移除"
+
+#: ../src/jarabe/model/network.py:245
+msgid "A user or client requested the disconnection."
+msgstr "使用者要求斷線"
+
+#: ../src/jarabe/model/network.py:247
+msgid "The device's carrier/link changed."
+msgstr "裝置的連線已經改變"
+
+#: ../src/jarabe/view/buddymenu.py:64
 msgid "Remove friend"
 msgstr "移除好友"
 
-#: ../src/jarabe/view/buddymenu.py:65
+#: ../src/jarabe/view/buddymenu.py:67
 msgid "Make friend"
 msgstr "結交好友"
 
-#: ../src/jarabe/view/buddymenu.py:82
+#: ../src/jarabe/view/buddymenu.py:84
 msgid "Shutdown"
 msgstr "關機"
 
-#: ../src/jarabe/view/buddymenu.py:90
+#: ../src/jarabe/view/buddymenu.py:92
+msgid "Restart"
+msgstr "重新啟動"
+
+#: ../src/jarabe/view/buddymenu.py:98
 msgid "Logout"
 msgstr "顯示方式"
 
-#: ../src/jarabe/view/buddymenu.py:95
+#: ../src/jarabe/view/buddymenu.py:103
 msgid "My Settings"
 msgstr "我的設定"
 
-#: ../src/jarabe/view/buddymenu.py:130
+#: ../src/jarabe/view/buddymenu.py:139
 #, python-format
 msgid "Invite to %s"
 msgstr "邀請 %s"
 
-#: ../src/jarabe/view/palettes.py:45
+#: ../src/jarabe/view/launcher.py:190
+#, python-format
+msgid "<b>%s</b> failed to start."
+msgstr "<b>%s</b> 無法啟動"
+
+#: ../src/jarabe/view/palettes.py:46
 msgid "Starting..."
 msgstr "啟動中…"
 
+#: ../src/jarabe/view/palettes.py:56
+msgid "Activity failed to start"
+msgstr "這個活動無法啟動"
+
 #. TODO: share-with, keep
-#: ../src/jarabe/view/palettes.py:74
+#: ../src/jarabe/view/palettes.py:85
 msgid "View Source"
 msgstr "檢視原始碼"
 
-#: ../src/jarabe/view/palettes.py:85
+#: ../src/jarabe/view/palettes.py:96
 msgid "Stop"
 msgstr "停止"
 
-#: ../src/jarabe/view/palettes.py:125
+#: ../src/jarabe/view/palettes.py:132
 msgid "Start new"
 msgstr "建立新的"
 
-#: ../src/jarabe/view/palettes.py:174
+#: ../src/jarabe/view/palettes.py:172
 msgid "Show contents"
 msgstr "顯示內容"
 
-#: ../src/jarabe/view/palettes.py:196 ../src/jarabe/view/palettes.py:246
-#, python-format
-msgid "%(free_space)d MB Free"
-msgstr "剩餘 %(free_space)d MB 空間"
-
-#: ../src/jarabe/view/viewsource.py:208
+#: ../src/jarabe/view/viewsource.py:211
 msgid "Instance Source"
 msgstr "範例原始碼"
 
-#: ../src/jarabe/view/viewsource.py:233
+#: ../src/jarabe/view/viewsource.py:236
 msgid "Source"
 msgstr "原始碼"
 
-#: ../src/jarabe/view/viewsource.py:292
+#: ../src/jarabe/view/viewsource.py:295
 msgid "Activity Bundle Source"
 msgstr "預裝活動原始碼"
 
-#: ../src/jarabe/view/viewsource.py:299
+#: ../src/jarabe/view/viewsource.py:302
 #, python-format
 msgid "View source: %r"
 msgstr "查看原始碼： %r"
 
+#: ../src/jarabe/util/emulator.py:40
+msgid "Sugar in a window"
+msgstr "將Sugar放入視窗"
+
+#~ msgid "APN:"
+#~ msgstr "接取點名稱(APN)："
+
+#~ msgid "Create new wireless network"
+#~ msgstr "新增無線網路"
+
+#, python-format
+#~ msgid "%s's network"
+#~ msgstr "%s 的網路"
+
+#, python-format
+#~ msgid "Data sent %d kb / received %d kb"
+#~ msgstr "資料發送 %d kb / 接收 %d kb"
+
+#~ msgid "Connection time "
+#~ msgstr "連線時間 "
+
 #~ msgid "Title"
 #~ msgstr "標題"
 
@@ -1320,9 +1751,6 @@ msgstr "查看原始碼： %r"
 #~ msgid "Unmount"
 #~ msgstr "退出磁碟"
 
-#~ msgid "Restart"
-#~ msgstr "重新啟動"
-
 #~ msgid ""
 #~ "© 2008 One Laptop per Child Association Inc; Red Hat Inc; and Contributors."
 #~ msgstr "© 2008 每童一機 公司; 紅帽 公司; 以及其他的貢獻者"
@@ -1541,3 +1969,25 @@ msgstr "查看原始碼： %r"
 #, python-format
 #~ msgid ", "
 #~ msgstr ","
+
+#~ msgid "Cannot compute CPU and memory usage statistics!"
+#~ msgstr "無法統計cpu與記憶體使用量"
+
+#, python-format
+#~ msgid "Transfer from %r"
+#~ msgstr "傳送自 %r"
+
+#, python-format
+#~ msgid "Transfer to %r"
+#~ msgstr "傳送給 %r"
+
+#, python-format
+#~ msgid "CPU in use: %d%%"
+#~ msgstr "cpu使用比例：%d%%"
+
+#, python-format
+#~ msgid "Memory in use: %d%%"
+#~ msgstr "記憶體使用比例：%d%%"
+
+#~ msgid "System resources"
+#~ msgstr "系統資源"