changing recaptcha descriptive text not to include numbers anymore (bug 468561, r=clouserw)

git-svn-id: http://svn.mozilla.org/addons/trunk@21086 4eb1ac78-321c-0410-a911-ec516a8615a5

1 files changed, 559 insertions, 485 deletions

diff --git a/site/app/locale/zh_TW/LC_MESSAGES/messages.po b/site/app/locale/zh_TW/LC_MESSAGES/messages.po
index 77a86bf..c4ad2a3 100644
--- a/site/app/locale/zh_TW/LC_MESSAGES/messages.po
+++ b/site/app/locale/zh_TW/LC_MESSAGES/messages.po
@@ -16,11 +16,11 @@ msgstr ""
 msgid "a_cancel_installation"
 msgstr "取消安裝"
 
-#: views/elements/install.thtml:65 views/elements/install.thtml:183
-#: views/elements/install.thtml:191 views/elements/install.thtml:216
-#: views/elements/install.thtml:228 views/addons/plugins.thtml:61
-#: views/addons/plugins.thtml:72 views/addons/plugins.thtml:84
-#: views/addons/plugins.thtml:96 views/addons/plugins.thtml:128
+#: views/addons/plugins.thtml:61 views/addons/plugins.thtml:72
+#: views/addons/plugins.thtml:84 views/addons/plugins.thtml:96
+#: views/addons/plugins.thtml:128 views/elements/install.thtml:65
+#: views/elements/install.thtml:183 views/elements/install.thtml:191
+#: views/elements/install.thtml:216 views/elements/install.thtml:228
 #, php-format
 msgid "a_download"
 msgstr "立刻下載 %s"
@@ -33,56 +33,56 @@ msgstr "接受並下載"
 msgid "a_eula_install"
 msgstr "接受並安裝"
 
-#: views/elements/header.thtml:76 views/elements/header.thtml:82
-#: views/api/api_addon.thtml:50
+#: views/api/api_addon.thtml:55 views/elements/header.thtml:76
+#: views/elements/header.thtml:82
 msgid "a_header_public"
 msgstr "公開"
 
-#: views/elements/header.thtml:58 views/elements/header.thtml:75
-#: views/elements/header.thtml:80 views/api/api_addon.thtml:52
+#: views/api/api_addon.thtml:57 views/elements/header.thtml:58
+#: views/elements/header.thtml:75 views/elements/header.thtml:80
 msgid "a_header_sandbox"
 msgstr "沙箱"
 
-#: views/elements/collections_interactive_addon.thtml:84
+#: views/elements/collections_interactive_addon.thtml:85
 #, php-format
 msgid "added"
 msgstr "已新增 %s"
 
-#: views/elements/addon_listitem.thtml:146 views/elements/feature.thtml:95
-#: views/addons/display.thtml:107 views/addons/browse_thumbs.thtml:87
+#: views/addons/browse_thumbs.thtml:87 views/addons/display.thtml:103
+#: views/elements/addon_listitem.thtml:144 views/elements/feature.thtml:111
 msgid "addon_detail_last_updated"
 msgstr "更新時間：%s"
 
+#: views/elements/addon_listitem.thtml:95
 #: views/elements/addon_version_detail.thtml:51
-#: views/elements/addon_listitem.thtml:92
 #, php-format
 msgid "addon_display_header_version"
 msgstr "版本 %s"
 
-#: views/elements/addon_listitem.thtml:137 views/elements/feature.thtml:87
-#: views/addons/display.thtml:119 views/addons/browse_thumbs.thtml:94
+#: views/addons/browse_thumbs.thtml:94 views/addons/display.thtml:115
+#: views/elements/addon_listitem.thtml:135 views/elements/feature.thtml:103
 msgid "addon_downloads"
 msgstr "次下載"
 
-#: views/addons/display.thtml:123
+#: views/addons/display.thtml:119
 msgid "addon_downloads_total"
 msgstr "總下載次數"
 
-#: views/elements/addon_listitem.thtml:137 views/elements/feature.thtml:87
-#: views/addons/display.thtml:118 views/addons/display.thtml:122
-#: views/addons/browse_thumbs.thtml:94
+#: views/addons/browse_thumbs.thtml:94 views/addons/display.thtml:114
+#: views/addons/display.thtml:118 views/elements/addon_listitem.thtml:135
+#: views/elements/feature.thtml:103
 msgid "addon_downloads_weekly"
 msgstr "本週下載次數"
 
 # %1 is the add-on count, %2 the category name
-#: views/addons/browse_thumbs.thtml:118 views/addons/browse.thtml:75
+#: views/addons/browse.thtml:75 views/addons/browse_thumbs.thtml:118
 #, php-format
 msgid "addon_list_category_totalcount"
 msgid_plural "addon_list_category_totalcount"
 msgstr[0] "%1$s 個元件"
 
-#: views/elements/pagination.thtml:67
 #: views/elements/addon_list_options.thtml:94
+#: views/elements/pagination.thtml:67
 msgid "addon_list_perpage"
 msgstr "每頁顯示"
 
@@ -90,13 +90,13 @@ msgstr "每頁顯示"
 msgid "addon_list_sortby"
 msgstr "排序依照："
 
-#: views/elements/addon_listitem.thtml:69 views/elements/feature.thtml:73
-#: views/addons/display.thtml:51 views/addons/browse_thumbs.thtml:67
-#: views/addons/versions.thtml:72
+#: views/addons/browse_thumbs.thtml:67 views/addons/display.thtml:51
+#: views/addons/versions.thtml:72 views/elements/addon_listitem.thtml:69
+#: views/elements/feature.thtml:89
 msgid "addon_listitem_flag_experimental"
 msgstr "實驗中"
 
-#: views/addons/browse_thumbs.thtml:70
+#: views/addons/browse_thumbs.thtml:70 views/elements/addon_listitem.thtml:72
 msgid "addon_listitem_flag_recommended"
 msgstr "推薦"
 
@@ -105,21 +105,17 @@ msgstr "推薦"
 msgid "addon_not_available_for_platform"
 msgstr "%1$s 無法在 %2$s 上使用。"
 
-#: views/elements/addon_listitem.thtml:131 views/addons/display.thtml:100
-msgid "addon_recommended"
-msgstr "Mozilla 推薦此附加元件"
-
 # %1 is the addon name
 #: views/addons/policy.thtml:107 views/addons/previews.thtml:60
-#: views/addons/versions.thtml:113 views/reviews/flag.thtml:59
-#: views/reviews/add.thtml:128 views/reviews/display.thtml:221
+#: views/addons/versions.thtml:113 views/reviews/add.thtml:128
+#: views/reviews/display.thtml:221 views/reviews/flag.thtml:59
 #: views/reviews/review_added.thtml:53
 #, php-format
 msgid "addon_review_a_back_to_addon_x"
 msgstr "回到 %1$s…"
 
 # %1 is the addon name
-#: views/reviews/flag.thtml:58 views/reviews/add.thtml:127
+#: views/reviews/add.thtml:127 views/reviews/flag.thtml:58
 #: views/reviews/review_added.thtml:52
 #, php-format
 msgid "addon_review_a_back_to_reviews"
@@ -225,7 +221,7 @@ msgstr "開發者回覆："
 msgid "addon_review_saved_successfully"
 msgstr "您的意見已成功儲存，感謝！"
 
-#: views/addons/display.thtml:288 views/addons/display.thtml:291
+#: views/addons/display.thtml:284 views/addons/display.thtml:287
 #: views/reviews/display.thtml:72 views/reviews/display.thtml:75
 #, php-format
 msgid "addon_reviewed_by_u_on_d"
@@ -239,14 +235,14 @@ msgid "addon_reviewed_on_x_rated_y"
 msgstr "作者：%1$s 日期：%2$s（給 %3$s 分）"
 
 #: views/addons/category_landing.thtml:138
-#: views/addons/category_landing.thtml:139 views/addons/home.thtml:106
-#: views/addons/home.thtml:107
+#: views/addons/category_landing.thtml:139 views/addons/home.thtml:113
+#: views/addons/home.thtml:114
 msgid "addon_slider_tooltip_next"
 msgstr "下一個附加元件"
 
 #: views/addons/category_landing.thtml:128
-#: views/addons/category_landing.thtml:129 views/addons/home.thtml:96
-#: views/addons/home.thtml:97
+#: views/addons/category_landing.thtml:129 views/addons/home.thtml:103
+#: views/addons/home.thtml:104
 msgid "addon_slider_tooltip_previous"
 msgstr "上一個附加元件"
 
@@ -258,15 +254,15 @@ msgstr "到此版本的固定鏈結"
 msgid "addon_versions_getlatesttext"
 msgstr "此元件最新版本相容於"
 
-#: views/addons/display.thtml:435
+#: views/addons/display.thtml:431
 msgid "addons_author_addons_submit"
 msgstr "衝"
 
-#: views/elements/feature.thtml:79
+#: views/elements/feature.thtml:95 views/elements/fyf_promotion.thtml:51
 msgid "addons_author_tooltip"
 msgstr "檢視作者個人檔案"
 
-#: controllers/addons_controller.php:679
+#: controllers/addons_controller.php:678
 #, php-format
 msgid "addons_browse_browse_category"
 msgstr "瀏覽%s"
@@ -275,7 +271,7 @@ msgstr "瀏覽%s"
 msgid "addons_display_add_review"
 msgstr "新增意見"
 
-#: views/addons/display.thtml:315
+#: views/addons/display.thtml:311
 msgid "addons_display_advanced_details"
 msgstr "詳細資訊"
 
@@ -283,11 +279,11 @@ msgstr "詳細資訊"
 msgid "addons_display_categories"
 msgstr "分類"
 
-#: views/addons/display.thtml:386
+#: views/addons/display.thtml:382
 msgid "addons_display_detailed_review"
 msgstr "填寫詳細意見"
 
-#: views/addons/display.thtml:371 views/reviews/add.thtml:103
+#: views/addons/display.thtml:367 views/reviews/add.thtml:103
 #: views/reviews/add.thtml:104
 msgid "addons_display_dont_like_it"
 msgstr "不喜歡"
@@ -296,132 +292,134 @@ msgstr "不喜歡"
 msgid "addons_display_edit_review"
 msgstr "編輯您的意見"
 
-#: views/addons/display.thtml:146
+#: views/addons/display.thtml:142
 msgid "addons_display_has_privacy"
 msgstr "本元件有自己的隱私政策。"
 
-#: views/addons/display.thtml:370 views/reviews/add.thtml:101
+#: views/addons/display.thtml:366 views/reviews/add.thtml:101
 #: views/reviews/add.thtml:102
 msgid "addons_display_hate_it"
 msgstr "討厭"
 
-#: views/addons/display.thtml:318
+#: views/addons/display.thtml:314
 msgid "addons_display_header_developer_comments"
 msgstr "開發者留言"
 
-#: views/addons/display.thtml:211 views/addons/display.thtml:214
+#: views/addons/display.thtml:207 views/addons/display.thtml:210
 msgid "addons_display_header_homepage"
 msgstr "網站首頁"
 
-#: views/addons/display.thtml:267
+#: views/addons/display.thtml:263
 msgid "addons_display_header_reviews"
 msgstr "意見"
 
-#: views/addons/display.thtml:228 views/addons/display.thtml:231
+#: views/addons/display.thtml:224 views/addons/display.thtml:227
 msgid "addons_display_header_support"
 msgstr "技術支援"
 
-#: views/addons/display.thtml:372 views/reviews/add.thtml:105
+#: views/addons/display.thtml:368 views/reviews/add.thtml:105
 #: views/reviews/add.thtml:106
 msgid "addons_display_like_it"
 msgstr "喜歡"
 
-#: views/addons/display.thtml:189
+#: views/addons/display.thtml:185
 msgid "addons_display_long_description"
 msgstr "完整敘述"
 
-#: views/addons/display.thtml:374 views/reviews/add.thtml:109
+#: views/addons/display.thtml:370 views/reviews/add.thtml:109
 #: views/reviews/add.thtml:110
 msgid "addons_display_love_it"
 msgstr "喜愛"
 
-#: views/addons/display.thtml:159
+#: views/addons/display.thtml:155
 msgid "addons_display_more_images"
 msgstr "更多圖片"
 
-#: views/addons/display.thtml:424
+#: views/addons/display.thtml:420
 #, php-format
 msgid "addons_display_other_addons_by"
 msgstr "%1$s 的其他作品"
 
-#: controllers/addons_controller.php:162 controllers/addons_controller.php:1098
+#: controllers/addons_controller.php:160
+#: controllers/addons_controller.php:1097
 #, php-format
 msgid "addons_display_pagetitle"
 msgstr "%s"
 
-#: views/addons/display.thtml:258
+#: views/addons/display.thtml:254
 #, php-format
 msgid "addons_display_paragraph_supportinfoemail"
 msgstr "此套件由作者於 %s 提供 Email 技術支援"
 
-#: views/addons/display.thtml:241
+#: views/addons/display.thtml:237
 #, php-format
 msgid "addons_display_paragraph_supportinfoemailurl"
 msgstr "此套件由作者於 %s 與 %s 提供技術支援"
 
-#: views/addons/display.thtml:250
+#: views/addons/display.thtml:246
 #, php-format
 msgid "addons_display_paragraph_supportinfourl"
 msgstr "此套件由作者於 %s 提供技術支援"
 
-#: views/addons/display.thtml:368
+#: views/addons/display.thtml:364
 msgid "addons_display_rate_it"
 msgstr "評分"
 
-#: views/addons/display.thtml:373 views/reviews/add.thtml:107
+#: views/addons/display.thtml:369 views/reviews/add.thtml:107
 #: views/reviews/add.thtml:108
 msgid "addons_display_really_like_it"
 msgstr "非常喜歡"
 
-#: views/addons/display.thtml:390 views/addons/display.thtml:393
+#: views/addons/display.thtml:386 views/addons/display.thtml:389
 msgid "addons_display_review_etiquette"
 msgstr ""
 "請勿在此回報程式錯誤。因為我們並不會記錄您的 Email 地址，若開發者想得知進一步"
 "的細節以解決問題時就無法與您聯絡了。"
 
 # %1 is the review guidelines link
-#: views/addons/display.thtml:408
+#: views/addons/display.thtml:404
 msgid "addons_display_review_guidelines_link"
 msgstr "<a href=\"%s\">意見撰寫指南</a>"
 
 # %1 is the support section link
-#: views/addons/display.thtml:399 views/addons/display.thtml:403
+#: views/addons/display.thtml:395 views/addons/display.thtml:399
 #, php-format
 msgid "addons_display_review_see_support"
-msgstr "請見 <a href=\"%1$s\">技術支援</a> 一節了解如何取得此元件的進一步協助。"
+msgstr ""
+"請見 <a href=\"%1$s\">技術支援</a> 一節了解如何取得此元件的進一步協助。"
 
-#: views/addons/display.thtml:382
+#: views/addons/display.thtml:378
 msgid "addons_display_review_submit"
 msgstr "儲存"
 
-#: views/addons/display.thtml:418
+#: views/addons/display.thtml:414
 #, php-format
 msgid "addons_display_see_all_addons"
 msgstr "查看所有 %1$s 類元件"
 
 # %1 is the number of reviews
-#: views/addons/display.thtml:305
+#: views/addons/display.thtml:301
 #, php-format
 msgid "addons_display_see_all_reviews"
 msgstr "查看所有意見 (%1$s)"
 
-#: views/addons/display.thtml:198 views/addons/display.thtml:200
+#: views/addons/display.thtml:194 views/addons/display.thtml:196
 msgid "addons_display_see_all_versions"
 msgstr "看看所有版本"
 
-#: views/addons/display.thtml:199
+#: views/addons/display.thtml:195
 msgid "addons_display_version_history"
 msgstr "所有版本歷史記錄"
 
-#: views/addons/display.thtml:338 views/addons/versions.thtml:103
+#: views/addons/display.thtml:334 views/addons/versions.thtml:103
 msgid "addons_display_view_source"
 msgstr "檢視原始碼"
 
-#: views/addons/display.thtml:341
+#: views/addons/display.thtml:337
 msgid "addons_display_view_stats"
 msgstr "檢視統計資訊"
 
-#: views/addons/display.thtml:361
+#: views/addons/display.thtml:357
 msgid "addons_display_what_do_you_think"
 msgstr "留下您的意見？"
 
@@ -429,29 +427,30 @@ msgstr "留下您的意見？"
 msgid "addons_display_workswith"
 msgstr "相容於："
 
+#: views/addons/display.thtml:68 views/addons/policy.thtml:62
 #: views/elements/addon_discussionheader.thtml:84
-#: views/elements/addon_listitem.thtml:125 views/elements/feature.thtml:79
-#: views/addons/policy.thtml:62 views/addons/display.thtml:68
+#: views/elements/addon_listitem.thtml:128 views/elements/feature.thtml:95
+#: views/elements/fyf_promotion.thtml:51
 msgid "addons_home_by"
 msgstr "作者："
 
-#: views/addons/searchengines.thtml:54 views/addons/category_landing.thtml:79
-#: views/addons/category_landing.thtml:151 views/addons/themes_landing.thtml:49
-#: views/addons/home.thtml:48
+#: views/addons/category_landing.thtml:79
+#: views/addons/category_landing.thtml:151 views/addons/home.thtml:48
+#: views/addons/searchengines.thtml:54 views/addons/themes_landing.thtml:49
 msgid "addons_home_feature_head"
 msgstr "推薦元件"
 
-#: controllers/search_controller.php:211 controllers/addons_controller.php:79
-#: controllers/addons_controller.php:262 controllers/addons_controller.php:398
-#: controllers/addons_controller.php:534 controllers/addons_controller.php:766
-#: controllers/addons_controller.php:905 controllers/addons_controller.php:965
+#: controllers/addons_controller.php:79 controllers/addons_controller.php:260
+#: controllers/addons_controller.php:396 controllers/addons_controller.php:533
+#: controllers/addons_controller.php:765 controllers/addons_controller.php:904
+#: controllers/addons_controller.php:964 controllers/search_controller.php:211
 #, php-format
 msgid "addons_home_header_details"
 msgstr ""
-"附加元件能擴充 %1$s 功能，打造您獨樹一格的瀏覽體驗。在這網站四處看看，來親手打"
-"造您專屬的 %1$s 吧！"
+"附加元件能擴充 %1$s 功能，打造您獨樹一格的瀏覽體驗。在這網站四處看看，來親手"
+"打造您專屬的 %1$s 吧！"
 
-#: views/addons/home.thtml:195
+#: views/addons/home.thtml:202
 msgid "addons_home_newest_header"
 msgstr "最新元件:"
 
@@ -459,78 +458,79 @@ msgstr "最新元件:"
 msgid "addons_home_other_applications"
 msgstr "其他應用程式"
 
+#: controllers/addons_controller.php:160 controllers/addons_controller.php:220
+#: controllers/addons_controller.php:393 controllers/addons_controller.php:535
+#: controllers/addons_controller.php:681 controllers/addons_controller.php:696
+#: controllers/addons_controller.php:763 controllers/addons_controller.php:783
+#: controllers/addons_controller.php:902 controllers/addons_controller.php:962
+#: controllers/addons_controller.php:1021
+#: controllers/addons_controller.php:1028
+#: controllers/addons_controller.php:1097
+#: controllers/addons_controller.php:1134
+#: controllers/addons_controller.php:1190
+#: controllers/collections_controller.php:67
+#: controllers/collections_controller.php:109
+#: controllers/collections_controller.php:187
+#: controllers/compatibility_controller.php:71
+#: controllers/components/amo.php:643 controllers/components/simple_acl.php:81
 #: controllers/developers_controller.php:64
-#: controllers/compatibility_controller.php:75
-#: controllers/components/simple_acl.php:81 controllers/components/amo.php:643
-#: controllers/statistics_controller.php:60
-#: controllers/previews_controller.php:67 controllers/users_controller.php:90
-#: controllers/users_controller.php:223 controllers/users_controller.php:319
-#: controllers/users_controller.php:403 controllers/users_controller.php:665
-#: controllers/users_controller.php:680 controllers/reviews_controller.php:204
-#: controllers/reviews_controller.php:251
-#: controllers/reviews_controller.php:345
-#: controllers/reviews_controller.php:424 controllers/search_controller.php:178
-#: controllers/addons_controller.php:162 controllers/addons_controller.php:222
-#: controllers/addons_controller.php:395 controllers/addons_controller.php:536
-#: controllers/addons_controller.php:682 controllers/addons_controller.php:697
-#: controllers/addons_controller.php:764 controllers/addons_controller.php:784
-#: controllers/addons_controller.php:903 controllers/addons_controller.php:963
-#: controllers/addons_controller.php:1022
-#: controllers/addons_controller.php:1029
-#: controllers/addons_controller.php:1098
-#: controllers/addons_controller.php:1135
-#: controllers/addons_controller.php:1191 controllers/editors_controller.php:58
-#: controllers/pages_controller.php:116 controllers/groups_controller.php:65
+#: controllers/editors_controller.php:58 controllers/groups_controller.php:65
 #: controllers/groups_controller.php:71 controllers/groups_controller.php:89
 #: controllers/groups_controller.php:111
-#: controllers/collections_controller.php:64
-#: controllers/collections_controller.php:106
-#: controllers/collections_controller.php:135
-#: controllers/collections_controller.php:160
 #: controllers/localizers_controller.php:72
+#: controllers/pages_controller.php:121 controllers/previews_controller.php:67
+#: controllers/reviews_controller.php:204
+#: controllers/reviews_controller.php:251
+#: controllers/reviews_controller.php:345
+#: controllers/reviews_controller.php:424
+#: controllers/search_controller.php:178
+#: controllers/statistics_controller.php:60
+#: controllers/users_controller.php:90 controllers/users_controller.php:223
+#: controllers/users_controller.php:319 controllers/users_controller.php:403
+#: controllers/users_controller.php:672 controllers/users_controller.php:687
 #, php-format
 msgid "addons_home_pagetitle"
 msgstr "%1$s 附加元件"
 
-#: views/addons/home.thtml:184
+#: views/addons/home.thtml:191
 msgid "addons_home_popular_header"
 msgstr "熱門元件："
 
-#: views/addons/home.thtml:174
+#: views/addons/home.thtml:181
 msgid "addons_home_recommended_header"
 msgstr "推薦元件："
 
-#: views/addons/home.thtml:206
+#: views/addons/home.thtml:213
 msgid "addons_home_updated_header"
 msgstr "最近更新:"
 
-#: views/addons/home.thtml:182 views/addons/home.thtml:192
-#: views/addons/home.thtml:203 views/addons/home.thtml:214
+#: views/addons/home.thtml:189 views/addons/home.thtml:199
+#: views/addons/home.thtml:210 views/addons/home.thtml:221
 msgid "addons_home_view_all"
 msgstr "全部元件"
 
-#: views/addons/home.thtml:203
+#: views/addons/home.thtml:210
 msgid "addons_home_view_all_newest_title"
 msgstr "檢視所有最新上傳元件"
 
-#: views/addons/home.thtml:192
+#: views/addons/home.thtml:199
 msgid "addons_home_view_all_popular_title"
 msgstr "檢視所有熱門元件"
 
-#: views/addons/home.thtml:182
+#: views/addons/home.thtml:189
 msgid "addons_home_view_all_recommended_title"
 msgstr "檢視所有推薦元件"
 
-#: views/addons/home.thtml:214
+#: views/addons/home.thtml:221
 msgid "addons_home_view_all_updated_title"
 msgstr "檢視所有最近更新元件"
 
 #: views/elements/install.thtml:104
 msgid "addons_install_in_sunbird"
 msgstr ""
-"<ol><li>按下面的鏈結以儲存檔案。</li><li>於 Mozilla Sunbird 中選擇「工具＞附加"
-"元件」</li><li>視窗開啟後，按「安裝」鈕，找到您剛剛下載回來的檔案後按「確定」"
-"即可。< /li></ol>"
+"<ol><li>按下面的鏈結以儲存檔案。</li><li>於 Mozilla Sunbird 中選擇「工具＞附"
+"加元件」</li><li>視窗開啟後，按「安裝」鈕，找到您剛剛下載回來的檔案後按「確"
+"定」即可。< /li></ol>"
 
 #: views/elements/install.thtml:103
 msgid "addons_install_in_sunbird_title"
@@ -588,15 +588,15 @@ msgstr "想找的外掛程式不在這裡？"
 #: views/addons/plugins.thtml:53
 msgid "addons_plugins_main_description"
 msgstr ""
-"外掛程式能讓瀏覽器達到顯示特殊圖片格式、播放多媒體檔案等功能。和擴充套件改變或"
-"加強已有的功能不同，外掛程式可讓瀏覽器支援全新的格式。"
+"外掛程式能讓瀏覽器達到顯示特殊圖片格式、播放多媒體檔案等功能。和擴充套件改變"
+"或加強已有的功能不同，外掛程式可讓瀏覽器支援全新的格式。"
 
-#: controllers/addons_controller.php:785
+#: controllers/addons_controller.php:784
 #, php-format
 msgid "addons_plugins_main_header"
 msgstr "%1$s 常用外掛程式"
 
-#: controllers/components/amo.php:758 controllers/addons_controller.php:784
+#: controllers/addons_controller.php:783 controllers/components/amo.php:758
 msgid "addons_plugins_pagetitle"
 msgstr "外掛程式"
 
@@ -613,23 +613,23 @@ msgid "addons_policy_eula_require"
 msgstr "%s 需要您在安裝前接受下面的「終端使用者授權合約」才能繼續："
 
 # %1 is the addon name
-#: controllers/addons_controller.php:1134
+#: controllers/addons_controller.php:1133
 #, php-format
 msgid "addons_previews_pagetitle"
 msgstr "%s 的預覽圖片"
 
-#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1030
+#: views/addons/recommended.thtml:50 controllers/addons_controller.php:1029
 msgid "addons_recommended_introduction"
 msgstr ""
-"這裡有成堆的附加元件，其中有些大家都該試試。您可以從下列我們推薦的附加元件開始"
-"玩玩看！"
+"這裡有成堆的附加元件，其中有些大家都該試試。您可以從下列我們推薦的附加元件開"
+"始玩玩看！"
 
-#: controllers/addons_controller.php:1022
-#: controllers/addons_controller.php:1029
+#: controllers/addons_controller.php:1021
+#: controllers/addons_controller.php:1028
 msgid "addons_recommended_pagetitle"
 msgstr "推薦附加元件"
 
-#: controllers/addons_controller.php:1025
+#: controllers/addons_controller.php:1024
 msgid "addons_recommended_title"
 msgstr "推薦附加元件"
 
@@ -681,7 +681,7 @@ msgstr "到 %1$s 尋找更多搜尋引擎"
 msgid "addons_searchengines_mycroft_link"
 msgstr "mycroft.mozdev.org"
 
-#: controllers/addons_controller.php:763 controllers/addons_controller.php:773
+#: controllers/addons_controller.php:762 controllers/addons_controller.php:772
 msgid "addons_searchengines_pagetitle"
 msgstr "搜尋引擎"
 
@@ -717,7 +717,7 @@ msgstr "在「沙箱」"
 msgid "addons_status_unknown"
 msgstr "不明"
 
-#: views/elements/feature.thtml:78
+#: views/elements/feature.thtml:94 views/elements/fyf_promotion.thtml:50
 msgid "addons_title_tooltip"
 msgstr "了解關於此元件的更多資訊"
 
@@ -730,11 +730,11 @@ msgid "addons_versions_careful_introduction"
 msgstr ""
 "這裡列出的舊版本僅供參考及測試之用。若無特別需求，請安裝最新版的附加元件。"
 
-#: views/addons/versions.thtml:50 controllers/addons_controller.php:1199
+#: views/addons/versions.thtml:50 controllers/addons_controller.php:1198
 msgid "addons_versions_history"
 msgstr "版本歷史記錄"
 
-#: controllers/addons_controller.php:1187
+#: controllers/addons_controller.php:1186
 #, php-format
 msgid "addons_versions_pagetitle"
 msgstr "%1$s 版本記錄"
@@ -768,99 +768,99 @@ msgstr "群組管理員"
 msgid "admin_group_saved"
 msgstr "群組已儲存"
 
-#: views/elements/search.thtml:255
+#: views/elements/search.thtml:238
 msgid "advanced_search_form"
 msgstr "進階搜尋"
 
-#: views/elements/search.thtml:135
+#: views/elements/search.thtml:124
 msgid "advanced_search_form_any_time"
 msgstr "任意時間"
 
-#: views/elements/search.thtml:106 views/elements/search.thtml:119
+#: views/elements/search.thtml:95 views/elements/search.thtml:108
 msgid "advanced_search_form_any_type"
 msgstr "所有種類"
 
-#: views/elements/search.thtml:270
+#: views/elements/search.thtml:253
 msgid "advanced_search_form_any_version"
 msgstr "所有版本"
 
-#: views/elements/search.thtml:229
+#: views/elements/search.thtml:211
 msgid "advanced_search_form_application"
 msgstr "應用程式"
 
-#: views/elements/search.thtml:152
+#: views/elements/search.thtml:141
 msgid "advanced_search_form_keyword_match"
 msgstr "關鍵字"
 
-#: views/elements/search.thtml:241
+#: views/elements/search.thtml:224
 msgid "advanced_search_form_lastupdate"
 msgstr "更新時間"
 
-#: views/elements/search.thtml:154
+#: views/elements/search.thtml:143
 msgid "advanced_search_form_name"
 msgstr "名稱"
 
-#: views/elements/search.thtml:153
+#: views/elements/search.thtml:142
 msgid "advanced_search_form_newest"
 msgstr "新舊"
 
-#: views/elements/search.thtml:139
+#: views/elements/search.thtml:128
 msgid "advanced_search_form_past_3_months"
 msgstr "最近 3 個月"
 
-#: views/elements/search.thtml:140
+#: views/elements/search.thtml:129
 msgid "advanced_search_form_past_6_months"
 msgstr "最近 6 個月"
 
-#: views/elements/search.thtml:136
+#: views/elements/search.thtml:125
 msgid "advanced_search_form_past_day"
 msgstr "昨天"
 
-#: views/elements/search.thtml:138
+#: views/elements/search.thtml:127
 msgid "advanced_search_form_past_month"
 msgstr "最近 1 個月"
 
-#: views/elements/search.thtml:137
+#: views/elements/search.thtml:126
 msgid "advanced_search_form_past_week"
 msgstr "最近 1 星期"
 
-#: views/elements/search.thtml:141
+#: views/elements/search.thtml:130
 msgid "advanced_search_form_past_year"
 msgstr "最近 1 年"
 
-#: views/elements/search.thtml:246
+#: views/elements/search.thtml:229
 msgid "advanced_search_form_perpage"
 msgstr "每頁顯示數量"
 
-#: views/elements/search.thtml:240
+#: views/elements/search.thtml:223
 msgid "advanced_search_form_platform"
 msgstr "作業系統"
 
-#: views/elements/search.thtml:156
+#: views/elements/search.thtml:145
 msgid "advanced_search_form_popularity"
 msgstr "熱門程度"
 
-#: views/elements/search.thtml:155
+#: views/elements/search.thtml:144
 msgid "advanced_search_form_rating"
 msgstr "評分"
 
-#: views/elements/search.thtml:247
+#: views/elements/search.thtml:230
 msgid "advanced_search_form_sortby"
 msgstr "排序方式"
 
-#: views/elements/search.thtml:232
+#: views/elements/search.thtml:215
 msgid "advanced_search_form_to"
 msgstr "到"
 
-#: views/elements/search.thtml:253
+#: views/elements/search.thtml:236
 msgid "advanced_search_form_toggle_tooltip"
 msgstr "切換進階搜尋功能"
 
-#: views/elements/search.thtml:239
+#: views/elements/search.thtml:222
 msgid "advanced_search_form_type"
 msgstr "種類"
 
-#: views/elements/search.thtml:230
+#: views/elements/search.thtml:213
 msgid "advanced_search_form_version"
 msgstr "版本從"
 
@@ -875,8 +875,8 @@ msgstr "此元件僅適用於舊版的 Firefox"
 #: views/pages/js_constants.js.thtml:65
 msgid "app_compat_older_version_or_ignore_check"
 msgstr ""
-"您可以<a href=\"%1$s\">安裝舊版本</a>或是<a href=\"#\" onclick=\"%2$s\">忽略此"
-"檢查</a>"
+"您可以<a href=\"%1$s\">安裝舊版本</a>或是<a href=\"#\" onclick=\"%2$s\">忽略"
+"此檢查</a>"
 
 #: views/pages/js_constants.js.thtml:62
 msgid "app_compat_try_old_version"
@@ -932,35 +932,35 @@ msgstr "訂閱"
 msgid "blog_title"
 msgstr "Mozilla 附加元件部落格"
 
-#: controllers/addons_controller.php:675
+#: controllers/addons_controller.php:674
 msgid "browse_addons_name"
 msgstr "依名稱排序"
 
-#: controllers/addons_controller.php:673
+#: controllers/addons_controller.php:672
 msgid "browse_addons_newest"
 msgstr "最新元件"
 
-#: controllers/addons_controller.php:671
+#: controllers/addons_controller.php:670
 msgid "browse_addons_popular"
 msgstr "熱門元件"
 
-#: controllers/addons_controller.php:674
+#: controllers/addons_controller.php:673
 msgid "browse_addons_rated"
 msgstr "依評分排序"
 
-#: controllers/addons_controller.php:672
+#: controllers/addons_controller.php:671
 msgid "browse_addons_updated"
 msgstr "最近更新元件"
 
-#: views/elements/categories.thtml:81 views/elements/categories.thtml:90
+#: views/elements/categories.thtml:73 views/elements/categories.thtml:82
 msgid "categories_current_title"
 msgstr "目前分類"
 
-#: views/elements/categories.thtml:58
+#: views/elements/categories.thtml:50
 msgid "categories_header"
 msgstr "分類"
 
-#: views/elements/categories.thtml:58
+#: views/elements/categories.thtml:50
 msgid "categories_header_title"
 msgstr "請選擇分類"
 
@@ -981,12 +981,12 @@ msgid "category_extra_mostpopular"
 msgstr "下載越多優先"
 
 # %1 is the category name
-#: views/addons/searchengines.thtml:135 views/addons/category_landing.thtml:51
+#: views/addons/category_landing.thtml:51 views/addons/searchengines.thtml:135
 #, php-format
 msgid "category_extra_see_all"
 msgstr "看看所有 %1$s 類元件"
 
-#: controllers/collections_controller.php:89
+#: controllers/collections_controller.php:92
 msgid "collection_not_found"
 msgstr "沒有找到收藏！"
 
@@ -1036,19 +1036,20 @@ msgstr ""
 
 # date format string as used in PHP's strftime():
 # http://php.net/strftime
-#: views/elements/collections_interactive_addon.thtml:84
+#: views/addons/browse_thumbs.thtml:89 views/addons/display.thtml:104
+#: views/addons/display.thtml:285 views/addons/display.thtml:289
+#: views/addons/rss/versions.thtml:42 views/blog/view.thtml:74
+#: views/developers/dashboard.thtml:65 views/developers/versions.thtml:67
+#: views/developers/versions_edit.thtml:190
+#: views/editors/reviews_queue.thtml:57 views/editors/reviews_queue.thtml:68
+#: views/elements/addon_listitem.thtml:96
+#: views/elements/addon_listitem.thtml:146
 #: views/elements/addon_version_detail.thtml:54
-#: views/elements/addon_listitem.thtml:93
-#: views/elements/addon_listitem.thtml:148 views/elements/feature.thtml:96
-#: views/users/info.thtml:70 views/editors/reviews_queue.thtml:57
-#: views/editors/reviews_queue.thtml:68 views/developers/dashboard.thtml:65
-#: views/developers/versions_edit.thtml:190 views/developers/versions.thtml:67
-#: views/search/rss/index.thtml:5 views/addons/rss/versions.thtml:42
-#: views/addons/display.thtml:108 views/addons/display.thtml:289
-#: views/addons/display.thtml:293 views/addons/browse_thumbs.thtml:89
-#: views/reviews/add.thtml:77 views/reviews/display.thtml:73
+#: views/elements/collections_interactive_addon.thtml:85
+#: views/elements/feature.thtml:112 views/reviews/add.thtml:77
+#: views/reviews/delete.thtml:49 views/reviews/display.thtml:73
 #: views/reviews/display.thtml:77 views/reviews/display.thtml:164
-#: views/reviews/delete.thtml:49 views/blog/view.thtml:74
+#: views/search/rss/index.thtml:5 views/users/info.thtml:70
 msgid "date"
 msgstr "%Y 年 %m 月 %e 日"
 
@@ -1061,9 +1062,9 @@ msgstr "%Y 年 %m 月 %e 日 %H:%M"
 msgid "devcp_actionbar_link_details"
 msgstr "詳細資訊"
 
+#: views/developers/dashboard.thtml:64
 #: views/elements/developers/actionbar.thtml:42
 #: views/elements/developers/actionbar.thtml:50
-#: views/developers/dashboard.thtml:64
 msgid "devcp_actionbar_link_edit"
 msgstr "編輯附加元件"
 
@@ -1071,9 +1072,9 @@ msgstr "編輯附加元件"
 msgid "devcp_actionbar_link_newversion"
 msgstr "上傳新版本"
 
+#: views/developers/dashboard.thtml:70
 #: views/elements/developers/actionbar.thtml:44
 #: views/elements/developers/actionbar.thtml:49
-#: views/developers/dashboard.thtml:70
 msgid "devcp_actionbar_link_stats"
 msgstr "統計資訊顯示板"
 
@@ -1126,36 +1127,36 @@ msgstr "步驟 5：完成"
 msgid "devcp_additem_submissionhelp_link"
 msgstr "上傳說明"
 
-#: controllers/developers_controller.php:2652
+#: controllers/developers_controller.php:2658
 msgid "devcp_addon_disabled_successfully"
 msgstr "停用附加元件成功"
 
-#: controllers/developers_controller.php:2274
-#: controllers/developers_controller.php:2275
+#: controllers/developers_controller.php:2280
+#: controllers/developers_controller.php:2281
 msgid "devcp_addon_edit_pagetitle"
 msgstr "編輯附加元件"
 
-#: controllers/developers_controller.php:2647
+#: controllers/developers_controller.php:2653
 msgid "devcp_addon_enabled_successfully"
 msgstr "啟用附加元件成功"
 
-#: controllers/developers_controller.php:2187
-#: controllers/developers_controller.php:2475
+#: controllers/developers_controller.php:2193
+#: controllers/developers_controller.php:2481
 msgid "devcp_addon_field_description_displaytitle"
 msgstr "附加元件敘述"
 
-#: controllers/developers_controller.php:2197
-#: controllers/developers_controller.php:2485
+#: controllers/developers_controller.php:2203
+#: controllers/developers_controller.php:2491
 msgid "devcp_addon_field_eula_displaytitle"
 msgstr "授權合約"
 
-#: controllers/developers_controller.php:2167
-#: controllers/developers_controller.php:2437
+#: controllers/developers_controller.php:2173
+#: controllers/developers_controller.php:2443
 msgid "devcp_addon_field_homepage_displaytitle"
 msgstr "附加元件首頁"
 
-#: controllers/developers_controller.php:2160
-#: controllers/developers_controller.php:2430
+#: controllers/developers_controller.php:2166
+#: controllers/developers_controller.php:2436
 msgid "devcp_addon_field_name_displaytitle"
 msgstr "附加元件名稱"
 
@@ -1164,35 +1165,35 @@ msgstr "附加元件名稱"
 msgid "devcp_addon_field_preview_caption_displaytitle"
 msgstr "預覽圖片說明"
 
-#: controllers/developers_controller.php:2207
-#: controllers/developers_controller.php:2495
+#: controllers/developers_controller.php:2213
+#: controllers/developers_controller.php:2501
 msgid "devcp_addon_field_privacy_displaytitle"
 msgstr "隱私政策"
 
-#: controllers/developers_controller.php:2176
-#: controllers/developers_controller.php:2464
+#: controllers/developers_controller.php:2182
+#: controllers/developers_controller.php:2470
 msgid "devcp_addon_field_summary_displaytitle"
 msgstr "附加元件摘要"
 
-#: controllers/developers_controller.php:2446
+#: controllers/developers_controller.php:2452
 msgid "devcp_addon_field_supportemail_displaytitle"
 msgstr "技術支援 Email 位址"
 
-#: controllers/developers_controller.php:2455
+#: controllers/developers_controller.php:2461
 msgid "devcp_addon_field_supporturl_displaytitle"
 msgstr "技術支援網址"
 
-#: controllers/developers_controller.php:2217
-#: controllers/developers_controller.php:2602
+#: controllers/developers_controller.php:2223
+#: controllers/developers_controller.php:2608
 msgid "devcp_addon_field_versionnotes_displaytitle"
 msgstr "版本資訊"
 
-#: controllers/developers_controller.php:2674
-#: controllers/developers_controller.php:2675
+#: controllers/developers_controller.php:2680
+#: controllers/developers_controller.php:2681
 msgid "devcp_addon_nominate_pagetitle"
 msgstr "送交批准附加元件"
 
-#: controllers/developers_controller.php:2720
+#: controllers/developers_controller.php:2726
 msgid "devcp_addon_nominated_successfully"
 msgstr "附加元件送交批准成功！"
 
@@ -1232,8 +1233,8 @@ msgstr "這裡"
 #, php-format
 msgid "devcp_addon_submission_sandboxed"
 msgstr ""
-"這個版本會放在「沙箱」區供進階使用者使用，如果您要將它放上「公開」區則必須先 %"
-"s 以通過審核流程。"
+"這個版本會放在「沙箱」區供進階使用者使用，如果您要將它放上「公開」區則必須先 "
+"%s 以通過審核流程。"
 
 #: views/developers/add_step5.thtml:60
 msgid "devcp_addon_submission_sandboxed_nominate_link"
@@ -1247,12 +1248,12 @@ msgstr "您的附加元件上傳已完成。"
 msgid "devcp_addon_submission_trusted_public"
 msgstr "因為您的附加元件已受信任，此版本將自動同意並送到「公開」區。"
 
-#: controllers/developers_controller.php:1466
-#: controllers/developers_controller.php:1467
+#: controllers/developers_controller.php:1472
+#: controllers/developers_controller.php:1473
 msgid "devcp_addon_submit_pagetitle"
 msgstr "上傳附加元件"
 
-#: controllers/developers_controller.php:2366
+#: controllers/developers_controller.php:2372
 msgid "devcp_addon_updated_successfully"
 msgstr "附加元件更新成功"
 
@@ -1276,18 +1277,18 @@ msgstr "找不到作者 [%s]"
 msgid "devcp_author_lookup_remove"
 msgstr "移除"
 
-#: views/developers/add_step4.thtml:61 views/developers/add_step2.thtml:161
-#: views/developers/add_step1.thtml:129 views/developers/add_step3.thtml:126
+#: views/developers/add_step1.thtml:129 views/developers/add_step2.thtml:161
+#: views/developers/add_step3.thtml:126 views/developers/add_step4.thtml:61
 msgid "devcp_button_cancel"
 msgstr "取消"
 
-#: views/developers/add_step4.thtml:61 views/developers/add_step2.thtml:161
-#: views/developers/add_step1.thtml:129 views/developers/add_step3.thtml:126
+#: views/developers/add_step1.thtml:129 views/developers/add_step2.thtml:161
+#: views/developers/add_step3.thtml:126 views/developers/add_step4.thtml:61
 msgid "devcp_button_cancel_confirm"
 msgstr "您確定要取消上傳嗎？"
 
-#: views/developers/add_step4.thtml:60 views/developers/add_step2.thtml:160
-#: views/developers/add_step1.thtml:128 views/developers/add_step3.thtml:125
+#: views/developers/add_step1.thtml:128 views/developers/add_step2.thtml:160
+#: views/developers/add_step3.thtml:125 views/developers/add_step4.thtml:60
 msgid "devcp_button_next"
 msgstr "下一步"
 
@@ -1295,7 +1296,7 @@ msgstr "下一步"
 msgid "devcp_change_addontype"
 msgstr "變更附加元件種類："
 
-#: controllers/developers_controller.php:1393
+#: controllers/developers_controller.php:1399
 msgid "devcp_comments_updated"
 msgstr "開發者留言已更新。"
 
@@ -1415,8 +1416,8 @@ msgstr "您確定要停用此附加元件嗎？"
 #: views/developers/disable.thtml:56
 msgid "devcp_disable_disable_description"
 msgstr ""
-"此元件被停用後，就無法被搜尋或列在元件清單中，也無法被使用者下載或更新。事實上"
-"停用元件很像被刪除，但是您可以隨時回到這一頁重新啟用此元件。"
+"此元件被停用後，就無法被搜尋或列在元件清單中，也無法被使用者下載或更新。事實"
+"上停用元件很像被刪除，但是您可以隨時回到這一頁重新啟用此元件。"
 
 #: views/developers/disable.thtml:55
 #, php-format
@@ -1536,24 +1537,24 @@ msgid "devcp_editorsqueue_featured"
 msgstr "精選元件"
 
 # %1 is the review count
-#: views/elements/developers/editorsqueue.thtml:42
 #: views/elements/developers/editorsmenu.thtml:56
+#: views/elements/developers/editorsqueue.thtml:42
 #, php-format
 msgid "devcp_editorsqueue_moderatedreviews"
 msgid_plural "devcp_editorsqueue_moderatedreviews"
 msgstr[0] "待審核意見 (%s)"
 
 # %1 is the nominated addons count
-#: views/elements/developers/editorsqueue.thtml:44
 #: views/elements/developers/editorsmenu.thtml:58
+#: views/elements/developers/editorsqueue.thtml:44
 #, php-format
 msgid "devcp_editorsqueue_nominated"
 msgid_plural "devcp_editorsqueue_nominated"
 msgstr[0] "待批准元件 (%s)"
 
 # %1 is the update count
-#: views/elements/developers/editorsqueue.thtml:43
 #: views/elements/developers/editorsmenu.thtml:57
+#: views/elements/developers/editorsqueue.thtml:43
 #, php-format
 msgid "devcp_editorsqueue_pendingupdates"
 msgid_plural "devcp_editorsqueue_pendingupdates"
@@ -1590,34 +1591,34 @@ msgstr "給審核者的說明"
 msgid "devcp_editversion_submit_update"
 msgstr "更新"
 
-#: controllers/developers_controller.php:1378
-#: controllers/developers_controller.php:2253
-#: controllers/developers_controller.php:2279
-#: controllers/developers_controller.php:2535
-#: controllers/developers_controller.php:2639
-#: controllers/developers_controller.php:2689
-#: controllers/statistics_controller.php:139
-#: controllers/statistics_controller.php:327
+#: controllers/developers_controller.php:1384
+#: controllers/developers_controller.php:2259
+#: controllers/developers_controller.php:2285
+#: controllers/developers_controller.php:2541
+#: controllers/developers_controller.php:2645
+#: controllers/developers_controller.php:2695
 #: controllers/previews_controller.php:108
 #: controllers/previews_controller.php:211
 #: controllers/previews_controller.php:312
+#: controllers/statistics_controller.php:139
+#: controllers/statistics_controller.php:327
 msgid "devcp_error_addon_access_denied"
 msgstr "您並無此附加元件的權限。"
 
 #: views/developers/add_step2.thtml:126
-#: controllers/developers_controller.php:2182
-#: controllers/developers_controller.php:2470
+#: controllers/developers_controller.php:2188
+#: controllers/developers_controller.php:2476
 msgid "devcp_error_addon_field_summary_toolong"
 msgstr ""
 "摘要的最大長度為 250 個字元。\n"
 "（已輸入 %s 個字元）"
 
-#: controllers/developers_controller.php:1898
+#: controllers/developers_controller.php:1904
 msgid "devcp_error_addonname_not_unique"
 msgstr ""
-"這個附加元件名稱已在我們的資料庫中，請確定：<br /><li>您的 GUID 正確，最常見的"
-"錯誤就是 GUID 不小心寫錯。</li><li>您沒有在資料庫中上傳了重複的項目。如果重複"
-"了，您應該更新舊的項目或刪除該項目重新上傳。</li>"
+"這個附加元件名稱已在我們的資料庫中，請確定：<br /><li>您的 GUID 正確，最常見"
+"的錯誤就是 GUID 不小心寫錯。</li><li>您沒有在資料庫中上傳了重複的項目。如果重"
+"複了，您應該更新舊的項目或刪除該項目重新上傳。</li>"
 
 #: controllers/components/developers.php:591
 #, php-format
@@ -1628,7 +1629,7 @@ msgstr "請參考 %s。"
 msgid "devcp_error_appversion_reference_link_text"
 msgstr "此頁面"
 
-#: controllers/developers_controller.php:2004
+#: controllers/developers_controller.php:2010
 msgid "devcp_error_describe_changes"
 msgstr "請輸入此附加元件的變更敘述。"
 
@@ -1638,7 +1639,7 @@ msgid "devcp_error_file_extension"
 msgstr ""
 "所選的元件類型不接受此類副檔名 (%s) 上傳。只有下面列出的副檔名才允許上傳: %s"
 
-#: controllers/developers_controller.php:1645
+#: controllers/developers_controller.php:1651
 msgid "devcp_error_file_guids_dont_match"
 msgstr "某些檔案的 GUID 不符"
 
@@ -1672,13 +1673,13 @@ msgstr "無檔案已上傳"
 msgid "devcp_error_icon_extension"
 msgstr "圖示檔案不接受此類副檔名 (%s) 上傳。只有下面列出的副檔名才允許上傳: %s"
 
-#: controllers/developers_controller.php:1714
+#: controllers/developers_controller.php:1720
 #, php-format
 msgid "devcp_error_identical_version_exists"
 msgstr "此元件及作業系統已存在相同的版本 (%s)。"
 
-#: controllers/developers_controller.php:442
-#: controllers/developers_controller.php:1655
+#: controllers/developers_controller.php:448
+#: controllers/developers_controller.php:1661
 msgid "devcp_error_index_rdf_notfound"
 msgstr "找不到 install.rdf 檔案。"
 
@@ -1686,7 +1687,7 @@ msgstr "找不到 install.rdf 檔案。"
 msgid "devcp_error_install_manifest"
 msgstr "install.rdf 中含有下列錯誤："
 
-#: controllers/developers_controller.php:1598
+#: controllers/developers_controller.php:1604
 msgid "devcp_error_invalid_addontype"
 msgstr "請選擇有效的附加元件種類。"
 
@@ -1747,15 +1748,15 @@ msgstr "此附加元件的 install.rdf 中找不到 ID。"
 msgid "devcp_error_no_platform"
 msgstr "未選擇作業系統"
 
-#: controllers/developers_controller.php:2709
+#: controllers/developers_controller.php:2715
 msgid "devcp_error_nominate_message"
 msgstr "您必須填寫送交批准所要求的詳細訊息。"
 
-#: controllers/developers_controller.php:2703
+#: controllers/developers_controller.php:2709
 msgid "devcp_error_nominate_no_prerelease"
 msgstr "您無法將發行前版本 (Pre-release) 的附加元件送交批准。"
 
-#: controllers/developers_controller.php:2695
+#: controllers/developers_controller.php:2701
 msgid "devcp_error_nominate_sandbox_only"
 msgstr "您只能將「沙箱」區的附加元件送交批准。"
 
@@ -1772,13 +1773,13 @@ msgstr "此附加元件至少要有一位作者。"
 msgid "devcp_error_preview_extension"
 msgstr "預覽圖片不接受此類副檔名 (%s) 上傳。只有下面列出的副檔名才允許上傳: %s"
 
-#: controllers/developers_controller.php:1890
-#: controllers/developers_controller.php:1905
-#: controllers/developers_controller.php:2370
+#: controllers/developers_controller.php:1896
+#: controllers/developers_controller.php:1911
+#: controllers/developers_controller.php:2376
 msgid "devcp_error_saving"
 msgstr "嘗試儲存您的資料時發生錯誤。"
 
-#: controllers/developers_controller.php:1687
+#: controllers/developers_controller.php:1693
 msgid "devcp_error_update_access_denied"
 msgstr "您沒有權限更新此附加元件。"
 
@@ -1791,8 +1792,8 @@ msgid "devcp_error_updateurl"
 msgstr ""
 "附加元件不能使用外部的 updateURL，請將其從 install.rdf 中移除後再試一次。"
 
-#: controllers/developers_controller.php:403
 #: controllers/components/developers.php:271
+#: controllers/developers_controller.php:409
 msgid "devcp_error_upload_file"
 msgstr "請上傳檔案。"
 
@@ -2015,16 +2016,16 @@ msgstr "在地化欄位"
 #, php-format
 msgid "devcp_localebox_intro"
 msgstr ""
-"本頁的某些欄位可用使用者熟悉的語言顯示。請從下面的語言中選擇您要編輯的元件詳細"
-"資訊，如果使用者選的語言沒有內容就會用預設語言 (%s) 顯示。"
+"本頁的某些欄位可用使用者熟悉的語言顯示。請從下面的語言中選擇您要編輯的元件詳"
+"細資訊，如果使用者選的語言沒有內容就會用預設語言 (%s) 顯示。"
 
-#: views/elements/developers/sidebar.thtml:68
 #: views/elements/developers/myaddons.thtml:68
+#: views/elements/developers/sidebar.thtml:68
 msgid "devcp_myaddons_admincp_link"
 msgstr "管理員工具"
 
-#: views/elements/developers/sidebar.thtml:65
 #: views/elements/developers/myaddons.thtml:65
+#: views/elements/developers/sidebar.thtml:65
 msgid "devcp_myaddons_editorcp_link"
 msgstr "審核者工具"
 
@@ -2032,23 +2033,23 @@ msgstr "審核者工具"
 msgid "devcp_myaddons_link"
 msgstr "我的附加元件"
 
-#: views/elements/developers/sidebar.thtml:70
 #: views/elements/developers/myaddons.thtml:70
+#: views/elements/developers/sidebar.thtml:70
 msgid "devcp_myaddons_mainpage_link"
 msgstr "回到主頁面"
 
-#: views/elements/developers/sidebar.thtml:63
 #: views/elements/developers/myaddons.thtml:63
+#: views/elements/developers/sidebar.thtml:63
 msgid "devcp_myaddons_statistics_link"
 msgstr "統計資訊顯示板"
 
-#: views/elements/developers/sidebar.thtml:62
 #: views/elements/developers/myaddons.thtml:62
+#: views/elements/developers/sidebar.thtml:62
 msgid "devcp_myaddons_submitaddon_link"
 msgstr "上傳附加元件"
 
-#: views/elements/developers/sidebar.thtml:48
 #: views/elements/developers/myaddons.thtml:48
+#: views/elements/developers/sidebar.thtml:48
 msgid "devcp_myaddons_title"
 msgstr "開發者工具"
 
@@ -2081,8 +2082,8 @@ msgstr "移除預設預覽圖片將會使其他預覽圖片自動成為預設圖
 #, php-format
 msgid "devcp_notice_different_defaultlocale"
 msgstr ""
-"此附加元件的預設語言 (%1$s [%2$s]) 和您目前所選的語言 (%3$s [%4$s]) 不同。下面"
-"的欄位將會填入 %1$s 的欄位中。"
+"此附加元件的預設語言 (%1$s [%2$s]) 和您目前所選的語言 (%3$s [%4$s]) 不同。下"
+"面的欄位將會填入 %1$s 的欄位中。"
 
 #: controllers/previews_controller.php:184
 #: controllers/previews_controller.php:251
@@ -2123,8 +2124,8 @@ msgstr "預覽圖片更新成功。"
 #: views/previews/add.thtml:45
 msgid "devcp_previews_filetype_info"
 msgstr ""
-"請用下面的表單上傳格式為 PNG, JPG 或 GIF 的附加元件預覽圖片。大於 700 x 525 像"
-"素的圖片會自動縮小。"
+"請用下面的表單上傳格式為 PNG, JPG 或 GIF 的附加元件預覽圖片。大於 700 x 525 "
+"像素的圖片會自動縮小。"
 
 #: views/previews/add.thtml:43
 msgid "devcp_previews_header_add"
@@ -2162,13 +2163,14 @@ msgstr "上傳預覽圖片"
 msgid "devcp_question_addontype_incorrect"
 msgstr "不對？"
 
-#: controllers/developers_controller.php:2623
+#: controllers/developers_controller.php:2629
 msgid "devcp_question_delete_file"
 msgstr "您確定要刪除此檔案嗎？"
 
+#: views/developers/add_step0.thtml:52
 #: views/developers/addon_submit_choose.thtml:56
 #: views/developers/addon_submit_choose.thtml:75
-#: views/developers/uploader.thtml:78 views/developers/add_step0.thtml:52
+#: views/developers/uploader.thtml:78
 msgid "devcp_review_agreement_please"
 msgstr "繼續使用前請先瀏覽並接受下面的開發者授權合約。"
 
@@ -2176,37 +2178,39 @@ msgstr "繼續使用前請先瀏覽並接受下面的開發者授權合約。"
 msgid "devcp_skip_reviewing_addon_info"
 msgstr "略過更新已存的附加元件資訊"
 
-#: views/elements/developers/statsbar.thtml:45
 #: views/developers/dashboard.thtml:76
+#: views/elements/developers/statsbar.thtml:45
 #, php-format
 msgid "devcp_statsbar_adu"
 msgstr "每日有效使用者：<em>%s</em>"
 
-#: views/elements/developers/statsbar.thtml:41
 #: views/developers/dashboard.thtml:72
+#: views/elements/developers/statsbar.thtml:41
 #, php-format
 msgid "devcp_statsbar_total_downloads"
 msgstr "總下載次數：<em>%s</em>"
 
-#: views/elements/developers/statsbar.thtml:43
 #: views/developers/dashboard.thtml:74
+#: views/elements/developers/statsbar.thtml:43
 #, php-format
 msgid "devcp_statsbar_weekly_downloads"
 msgstr "本週下載數：<em>%s</em>"
 
-#: controllers/developers_controller.php:1472
+#: controllers/developers_controller.php:1478
 msgid "devcp_submissions_disabled"
 msgstr "附加元件的上傳已暫時停用，請稍後再試試看。"
 
+#: views/developers/add_step0.thtml:59
 #: views/developers/addon_submit_choose.thtml:61
 #: views/developers/addon_submit_choose.thtml:80
-#: views/developers/uploader.thtml:83 views/developers/add_step0.thtml:59
+#: views/developers/uploader.thtml:83
 msgid "devcp_submit_accept_dev_agreement"
 msgstr "我接受"
 
+#: views/developers/add_step0.thtml:58
 #: views/developers/addon_submit_choose.thtml:60
 #: views/developers/addon_submit_choose.thtml:79
-#: views/developers/uploader.thtml:82 views/developers/add_step0.thtml:58
+#: views/developers/uploader.thtml:82
 msgid "devcp_submit_decline_dev_agreement"
 msgstr "我拒絕"
 
@@ -2246,23 +2250,23 @@ msgstr "請確定您已為此佈景主題 %s。"
 msgid "devcp_theme_upload_preview_link"
 msgstr "上傳預覽圖片"
 
-#: controllers/developers_controller.php:441
-#: controllers/developers_controller.php:1654
+#: controllers/developers_controller.php:447
+#: controllers/developers_controller.php:1660
 #, php-format
 msgid "devcp_valid_app_reference"
 msgstr "請瀏覽 %s 閱讀參考資訊。"
 
-#: controllers/developers_controller.php:441
-#: controllers/developers_controller.php:1654
+#: controllers/developers_controller.php:447
+#: controllers/developers_controller.php:1660
 msgid "devcp_valid_app_reference_linktext"
 msgstr "此頁面"
 
-#: controllers/developers_controller.php:2518
-#: controllers/developers_controller.php:2519
+#: controllers/developers_controller.php:2524
+#: controllers/developers_controller.php:2525
 msgid "devcp_version_edit_pagetitle"
 msgstr "編輯版本"
 
-#: controllers/developers_controller.php:2563
+#: controllers/developers_controller.php:2569
 msgid "devcp_version_updated_successfully"
 msgstr "版本更新成功。"
 
@@ -2457,7 +2461,7 @@ msgid "editors_notice_filter_session"
 msgstr "這些過濾條件會保留到關閉瀏覽器或手動清除。"
 
 # %1 is the queue mode
-#: views/editors/queue.thtml:108 views/admin/flagged_queue.thtml:75
+#: views/admin/flagged_queue.thtml:75 views/editors/queue.thtml:108
 msgid "editors_notice_none_found"
 msgstr "目前沒有 %s 附加元件待審核。"
 
@@ -2529,8 +2533,8 @@ msgstr "審核者留言"
 #: views/editors/review.thtml:160
 msgid "editors_review_details_nominated_public"
 msgstr ""
-"這個選項會讓附加元件最新版本和其檔案放上「公開」區，但後續更新版本還是會先送到"
-"「沙箱」區等待審核者批准。"
+"這個選項會讓附加元件最新版本和其檔案放上「公開」區，但後續更新版本還是會先送"
+"到「沙箱」區等待審核者批准。"
 
 #: views/editors/review.thtml:163
 msgid "editors_review_details_nominated_sandbox"
@@ -2547,8 +2551,8 @@ msgstr "這個選項會讓附加元件在「沙箱」區的待審核版本留在
 #: views/editors/review.thtml:167
 msgid "editors_review_details_superreview"
 msgstr ""
-"如果您覺得此附加元件有安全上、版權上的疑慮或其他需要管理員處理的問題，請在下面"
-"輸入您的留言。這會直接送交給管理員處理。"
+"如果您覺得此附加元件有安全上、版權上的疑慮或其他需要管理員處理的問題，請在下"
+"面輸入您的留言。這會直接送交給管理員處理。"
 
 #: views/editors/review.thtml:121
 msgid "editors_review_file_diff_link"
@@ -2620,15 +2624,15 @@ msgstr "摘要"
 msgid "editors_review_header_versionnotes"
 msgstr "版本資訊"
 
-#: views/editors/reviewlog.thtml:77 views/editors/review.thtml:288
+#: views/editors/review.thtml:288 views/editors/reviewlog.thtml:77
 msgid "editors_review_history_nominated_adminreview"
 msgstr "送管理員審核"
 
-#: views/editors/reviewlog.thtml:71 views/editors/review.thtml:282
+#: views/editors/review.thtml:282 views/editors/reviewlog.thtml:71
 msgid "editors_review_history_nominated_approved"
 msgstr "批准通過／公開區"
 
-#: views/editors/reviewlog.thtml:74 views/editors/review.thtml:285
+#: views/editors/review.thtml:285 views/editors/reviewlog.thtml:74
 msgid "editors_review_history_nominated_denied"
 msgstr "批准失敗／沙箱區"
 
@@ -2636,15 +2640,15 @@ msgstr "批准失敗／沙箱區"
 msgid "editors_review_history_nonefound"
 msgstr "找不到先前的審核記錄。"
 
-#: views/editors/reviewlog.thtml:88 views/editors/review.thtml:299
+#: views/editors/review.thtml:299 views/editors/reviewlog.thtml:88
 msgid "editors_review_history_pending_adminreview"
 msgstr "送管理員審核"
 
-#: views/editors/reviewlog.thtml:82 views/editors/review.thtml:293
+#: views/editors/review.thtml:293 views/editors/reviewlog.thtml:82
 msgid "editors_review_history_pending_approved"
 msgstr "已同意／公開區"
 
-#: views/editors/reviewlog.thtml:85 views/editors/review.thtml:296
+#: views/editors/review.thtml:296 views/editors/reviewlog.thtml:85
 msgid "editors_review_history_pending_denied"
 msgstr "已拒絕／沙箱區"
 
@@ -2761,8 +2765,8 @@ msgstr "已測試作業系統"
 msgid "editors_th_additional_info"
 msgstr "附加資訊"
 
-#: views/editors/featured.thtml:63 views/editors/queue.thtml:73
-#: views/admin/flagged_queue.thtml:53
+#: views/admin/flagged_queue.thtml:53 views/editors/featured.thtml:63
+#: views/editors/queue.thtml:73
 msgid "editors_th_addon"
 msgstr "附加元件"
 
@@ -2809,10 +2813,11 @@ msgstr "%s 小時"
 msgid "editors_x_minutes"
 msgstr "%s 分"
 
-#: views/errors/error401.thtml:50 controllers/components/simple_acl.php:81
-#: controllers/components/simple_acl.php:82
-#: controllers/components/simple_acl.php:83 controllers/components/amo.php:643
+#: views/errors/error401.thtml:50 controllers/components/amo.php:643
 #: controllers/components/amo.php:644 controllers/components/amo.php:645
+#: controllers/components/simple_acl.php:81
+#: controllers/components/simple_acl.php:82
+#: controllers/components/simple_acl.php:83
 #: controllers/reviews_controller.php:352
 #: controllers/reviews_controller.php:480
 msgid "error_access_denied"
@@ -2822,28 +2827,30 @@ msgstr "存取被拒絕"
 msgid "error_access_denied_message"
 msgstr "您未經授權檢視此頁面。"
 
+#: controllers/addons_controller.php:100
+#: controllers/addons_controller.php:1070
+#: controllers/addons_controller.php:1120
+#: controllers/addons_controller.php:1124 controllers/api_controller.php:116
+#: controllers/api_controller.php:610 controllers/api_controller.php:745
+#: controllers/api_controller.php:776
 #: controllers/developers_controller.php:174
-#: controllers/developers_controller.php:523
-#: controllers/developers_controller.php:941
-#: controllers/developers_controller.php:1398
-#: controllers/developers_controller.php:2376
-#: controllers/developers_controller.php:2683
+#: controllers/developers_controller.php:529
+#: controllers/developers_controller.php:947
+#: controllers/developers_controller.php:1404
+#: controllers/developers_controller.php:2382
+#: controllers/developers_controller.php:2689
 #: controllers/downloads_controller.php:94
 #: controllers/downloads_controller.php:101
 #: controllers/downloads_controller.php:152
-#: controllers/statistics_controller.php:127
+#: controllers/editors_controller.php:382
 #: controllers/previews_controller.php:115
 #: controllers/previews_controller.php:206
 #: controllers/previews_controller.php:307
-#: controllers/reviews_controller.php:77 controllers/reviews_controller.php:240
+#: controllers/reviews_controller.php:77
+#: controllers/reviews_controller.php:240
 #: controllers/reviews_controller.php:331
-#: controllers/reviews_controller.php:339 controllers/api_controller.php:114
-#: controllers/api_controller.php:401 controllers/api_controller.php:536
-#: controllers/api_controller.php:567 controllers/addons_controller.php:100
-#: controllers/addons_controller.php:1071
-#: controllers/addons_controller.php:1121
-#: controllers/addons_controller.php:1125
-#: controllers/editors_controller.php:382
+#: controllers/reviews_controller.php:339
+#: controllers/statistics_controller.php:127
 msgid "error_addon_notfound"
 msgstr "找不到附加元件！"
 
@@ -2855,28 +2862,28 @@ msgstr "此附加元件無法在此瀏覽。"
 msgid "error_addon_selfreview"
 msgstr "您無法對您自己的附加元件發表意見。"
 
-#: controllers/addons_controller.php:632
+#: controllers/addons_controller.php:631
 msgid "error_browse_no_addons"
 msgstr "此分類無附加元件！"
 
-#: views/users/register.thtml:60 views/users/edit.thtml:145
-#: views/developers/add_step2.thtml:117 controllers/api_controller.php:549
+#: views/developers/add_step2.thtml:117 views/users/edit.thtml:176
+#: views/users/register.thtml:60 controllers/api_controller.php:758
 msgid "error_email_invalid"
 msgstr "Email 地址無效。"
 
-#: views/users/pwreset.thtml:74 views/users/register.thtml:65
-#: views/users/register.thtml:75 views/users/register.thtml:81
-#: views/users/edit.thtml:95 views/users/edit.thtml:101
-#: views/users/edit.thtml:143 views/admin/users_edit.thtml:63
-#: views/admin/users_edit.thtml:68 views/reviews/add.thtml:94
-#: views/reviews/add.thtml:118
+#: views/admin/users_edit.thtml:63 views/admin/users_edit.thtml:68
+#: views/reviews/add.thtml:94 views/reviews/add.thtml:118
+#: views/users/edit.thtml:108 views/users/edit.thtml:114
+#: views/users/edit.thtml:174 views/users/pwreset.thtml:74
+#: views/users/register.thtml:65 views/users/register.thtml:75
+#: views/users/register.thtml:81
 msgid "error_field_required"
 msgstr "此欄位不能留空。"
 
-#: controllers/files_controller.php:75 controllers/files_controller.php:91
-#: controllers/files_controller.php:94 controllers/files_controller.php:157
-#: controllers/files_controller.php:170 controllers/files_controller.php:179
-#: controllers/files_controller.php:197 controllers/editors_controller.php:499
+#: controllers/editors_controller.php:499 controllers/files_controller.php:75
+#: controllers/files_controller.php:91 controllers/files_controller.php:94
+#: controllers/files_controller.php:157 controllers/files_controller.php:170
+#: controllers/files_controller.php:179 controllers/files_controller.php:197
 msgid "error_file_notfound"
 msgstr "找不到檔案！"
 
@@ -2885,44 +2892,45 @@ msgstr "找不到檔案！"
 msgid "error_file_x_notfound"
 msgstr "檔案錯誤：%s 不存在。"
 
-#: views/users/register.thtml:49 views/users/edit.thtml:84
-#: views/reviews/add.thtml:84 controllers/developers_controller.php:1585
-#: controllers/developers_controller.php:1860
-#: controllers/developers_controller.php:1999
-#: controllers/developers_controller.php:2007
-#: controllers/developers_controller.php:2298
+#: views/reviews/add.thtml:84 views/users/edit.thtml:84
+#: views/users/register.thtml:49 controllers/developers_controller.php:1591
+#: controllers/developers_controller.php:1866
+#: controllers/developers_controller.php:2005
+#: controllers/developers_controller.php:2013
+#: controllers/developers_controller.php:2304
 #: controllers/groups_controller.php:80 controllers/groups_controller.php:102
 msgid "error_formerrors"
 msgstr "此表單中有錯誤，請更正後再送出一次。"
 
-#: controllers/components/amo.php:539 controllers/components/amo.php:564
-msgid "error_no_files_in_addon"
-msgstr "沒有檔案"
-
 #: views/users/register.thtml:104
 msgid "error_invalid_captcha"
 msgstr "錯誤的圖形檢核碼，請再試一次！"
 
-#: views/users/register.thtml:95 views/users/edit.thtml:115
-#: views/developers/add_step2.thtml:112 views/developers/add_step2.thtml:122
-#: views/admin/users_edit.thtml:86
+#: views/admin/users_edit.thtml:86 views/developers/add_step2.thtml:112
+#: views/developers/add_step2.thtml:122 views/users/edit.thtml:128
+#: views/users/register.thtml:95
 msgid "error_invalid_url"
 msgstr "URL 格式無效，有效的 URL 像這樣： htt_p://example.com/mypage。"
 
-#: controllers/downloads_controller.php:65 controllers/users_controller.php:185
-#: controllers/users_controller.php:254 controllers/users_controller.php:535
-#: controllers/users_controller.php:635 controllers/reviews_controller.php:71
+#: controllers/addons_controller.php:87 controllers/addons_controller.php:1044
+#: controllers/addons_controller.php:1110 controllers/api_controller.php:751
+#: controllers/collections_controller.php:79
+#: controllers/downloads_controller.php:65
+#: controllers/reviews_controller.php:71
 #: controllers/reviews_controller.php:234
 #: controllers/reviews_controller.php:324
 #: controllers/reviews_controller.php:468
-#: controllers/reviews_controller.php:470 controllers/api_controller.php:542
-#: controllers/addons_controller.php:87 controllers/addons_controller.php:1045
-#: controllers/addons_controller.php:1111
-#: controllers/collections_controller.php:76
+#: controllers/reviews_controller.php:470 controllers/users_controller.php:185
+#: controllers/users_controller.php:254 controllers/users_controller.php:542
+#: controllers/users_controller.php:642
 #, php-format
 msgid "error_missing_argument"
 msgstr "缺少參數：%s"
 
+#: controllers/components/amo.php:539 controllers/components/amo.php:564
+msgid "error_no_files_in_addon"
+msgstr "沒有檔案"
+
 #: views/developers/add_step2.thtml:58 views/developers/add_step3.thtml:57
 msgid "error_notice"
 msgstr "注意"
@@ -2931,7 +2939,7 @@ msgstr "注意"
 msgid "error_preview_notfound"
 msgstr "找不到預覽圖片！"
 
-#: views/addons/display.thtml:376 views/reviews/add.thtml:112
+#: views/addons/display.thtml:372 views/reviews/add.thtml:112
 msgid "error_review_rating_required"
 msgstr "您必須選一個評分。"
 
@@ -2940,36 +2948,36 @@ msgid "error_user_already_confirmed"
 msgstr "此使用者帳號已確認。"
 
 #: controllers/users_controller.php:202 controllers/users_controller.php:265
-#: controllers/users_controller.php:545 controllers/users_controller.php:557
-#: controllers/users_controller.php:563 controllers/users_controller.php:592
-#: controllers/users_controller.php:609
+#: controllers/users_controller.php:552 controllers/users_controller.php:564
+#: controllers/users_controller.php:570 controllers/users_controller.php:599
+#: controllers/users_controller.php:616
 msgid "error_user_badconfirmationcode"
 msgstr "確認碼無效！"
 
-#: views/users/pwreset.thtml:79 views/users/register.thtml:70
-#: views/users/edit.thtml:133
+#: views/users/edit.thtml:162 views/users/pwreset.thtml:79
+#: views/users/register.thtml:70
 msgid "error_user_confirmpw_nomatch"
 msgstr "密碼不符。"
 
-#: views/users/register.thtml:60 views/users/edit.thtml:141
-#: controllers/users_controller.php:599
+#: views/users/edit.thtml:172 views/users/register.thtml:60
+#: controllers/users_controller.php:606
 msgid "error_user_email_notunique"
 msgstr "此 Email 地址已被其他使用者使用。"
 
-#: controllers/users_controller.php:573 controllers/users_controller.php:574
+#: controllers/users_controller.php:580 controllers/users_controller.php:581
 msgid "error_user_emailchange_expired"
 msgstr ""
 "Email 變更鏈結已過期。請到使用者帳號頁面再變更一次 Email 地址後，我們會寄給您"
 "一封確認信，請儘快按下信中的鏈結變更才算生效。"
 
-#: views/users/register.thtml:86 views/users/edit.thtml:106
-#: views/admin/users_edit.thtml:73
+#: views/admin/users_edit.thtml:73 views/users/edit.thtml:119
+#: views/users/register.thtml:86
 msgid "error_user_nickname_notunique"
 msgstr "此暱稱已被使用。"
 
 #: views/users/pwreset.thtml:54 controllers/users_controller.php:191
-#: controllers/users_controller.php:260 controllers/users_controller.php:585
-#: controllers/users_controller.php:641
+#: controllers/users_controller.php:260 controllers/users_controller.php:592
+#: controllers/users_controller.php:648
 msgid "error_user_notfound"
 msgstr "找不到使用者！"
 
@@ -2981,71 +2989,72 @@ msgstr "請先用您收到的確認碼確認您的使用者帳號。"
 msgid "error_username_or_pw_wrong"
 msgstr "使用者名稱或密碼錯誤！"
 
-#: controllers/developers_controller.php:2530
+#: controllers/developers_controller.php:2536
 #: controllers/editors_controller.php:377
 msgid "error_version_notfound"
 msgstr "找不到版本！"
 
-#: views/users/delete.thtml:118 views/users/edit.thtml:123
+#: views/users/delete.thtml:118 views/users/edit.thtml:152
 msgid "error_wrong_password"
 msgstr "輸入的密碼錯誤！"
 
-#: views/elements/feature.thtml:112
+#: views/elements/feature.thtml:128
 msgid "feature_learnmore"
 msgstr "詳細資訊"
 
 # %1 is the add-on name
-#: views/elements/feature.thtml:113
+#: views/elements/feature.thtml:129
 #, php-format
 msgid "feature_learnmore_about_addon"
 msgstr "%1$s 的詳細資訊"
 
-#: views/elements/addon_listitem.thtml:128 views/elements/feature.thtml:83
-#: views/addons/display.thtml:98 views/addons/browse_thumbs.thtml:100
+#: views/addons/browse_thumbs.thtml:100 views/addons/display.thtml:98
+#: views/elements/addon_listitem.thtml:131 views/elements/feature.thtml:99
 #, php-format
 msgid "feature_reviews"
 msgid_plural "feature_reviews"
 msgstr[0] "%1$s 篇意見"
 
-#: views/elements/feature.thtml:117
+#: views/elements/feature.thtml:133
 msgid "feature_view_more_from_category"
 msgstr "更多同類元件："
 
-#: views/elements/footer.thtml:69
+#: views/elements/footer.thtml:67
 msgid "footer_all_rights_reserved"
 msgstr "保留所有權利。"
 
-#: views/elements/footer.thtml:69
+#: views/elements/footer.thtml:67
 msgid "footer_copyright"
 msgstr "版權所有"
 
-#: views/elements/footer.thtml:73
+#: views/elements/footer.thtml:71
 msgid "footer_credits"
 msgstr "感謝"
 
-#: views/elements/footer.thtml:75
+#: views/elements/footer.thtml:73
 msgid "footer_disclaimer"
 msgstr ""
-"Mozilla 出於善意提供以上程式鏈結，然而我們並不代表以上程式或相關資訊的作者。使"
-"用以上程式時若有任何疑問或不滿，或需要進一步的服務，還請直接與軟體供應者聯繫。"
+"Mozilla 出於善意提供以上程式鏈結，然而我們並不代表以上程式或相關資訊的作者。"
+"使用以上程式時若有任何疑問或不滿，或需要進一步的服務，還請直接與軟體供應者聯"
+"繫。"
 
-#: views/elements/footer.thtml:63
+#: views/elements/footer.thtml:61
 msgid "footer_lang_form_lang_submit_go"
 msgstr "衝"
 
-#: views/elements/footer.thtml:72
+#: views/elements/footer.thtml:70
 msgid "footer_legal_notices"
 msgstr "法律聲明"
 
-#: views/elements/footer.thtml:52
+#: views/elements/footer.thtml:50
 msgid "footer_other_languages"
 msgstr "其他語言："
 
-#: views/elements/footer.thtml:71
+#: views/elements/footer.thtml:69
 msgid "footer_privacy_policy"
 msgstr "隱私政策"
 
-#: views/addons/display.thtml:382
+#: views/addons/display.thtml:378
 msgid "forum_save"
 msgstr "儲存"
 
@@ -3078,9 +3087,8 @@ msgstr "Thunderbird 附加元件"
 msgid "header_navlink_addons"
 msgstr "附加元件"
 
-#: views/elements/developers/sidebar.thtml:72
-#: views/elements/developers/myaddons.thtml:72 views/elements/header.thtml:151
-#: views/addons/display.thtml:363
+#: views/addons/display.thtml:359 views/elements/developers/myaddons.thtml:72
+#: views/elements/developers/sidebar.thtml:72 views/elements/header.thtml:151
 msgid "header_navlink_login"
 msgstr "登入"
 
@@ -3096,10 +3104,11 @@ msgstr "我的帳號"
 msgid "header_navlink_register"
 msgstr "註冊"
 
-#: views/elements/collections_interactive_addon.thtml:62
-#: views/elements/addon_discussionheader.thtml:63
-#: views/elements/addon_listitem.thtml:78 views/elements/feature.thtml:68
 #: views/addons/browse_thumbs.thtml:60
+#: views/elements/addon_discussionheader.thtml:63
+#: views/elements/addon_listitem.thtml:81
+#: views/elements/collections_interactive_addon.thtml:62
+#: views/elements/feature.thtml:84 views/elements/fyf_promotion.thtml:46
 #, php-format
 msgid "img_preview_of"
 msgstr "%s 的預覽圖片"
@@ -3108,7 +3117,8 @@ msgstr "%s 的預覽圖片"
 # %2 is the link to an explanatory page.
 #: views/elements/install.thtml:223
 msgid "install_a_login_to_install"
-msgstr "<a href=\"%1$s\">登入</a> 才能安裝此元件。<a href=\"%2$s\">為什麼</a>？"
+msgstr ""
+"<a href=\"%1$s\">登入</a> 才能安裝此元件。<a href=\"%2$s\">為什麼</a>？"
 
 #: views/elements/install.thtml:67
 #, php-format
@@ -3143,8 +3153,8 @@ msgstr "下載字典套件"
 msgid "langtools_download_langpack"
 msgstr "下載語言套件"
 
-#: views/elements/addon_categories.thtml:54 views/addons/dictionaries.thtml:59
-#: controllers/components/amo.php:735 controllers/addons_controller.php:902
+#: views/addons/dictionaries.thtml:59 views/elements/addon_categories.thtml:54
+#: controllers/addons_controller.php:901 controllers/components/amo.php:735
 msgid "langtools_header_dicts_and_langpacks"
 msgstr "字典及語言套件"
 
@@ -3168,9 +3178,9 @@ msgstr "語言套件"
 msgid "langtools_tableheader_language"
 msgstr "語言套件"
 
-#: views/users/emailchange.thtml:54 views/users/delete.thtml:53
+#: views/reviews/flag.thtml:52 views/users/delete.thtml:53
 #: views/users/delete.thtml:130 views/users/edit.thtml:72
-#: views/users/edit.thtml:73 views/reviews/flag.thtml:52
+#: views/users/edit.thtml:73 views/users/emailchange.thtml:54
 msgid "link_return_to_front_page"
 msgstr "按這裡回到網站首頁。"
 
@@ -3250,23 +3260,23 @@ msgstr "實驗中附加元件"
 msgid "page_title_fashionyourfirefox_faq"
 msgstr "Fashion your Firefox FAQ"
 
-#: controllers/pages_controller.php:98
+#: controllers/pages_controller.php:103
 msgid "page_title_policy"
 msgstr "附加元件使用條款"
 
-#: controllers/pages_controller.php:100
+#: controllers/pages_controller.php:105
 msgid "page_title_privacy"
 msgstr "Mozilla 隱私權保護政策"
 
-#: controllers/pages_controller.php:102
+#: controllers/pages_controller.php:107
 msgid "page_title_review_guide"
 msgstr "意見撰寫指南"
 
-#: controllers/pages_controller.php:104
+#: controllers/pages_controller.php:109
 msgid "page_title_sandbox"
 msgstr "沙箱審核系統"
 
-#: controllers/pages_controller.php:106
+#: controllers/pages_controller.php:111
 msgid "page_title_submissionhelp"
 msgstr "上傳說明"
 
@@ -3281,8 +3291,8 @@ msgstr "有效應用程式版本"
 #: views/pages/appversions.thtml:79
 msgid "pages_appversions_intro"
 msgstr ""
-"上傳到 Mozilla 附加元件的元件必須含有 install.rdf 檔案，並至少支援下面其中之一"
-"的應用程式。只有下面列出的應用程式版本允許上傳。"
+"上傳到 Mozilla 附加元件的元件必須含有 install.rdf 檔案，並至少支援下面其中之"
+"一的應用程式。只有下面列出的應用程式版本允許上傳。"
 
 #: views/pages/appversions.thtml:92
 #, php-format
@@ -3323,31 +3333,35 @@ msgstr "上一頁"
 #: views/elements/recaptcha.thtml:65
 msgid "recaptcha_enter_both_words"
 msgstr ""
-"請輸入下面<strong>兩個英文單字</strong>，<strong>中間用半形空白分開</strong>。"
+"請輸入下面<strong>兩個英文單字</strong>，<strong>中間用半形空白分開</"
+"strong>。"
 
 #: views/elements/recaptcha.thtml:83
 msgid "recaptcha_enter_here"
 msgstr "輸入您的答案："
 
 #: views/elements/recaptcha.thtml:74
-msgid "recaptcha_enter_numbers"
-msgstr "請在下面輸入您聽到的<strong>數字</strong>。"
+#, fuzzy
+msgid "recaptcha_enter_whatyouhear"
+msgstr "Please type what you hear."
 
 # %1 is the link switching refreshing the captcha
 # %2 is the link switching to a text captcha
 #: views/elements/recaptcha.thtml:77
-msgid "recaptcha_hardtohear"
+#, fuzzy
+msgid "recaptcha_hardtohear_text"
 msgstr ""
-"如果這對您來說難以了解，您可以<a href=\"%1$s\">換其他數字</a>或是<a href=\"%2"
-"$s\">換回英文單字</a>。"
+"If this is hard to understand, you can <a href=\"%1$s\">listen to something "
+"else</a> or <a href=\"%2$s\">switch back to text</a>."
 
 # %1 is the link switching refreshing the captcha
 # %2 is the link switching to an audio captcha
 #: views/elements/recaptcha.thtml:68
-msgid "recaptcha_hardtoread"
+#, fuzzy
+msgid "recaptcha_hardtoread_text"
 msgstr ""
-"如果這對您來說難以了解，您可以<a href=\"%1$s\">換其他英文單字</a>或是<a href="
-"\"%2$s\">用聽英文數字</a>代替。"
+"If this is hard to read, you can <a href=\"%1$s\">try different words</a> or "
+"<a href=\"%2$s\">listen to something</a> instead."
 
 #: views/users/register.thtml:100
 msgid "recaptcha_label"
@@ -3400,29 +3414,29 @@ msgid "review_guidelines_short"
 msgstr ""
 "<p>請將這些話記在心裡：</p><ul><li>用寫給朋友的方式告訴大家您對此附加元件的使"
 "用經驗。寫出特定且有幫助的細節，像是您喜歡或是不喜歡的功能，此套建是否容易使"
-"用，和此套件的劣勢在哪。避免一般的用詞像是「好棒」或是「真難用」，除非您解釋為"
-"何您這樣認為。</li><li>請勿在意見處回報程式臭蟲。我們不會將您的 e-mail 顯示給"
-"擴充套件作者，且他們或許會需要和您聯絡才能解決該問題。請至<a href=\"%1$s\">技"
-"術支援小節</a>參考如何尋求使用上的協助。</li><li>請勿使用髒話，或是洩漏個人資"
-"訊</li></ul><p>更多關於使用者意見的資訊，請參考<a href=\"%2$s\">意見撰寫指南</"
-"a>。</p>"
+"用，和此套件的劣勢在哪。避免一般的用詞像是「好棒」或是「真難用」，除非您解釋"
+"為何您這樣認為。</li><li>請勿在意見處回報程式臭蟲。我們不會將您的 e-mail 顯示"
+"給擴充套件作者，且他們或許會需要和您聯絡才能解決該問題。請至<a href=\"%1$s\">"
+"技術支援小節</a>參考如何尋求使用上的協助。</li><li>請勿使用髒話，或是洩漏個人"
+"資訊</li></ul><p>更多關於使用者意見的資訊，請參考<a href=\"%2$s\">意見撰寫指"
+"南</a>。</p>"
 
 # %1 is the addon name
-#: views/reviews/flag.thtml:54 views/reviews/display.thtml:54
+#: views/reviews/display.thtml:54 views/reviews/flag.thtml:54
 #: views/reviews/review_added.thtml:47
 #, php-format
 msgid "reviews_header"
 msgstr "對 %s 的意見"
 
-#: controllers/addons_controller.php:269
+#: controllers/addons_controller.php:267
 msgid "rss_featuredaddons"
 msgstr "推薦附加元件"
 
-#: controllers/addons_controller.php:267
+#: controllers/addons_controller.php:265
 msgid "rss_newestaddons"
 msgstr "最新附加元件"
 
-#: controllers/addons_controller.php:268
+#: controllers/addons_controller.php:266
 msgid "rss_updatedaddons"
 msgstr "最近更新元件"
 
@@ -3430,24 +3444,24 @@ msgstr "最近更新元件"
 msgid "search_disabled"
 msgstr "搜尋功能目前暫停使用，請稍後再試試看。"
 
-#: views/elements/search.thtml:206
+#: views/elements/search.thtml:186
 msgid "search_form_all_addons"
 msgstr "所有元件"
 
-#: views/elements/search.thtml:190 views/elements/search.thtml:202
-#: views/layouts/mozilla.thtml:189
+#: views/elements/search.thtml:170 views/elements/search.thtml:182
+#: views/layouts/mozilla.thtml:188
 msgid "search_form_default_text"
 msgstr "搜尋附加元件"
 
-#: views/elements/search.thtml:220
+#: views/elements/search.thtml:201
 msgid "search_form_submit_tooltip"
 msgstr "搜尋附加元件"
 
-#: views/elements/search.thtml:202
+#: views/elements/search.thtml:182
 msgid "search_form_tooltip"
 msgstr "按此處輸入搜尋關鍵字"
 
-#: views/elements/search.thtml:204
+#: views/elements/search.thtml:184
 msgid "search_form_within"
 msgstr "範圍"
 
@@ -3482,23 +3496,23 @@ msgstr "搜尋結果消息來源"
 msgid "search_rss_results_for"
 msgstr "搜尋結果：%s "
 
-#: views/addons/home.thtml:165
+#: views/addons/home.thtml:172
 msgid "sidebar_navlink_admin_tools"
 msgstr "管理員工具"
 
-#: views/elements/header.thtml:146 views/addons/home.thtml:157
+#: views/addons/home.thtml:164 views/elements/header.thtml:146
 msgid "sidebar_navlink_developer_tools"
 msgstr "開發者工具"
 
-#: views/addons/home.thtml:159
+#: views/addons/home.thtml:166
 msgid "sidebar_navlink_editor_tools"
 msgstr "審核者工具"
 
-#: views/addons/home.thtml:155
+#: views/addons/home.thtml:162
 msgid "sidebar_navlink_welcome"
 msgstr "歡迎"
 
-#: views/addons/home.thtml:155
+#: views/addons/home.thtml:162
 #, php-format
 msgid "sidebar_navlink_welcome_name"
 msgstr "歡迎您，%s"
@@ -3535,9 +3549,9 @@ msgstr "佈景主題"
 msgid "sidebar_pitch_updated_addons"
 msgstr "最近更新元件"
 
-#: views/helpers/localization.php:65 views/developers/editversion.thtml:58
-#: views/developers/versions_edit.thtml:94 views/developers/add_step3.thtml:74
-#: views/addons/dictionaries.thtml:88
+#: views/addons/dictionaries.thtml:88 views/developers/add_step3.thtml:74
+#: views/developers/editversion.thtml:58
+#: views/developers/versions_edit.thtml:94 views/helpers/localization.php:65
 #, php-format
 msgid "size_kb"
 msgstr "%1$s KB"
@@ -3564,16 +3578,16 @@ msgstr "開發者工具"
 msgid "statistics_addon_switch"
 msgstr "切換元件"
 
-#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:167
+#: views/statistics/addon.thtml:167 views/statistics/rss/summary.thtml:54
 msgid "statistics_date_shortmonth"
 msgstr "%m 月 %e 日"
 
-#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:138
+#: views/statistics/addon.thtml:138 views/statistics/rss/summary.thtml:40
 msgid "statistics_date_shortmonthwithyear"
 msgstr "%Y 年 %m 月 %e 日"
 
-#: views/statistics/rss/summary.thtml:41 views/statistics/rss/summary.thtml:48
 #: views/statistics/addon.thtml:147 views/statistics/addon.thtml:158
+#: views/statistics/rss/summary.thtml:41 views/statistics/rss/summary.thtml:48
 msgid "statistics_date_weekdayshortmonth"
 msgstr "%m 月 %e 日 (%a)"
 
@@ -3762,8 +3776,8 @@ msgstr "我們還沒有任何關於此附加元件的資料，請過幾天後再
 #: views/statistics/addon.thtml:41
 msgid "statistics_notice_data_updating"
 msgstr ""
-"附加元件統計資訊正在更新中，因程式碼正在更新相關資訊的緣故，最近的資料可能會不"
-"完整。請過幾分鐘後再回來檢查。"
+"附加元件統計資訊正在更新中，因程式碼正在更新相關資訊的緣故，最近的資料可能會"
+"不完整。請過幾分鐘後再回來檢查。"
 
 #: views/statistics/addon.thtml:122
 msgid "statistics_notice_disabled"
@@ -3908,7 +3922,7 @@ msgstr "未知"
 msgid "statistics_shortnames_version"
 msgstr "版本"
 
-#: views/statistics/rss/summary.thtml:42 views/statistics/addon.thtml:190
+#: views/statistics/addon.thtml:190 views/statistics/rss/summary.thtml:42
 msgid "statistics_summary_downloads_average"
 msgstr "每日平均下載數"
 
@@ -3916,37 +3930,37 @@ msgstr "每日平均下載數"
 msgid "statistics_summary_downloads_heading"
 msgstr "下載"
 
-#: views/statistics/rss/summary.thtml:41 views/statistics/addon.thtml:157
+#: views/statistics/addon.thtml:157 views/statistics/rss/summary.thtml:41
 msgid "statistics_summary_downloads_lastcount"
 msgstr "昨日下載次數"
 
-#: views/statistics/rss/summary.thtml:43 views/statistics/addon.thtml:197
+#: views/statistics/addon.thtml:197 views/statistics/rss/summary.thtml:43
 msgid "statistics_summary_downloads_lastweek"
 msgstr "最近七日下載次數"
 
-#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:137
+#: views/statistics/addon.thtml:137 views/statistics/rss/summary.thtml:40
 msgid "statistics_summary_downloads_total"
 msgstr "總下載次數"
 
-#: views/statistics/rss/summary.thtml:40 views/statistics/addon.thtml:138
+#: views/statistics/addon.thtml:138 views/statistics/rss/summary.thtml:40
 #, php-format
 msgid "statistics_summary_downloads_total_sincedate"
 msgstr "從 %1$s 開始"
 
-#: views/statistics/rss/summary.thtml:50 views/statistics/rss/summary.thtml:56
 #: views/statistics/addon.thtml:149 views/statistics/addon.thtml:169
+#: views/statistics/rss/summary.thtml:50 views/statistics/rss/summary.thtml:56
 msgid "statistics_summary_nodata"
 msgstr "尚無資料"
 
-#: views/statistics/rss/summary.thtml:70 views/statistics/addon.thtml:193
+#: views/statistics/addon.thtml:193 views/statistics/rss/summary.thtml:70
 msgid "statistics_summary_updatepings_average"
 msgstr "每日平均有效使用者"
 
-#: views/statistics/rss/summary.thtml:52 views/statistics/addon.thtml:163
+#: views/statistics/addon.thtml:163 views/statistics/rss/summary.thtml:52
 msgid "statistics_summary_updatepings_changefromprevious"
 msgstr "與上次計數相比"
 
-#: views/statistics/rss/summary.thtml:54 views/statistics/addon.thtml:167
+#: views/statistics/addon.thtml:167 views/statistics/rss/summary.thtml:54
 #, php-format
 msgid "statistics_summary_updatepings_changefromprevious_ondate"
 msgstr "%1$s 於 %2$s"
@@ -3955,11 +3969,11 @@ msgstr "%1$s 於 %2$s"
 msgid "statistics_summary_updatepings_heading"
 msgstr "每日有效使用者"
 
-#: views/statistics/rss/summary.thtml:46 views/statistics/addon.thtml:143
+#: views/statistics/addon.thtml:143 views/statistics/rss/summary.thtml:46
 msgid "statistics_summary_updatepings_total"
 msgstr "每日有效使用者"
 
-#: views/statistics/rss/summary.thtml:48 views/statistics/addon.thtml:147
+#: views/statistics/addon.thtml:147 views/statistics/rss/summary.thtml:48
 #, php-format
 msgid "statistics_summary_updatepings_total_ondate"
 msgstr "於 %1$s"
@@ -3978,11 +3992,11 @@ msgstr "所有佈景主題"
 msgid "themes_landing_browse_themes"
 msgstr "瀏覽佈景主題"
 
-#: views/users/edit.thtml:136
+#: views/users/edit.thtml:99 views/users/edit.thtml:167
 msgid "user_change_email"
 msgstr "變更 Email 地址"
 
-#: views/users/edit.thtml:118
+#: views/users/edit.thtml:98 views/users/edit.thtml:148
 msgid "user_change_password"
 msgstr "變更密碼"
 
@@ -4014,8 +4028,8 @@ msgstr "立刻刪掉我的帳號"
 msgid "user_del_error_addons"
 msgstr ""
 "您不能刪除您的帳號，因為您目前的角色是<a href=\"%1$s\">附加元件作者</a>。要刪"
-"除您的帳號，請通知其他附加元件共同作者請他們將您從作者清單中移除。之後您就能刪"
-"除帳號了。"
+"除您的帳號，請通知其他附加元件共同作者請他們將您從作者清單中移除。之後您就能"
+"刪除帳號了。"
 
 # %1 is a link to the amo-editors mailing list
 #: views/users/delete.thtml:69
@@ -4034,8 +4048,8 @@ msgstr "請輸入正確的密碼以完成這個步驟。"
 #: views/users/delete.thtml:83
 msgid "user_del_error_unknown"
 msgstr ""
-"在刪除帳號時發生不明的錯誤。請向 %1$s 通知這個問題，我們會幫您手動移除帳號。我"
-"們對造成的不便感到抱歉。"
+"在刪除帳號時發生不明的錯誤。請向 %1$s 通知這個問題，我們會幫您手動移除帳號。"
+"我們對造成的不便感到抱歉。"
 
 #: views/users/delete.thtml:103
 msgid "user_del_header_confirm_deletion"
@@ -4066,8 +4080,8 @@ msgstr "您的意見和評分不會被刪除，但那些資料與帳號的連結
 #: views/users/delete.thtml:97
 msgid "user_del_specific_problem_editors"
 msgstr ""
-"若您有任何我們可能能幫上忙的問題，請別刪掉您的帳號，而是到 %1$s 聯絡我們，我們"
-"會竭盡所能的幫助您解決問題。"
+"若您有任何我們可能能幫上忙的問題，請別刪掉您的帳號，而是到 %1$s 聯絡我們，我"
+"們會竭盡所能的幫助您解決問題。"
 
 #: views/users/delete.thtml:123
 msgid "user_del_understand_permanent"
@@ -4081,10 +4095,11 @@ msgstr "刪除使用者帳號"
 #: views/users/edit.thtml:58 views/users/edit.thtml:59
 msgid "user_edit_confirm_email_sent"
 msgstr ""
-"我們已寄出一封信到 %1$s 以確認您的新 Email 地址。您必須按下信中的鏈結才算完成 "
-"Email 變更的程序。在完成變更程序以前，您還是可以用現在的 Email 地址登入網站。"
+"我們已寄出一封信到 %1$s 以確認您的新 Email 地址。您必須按下信中的鏈結才算完"
+"成 Email 變更的程序。在完成變更程序以前，您還是可以用現在的 Email 地址登入網"
+"站。"
 
-#: views/users/edit.thtml:154
+#: views/users/edit.thtml:183
 msgid "user_edit_delete_user"
 msgstr "刪除使用者帳號"
 
@@ -4097,8 +4112,8 @@ msgid "user_email_confirm_account_nopass"
 msgstr ""
 "歡迎來到 %2$s 附加元件。\n"
 "\n"
-"在您使用新帳號登入之前必須先啟用帳號 – 這能確定您寫的 Email 地址屬於您並真的有"
-"在用。\n"
+"在您使用新帳號登入之前必須先啟用帳號 – 這能確定您寫的 Email 地址屬於您並真的"
+"有在用。\n"
 "請按下面的鏈結或複製整串網址到瀏覽器的位址列後貼上以啟用您的帳號：\n"
 "\n"
 "%1$s\n"
@@ -4121,8 +4136,8 @@ msgstr ""
 "\n"
 "%1$s\n"
 "\n"
-"您有 48 小時的時間可確認新 Email 地址。若您中途反悔，不想變更 Email 地址的話，"
-"請不要理會這封信即可。\n"
+"您有 48 小時的時間可確認新 Email 地址。若您中途反悔，不想變更 Email 地址的"
+"話，請不要理會這封信即可。\n"
 "\n"
 "感謝您！\n"
 "-- %2$s 附加元件開發小組"
@@ -4140,8 +4155,8 @@ msgid "user_email_pwreset"
 msgstr ""
 "%2$s 附加元件密碼重設\n"
 "\n"
-"我們已收到您要求重設 addons.mozilla.org 上的密碼。請按下面的鏈結或複製整串網址"
-"到瀏覽器的位址列後貼上以變更密碼：\n"
+"我們已收到您要求重設 addons.mozilla.org 上的密碼。請按下面的鏈結或複製整串網"
+"址到瀏覽器的位址列後貼上以變更密碼：\n"
 "\n"
 "%1$s\n"
 "\n"
@@ -4160,7 +4175,7 @@ msgid "user_emailchange_error"
 msgstr "錯誤！"
 
 # %1 is the application name
-#: controllers/users_controller.php:506 controllers/users_controller.php:507
+#: controllers/users_controller.php:513 controllers/users_controller.php:514
 #, php-format
 msgid "user_emailchange_subject"
 msgstr "請確認您在 %1$s 附加元件網站變更的 Email 地址"
@@ -4175,38 +4190,38 @@ msgstr "成功！"
 msgid "user_emailchange_successful_description"
 msgstr "您的 Email 地址已變更成功，從現在起請用 %1$s 來登入網站。"
 
-#: views/users/pwreset.thtml:77 views/users/register.thtml:68
-#: views/users/edit.thtml:131
+#: views/users/edit.thtml:160 views/users/pwreset.thtml:77
+#: views/users/register.thtml:68
 msgid "user_form_confirmpassword"
 msgstr "請再次輸入密碼"
 
-#: views/users/edit.thtml:88
+#: views/users/edit.thtml:89
 #, php-format
 msgid "user_form_editprofile"
 msgstr "編輯 %s 的使用者檔案"
 
-#: views/users/pwreset.thtml:52 views/users/login.thtml:81
-#: views/users/register.thtml:58 views/users/edit.thtml:138
+#: views/users/edit.thtml:169 views/users/login.thtml:81
+#: views/users/pwreset.thtml:52 views/users/register.thtml:58
 msgid "user_form_email"
 msgstr "Email 地址"
 
-#: views/users/register.thtml:73 views/users/edit.thtml:93
-#: views/admin/users_edit.thtml:61
+#: views/admin/users_edit.thtml:61 views/users/edit.thtml:106
+#: views/users/register.thtml:73
 msgid "user_form_firstname"
 msgstr "名字"
 
-#: views/users/register.thtml:89 views/users/edit.thtml:109
-#: views/admin/users_edit.thtml:76
+#: views/admin/users_edit.thtml:76 views/users/edit.thtml:122
+#: views/users/register.thtml:89
 msgid "user_form_hideemail"
 msgstr "我要隱藏 Email 地址"
 
-#: views/users/register.thtml:93 views/users/edit.thtml:113
-#: views/admin/users_edit.thtml:84
+#: views/admin/users_edit.thtml:84 views/users/edit.thtml:126
+#: views/users/register.thtml:93
 msgid "user_form_homepage"
 msgstr "網站 URL"
 
-#: views/users/register.thtml:79 views/users/edit.thtml:99
-#: views/admin/users_edit.thtml:66
+#: views/admin/users_edit.thtml:66 views/users/edit.thtml:112
+#: views/users/register.thtml:79
 msgid "user_form_lastname"
 msgstr "姓氏"
 
@@ -4214,20 +4229,20 @@ msgstr "姓氏"
 msgid "user_form_login"
 msgstr "使用者登入"
 
-#: views/users/pwreset.thtml:72 views/users/edit.thtml:126
+#: views/users/edit.thtml:155 views/users/pwreset.thtml:72
 msgid "user_form_newpassword"
 msgstr "新密碼"
 
-#: views/users/register.thtml:84 views/users/edit.thtml:104
-#: views/admin/users_edit.thtml:71
+#: views/admin/users_edit.thtml:71 views/users/edit.thtml:117
+#: views/users/register.thtml:84
 msgid "user_form_nickname"
 msgstr "暱稱"
 
-#: views/users/edit.thtml:121
+#: views/users/edit.thtml:150
 msgid "user_form_oldpassword"
 msgstr "舊密碼"
 
-#: views/users/edit.thtml:152
+#: views/users/edit.thtml:100 views/users/edit.thtml:182
 msgid "user_form_otheractions"
 msgstr "其他動作"
 
@@ -4247,7 +4262,7 @@ msgstr "在此電腦上記住我"
 msgid "user_form_showsandbox"
 msgstr "我要顯示「沙箱」區？"
 
-#: views/users/edit.thtml:149
+#: views/users/edit.thtml:187
 msgid "user_form_submit_edit"
 msgstr "儲存"
 
@@ -4268,11 +4283,40 @@ msgstr "%s 附加元件註冊日期"
 msgid "user_login_register_link"
 msgstr "建立新帳號"
 
-#: controllers/users_controller.php:519
+#: views/users/edit.thtml:139
+#, fuzzy
+msgid "user_notifications_item_compat"
+msgstr "Add-on Compatibility (strongly recommended)"
+
+#: views/users/edit.thtml:140
+#, fuzzy
+msgid "user_notifications_item_events"
+msgstr "Upcoming events and contests"
+
+#: views/users/edit.thtml:135
+#, fuzzy
+msgid "user_notifications_none_available"
+msgstr "There are currently no notifications available for you to configure."
+
+#: views/users/edit.thtml:137
+#, fuzzy
+msgid "user_notifications_select_topics"
+msgstr ""
+"From time to time, Mozilla may send you email about upcoming releases and "
+"add-on events. Please select the topics you are interested in below:"
+
+#: views/users/edit.thtml:143
+#, fuzzy
+msgid "user_notifications_specific_contact"
+msgstr ""
+"Mozilla reserves the right to contact you individually about specific "
+"concerns with your hosted add-ons."
+
+#: controllers/users_controller.php:526
 msgid "user_profile_edit_error"
 msgstr "您所作的變更中有錯誤，請更正後再重新送出一次.."
 
-#: controllers/users_controller.php:516
+#: controllers/users_controller.php:523
 msgid "user_profile_saved"
 msgstr "使用者檔案已更新。"
 
@@ -4315,8 +4359,8 @@ msgstr "%s 附加元件"
 #, php-format
 msgid "user_register_click_confirm_link"
 msgstr ""
-"啟動您帳號的鏈結已寄到您的 Email 地址 %1$s，在您登入 %2$s 附加元件之前必須先按"
-"下該鏈結以啟動帳號。"
+"啟動您帳號的鏈結已寄到您的 Email 地址 %1$s，在您登入 %2$s 附加元件之前必須先"
+"按下該鏈結以啟動帳號。"
 
 # %1 is the user's email address
 #: views/users/register_complete.thtml:50
@@ -4348,15 +4392,25 @@ msgstr ""
 msgid "user_register_welcome"
 msgstr "感謝您註冊並歡迎加入 %1$s！"
 
-#: views/users/register.thtml:76 views/users/edit.thtml:96
+#: views/users/edit.thtml:109 views/users/register.thtml:76
 msgid "user_required_firstlast_or_nickname"
 msgstr "需要姓氏、名稱或是暱稱之一。"
 
+#: views/users/edit.thtml:97 views/users/edit.thtml:133
+#, fuzzy
+msgid "user_tab_notifications"
+msgstr "Notifications"
+
+#: views/users/edit.thtml:96 views/users/edit.thtml:104
+#, fuzzy
+msgid "user_tab_profile"
+msgstr "User Profile"
+
 #: controllers/users_controller.php:209
 msgid "user_verified_okay"
 msgstr "驗證成功！"
 
-#: controllers/users_controller.php:680
+#: controllers/users_controller.php:687
 msgid "users_delete_pagetitle"
 msgstr "刪除使用者帳號"
 
@@ -4389,7 +4443,7 @@ msgstr "個人首頁"
 msgid "users_info_nickname"
 msgstr "暱稱"
 
-#: controllers/users_controller.php:664
+#: controllers/users_controller.php:671
 #, php-format
 msgid "users_info_pagetitle"
 msgstr "%1$s 的使用者資訊"
@@ -4423,3 +4477,23 @@ msgstr "使用者密碼重設"
 #: controllers/users_controller.php:90 controllers/users_controller.php:92
 msgid "users_register_pagetitle"
 msgstr "新使用者註冊"
+
+#~ msgid "addon_recommended"
+#~ msgstr "Mozilla 推薦此附加元件"
+
+#~ msgid "recaptcha_enter_numbers"
+#~ msgstr "請在下面輸入您聽到的<strong>數字</strong>。"
+
+# %1 is the link switching refreshing the captcha
+# %2 is the link switching to a text captcha
+#~ msgid "recaptcha_hardtohear"
+#~ msgstr ""
+#~ "如果這對您來說難以了解，您可以<a href=\"%1$s\">換其他數字</a>或是<a href="
+#~ "\"%2$s\">換回英文單字</a>。"
+
+# %1 is the link switching refreshing the captcha
+# %2 is the link switching to an audio captcha
+#~ msgid "recaptcha_hardtoread"
+#~ msgstr ""
+#~ "如果這對您來說難以了解，您可以<a href=\"%1$s\">換其他英文單字</a>或是<a "
+#~ "href=\"%2$s\">用聽英文數字</a>代替。"