diff --git a/po/zh_TW.po b/po/zh_TW.po
index 2cacea23..b3526bf3 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,178 +6,203 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-20 00:31-0500\n"
-"PO-Revision-Date: 2009-01-28 19:22-0500\n"
+"POT-Creation-Date: 2009-08-26 00:33-0400\n"
+"PO-Revision-Date: 2009-12-22 08:05-0400\n"
 "Last-Translator: Yuan Chao <yuanchao@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0rc2\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 1.2.1\n"
 
-#: ../src/sugar/activity/activity.py:123
-msgid "Share with:"
-msgstr "分享給："
-
-#: ../src/sugar/activity/activity.py:125
-msgid "Private"
-msgstr "私人"
-
-#: ../src/sugar/activity/activity.py:126
-msgid "My Neighborhood"
-msgstr "我的鄰居"
-
-#: ../src/sugar/activity/activity.py:133
-#: ../src/sugar/activity/namingalert.py:65
-msgid "Keep"
-msgstr "保存"
-
-#: ../src/sugar/activity/activity.py:144
-msgid "Stop"
-msgstr "停止"
-
-#: ../src/sugar/activity/activity.py:258
-msgid "Undo"
-msgstr "復原"
-
-#: ../src/sugar/activity/activity.py:263
-msgid "Redo"
-msgstr "取消復原"
-
-#: ../src/sugar/activity/activity.py:273
-msgid "Copy"
-msgstr "複製"
-
-#: ../src/sugar/activity/activity.py:278
-msgid "Paste"
-msgstr "貼上"
-
-#: ../src/sugar/activity/activity.py:304
-msgid "Activity"
-msgstr "活動"
-
-#: ../src/sugar/activity/activity.py:542
+#: ../src/sugar/activity/activity.py:329
 #, python-format
 msgid "%s Activity"
 msgstr "%s 活動"
 
-#: ../src/sugar/activity/activity.py:910
+#: ../src/sugar/activity/activity.py:714
 msgid "Keep error"
 msgstr "保存時發生錯誤"
 
-#: ../src/sugar/activity/activity.py:911
+#: ../src/sugar/activity/activity.py:715
 msgid "Keep error: all changes will be lost"
 msgstr "保存時發生錯誤：所作的變動將遺失"
 
-#: ../src/sugar/activity/activity.py:914
+#: ../src/sugar/activity/activity.py:718
 msgid "Don't stop"
 msgstr "不停止"
 
-#: ../src/sugar/activity/activity.py:917
+#: ../src/sugar/activity/activity.py:721
 msgid "Stop anyway"
 msgstr "確定停止"
 
-#: ../src/sugar/activity/namingalert.py:60
+#: ../src/sugar/activity/namingalert.py:82
 msgid "Name this entry"
 msgstr "命名"
 
-#: ../src/sugar/activity/namingalert.py:248
+#: ../src/sugar/activity/namingalert.py:87
+#: ../src/sugar/activity/widgets.py:162
+msgid "Keep"
+msgstr "保存"
+
+#: ../src/sugar/activity/namingalert.py:283
 msgid "Untitled"
 msgstr "未命名"
 
-#: ../src/sugar/activity/namingalert.py:255
+#: ../src/sugar/activity/namingalert.py:290
 msgid "Description:"
 msgstr "描述："
 
-#: ../src/sugar/activity/namingalert.py:279
+#: ../src/sugar/activity/namingalert.py:314
 msgid "Tags:"
 msgstr "標籤："
 
-#: ../src/sugar/graphics/alert.py:288 ../src/sugar/graphics/alert.py:367
+#: ../src/sugar/activity/widgets.py:79
+msgid "Stop"
+msgstr "停止"
+
+#: ../src/sugar/activity/widgets.py:91
+msgid "Undo"
+msgstr "復原"
+
+#: ../src/sugar/activity/widgets.py:99
+msgid "Redo"
+msgstr "取消復原"
+
+#: ../src/sugar/activity/widgets.py:106
+msgid "Copy"
+msgstr "複製"
+
+#: ../src/sugar/activity/widgets.py:113
+msgid "Paste"
+msgstr "貼上"
+
+#: ../src/sugar/activity/widgets.py:123
+msgid "Private"
+msgstr "私人"
+
+#: ../src/sugar/activity/widgets.py:130
+msgid "My Neighborhood"
+msgstr "我的鄰居"
+
+#: ../src/sugar/activity/widgets.py:341
+msgid "Activity"
+msgstr "活動"
+
+#: ../src/sugar/graphics/alert.py:286 ../src/sugar/graphics/alert.py:365
 msgid "Cancel"
 msgstr "取消"
 
-#: ../src/sugar/graphics/alert.py:292 ../src/sugar/graphics/alert.py:426
+#: ../src/sugar/graphics/alert.py:290 ../src/sugar/graphics/alert.py:424
 msgid "Ok"
 msgstr "確定"
 
-#: ../src/sugar/graphics/alert.py:377
+#: ../src/sugar/graphics/alert.py:375
 msgid "Continue"
 msgstr "繼續"
 
-#: ../src/sugar/graphics/colorbutton.py:49
+#: ../src/sugar/graphics/colorbutton.py:52
 msgid "Choose a color"
 msgstr "選擇喜歡的顏色"
 
-#: ../src/sugar/graphics/colorbutton.py:262
+#: ../src/sugar/graphics/colorbutton.py:272
 msgid "Red"
 msgstr "紅色"
 
-#: ../src/sugar/graphics/colorbutton.py:264
+#: ../src/sugar/graphics/colorbutton.py:274
 msgid "Green"
 msgstr "綠色"
 
-#: ../src/sugar/graphics/colorbutton.py:266
+#: ../src/sugar/graphics/colorbutton.py:276
 msgid "Blue"
 msgstr "藍色"
 
-#: ../src/sugar/util.py:194
+#: ../src/sugar/util.py:218
 msgid " and "
 msgstr " 和 "
 
-#: ../src/sugar/util.py:195
+#: ../src/sugar/util.py:219
 msgid ", "
 msgstr ", "
 
 # TRANS: Indicating something that just happened, eg. "just now", "moments ago"
 #. TRANS: Indicating something that just happened, eg. "just now", "moments ago"
-#: ../src/sugar/util.py:198
+#: ../src/sugar/util.py:222
 msgid "Seconds ago"
-msgstr "秒鐘前"
+msgstr "數秒鐘前"
 
 # TRANS: Indicating time passed, eg. "[10 day, 5 hours] ago",
 # "[2 minutes] in the past", or "[3 years, 1 month] earlier"
 #. TRANS: Indicating time passed, eg. "[10 day, 5 hours] ago",
 #. "[2 minutes] in the past", or "[3 years, 1 month] earlier"
-#: ../src/sugar/util.py:202
+#: ../src/sugar/util.py:226
 #, python-format
 msgid "%s ago"
 msgstr "%s 前"
 
 # TRANS: Relative dates (eg. 1 month and 5 days).
 #. TRANS: Relative dates (eg. 1 month and 5 days).
-#: ../src/sugar/util.py:215
+#: ../src/sugar/util.py:241
 #, python-format
 msgid "%d year"
 msgid_plural "%d years"
 msgstr[0] "%d 年"
 
-#: ../src/sugar/util.py:216
+#: ../src/sugar/util.py:242
 #, python-format
 msgid "%d month"
 msgid_plural "%d months"
 msgstr[0] "%d 個月"
 
-#: ../src/sugar/util.py:217
+#: ../src/sugar/util.py:243
 #, python-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d 週"
 
-#: ../src/sugar/util.py:218
+#: ../src/sugar/util.py:244
 #, python-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d 天"
 
-#: ../src/sugar/util.py:219
+#: ../src/sugar/util.py:245
 #, python-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d 小時"
 
-#: ../src/sugar/util.py:220
+#: ../src/sugar/util.py:246
 #, python-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d 分鐘"
+
+#: ../src/sugar/util.py:339
+msgid "Empty"
+msgstr "無"
+
+#: ../src/sugar/util.py:341
+#, python-format
+msgid "%d B"
+msgstr "%d B"
+
+#: ../src/sugar/util.py:343
+#, python-format
+msgid "%d KB"
+msgstr "%d KB"
+
+#: ../src/sugar/util.py:345
+#, python-format
+msgid "%d MB"
+msgstr "%d MB"
+
+#: ../src/sugar/util.py:347
+#, python-format
+msgid "%d GB"
+msgstr "%d GB"
+
+#~ msgid "Share with:"
+#~ msgstr "分享給："