`` to display the results:
+
+.. code-block:: html
+
+
+
+Finally, we'll use JQuery to make the asynchronous requests and handle the interactivity:
+
+.. code-block:: guess
+
+ $(function() {
+
+ // cache the elements
+ var searchBox = $('#json-search'),
+ resultsBox = $('#json-results');
+ // when there's something in the input box, make the query
+ searchBox.on('input', function() {
+ if( searchBox.val() == ''){
+ resultsBox.html('');
+ return;
+ }
+ // make the request to the Wagtail JSON search view
+ $.ajax({
+ url: wagtailJSONSearchURL + "?q=" + searchBox.val(),
+ dataType: "json"
+ })
+ .done(function(data) {
+ console.log(data);
+ if( data == undefined ){
+ resultsBox.html('');
+ return;
+ }
+ // we're in business! let's format the results
+ var htmlOutput = '';
+ data.forEach(function(element, index, array){
+ htmlOutput += '
' + element.title + '
';
+ });
+ // and display them
+ resultsBox.html(htmlOutput);
+ })
+ .error(function(data){
+ console.log(data);
+ });
+ });
+
+ });
+
+Results are returned as a JSON object with this structure:
+
+.. code-block:: guess
+
+ {
+ [
+ {
+ title: "Lumpy Space Princess",
+ url: "/oh-my-glob/"
+ },
+ {
+ title: "Lumpy Space",
+ url: "/no-smooth-posers/"
+ },
+ ...
+ ]
+ }
+
+What if you wanted access to the rest of the results context or didn't feel like using JSON? Wagtail also provides a generalized AJAX interface where you can use your own template to serve results asynchronously.
+
+The AJAX interface uses the same view as the normal HTML search, ``wagtailsearch_search``, but will serve different results if Django classifies the request as AJAX (``request.is_ajax()``). Another entry in your project settings will let you override the template used to serve this response:
+
+.. code-block:: python
+
+ WAGTAILSEARCH_RESULTS_TEMPLATE_AJAX = 'myapp/includes/search_listing.html'
+
+In this template, you'll have access to the same context variables provided to the HTML template. You could provide a template in JSON format with extra properties, such as ``query.hits`` and editor's picks, or render an HTML snippet that can go directly into your results ``
``. If you need more flexibility, such as multiple formats/templates based on differing requests, you can set up a custom search view.
+
+.. _editors-picks:
+
+
+Indexing Custom Fields & Custom Search Views
+--------------------------------------------
+
+This functionality is still under active development to provide a streamlined interface, but take a look at ``wagtail/wagtail/wagtailsearch/views/frontend.py`` if you are interested in coding custom search views.
+
+
+Search Backends
+---------------
+
+Wagtail can degrade to a database-backed text search, but we strongly recommend `Elasticsearch`_.
+
+.. _Elasticsearch: http://www.elasticsearch.org/
+
+
+Default DB Backend
+``````````````````
+The default DB search backend uses Django's ``__icontains`` filter.
+
+
+Elasticsearch Backend
+`````````````````````
+If you prefer not to run an Elasticsearch server in development or production, there are many hosted services available, including `Searchly`_, who offer a free account suitable for testing and development. To use Searchly:
- Sign up for an account at `dashboard.searchly.com/users/sign\_up`_
- Use your Searchly dashboard to create a new index, e.g. 'wagtaildemo'
@@ -10,6 +229,9 @@ Wagtail can degrade to a database-backed text search, but we strongly recommend
your local settings
- Run ``./manage.py update_index``
-.. _Elasticsearch: http://www.elasticsearch.org/
.. _Searchly: http://www.searchly.com/
-.. _dashboard.searchly.com/users/sign\_up: https://dashboard.searchly.com/users/sign_up
\ No newline at end of file
+.. _dashboard.searchly.com/users/sign\_up: https://dashboard.searchly.com/users/sign_up
+
+Rolling Your Own
+````````````````
+Wagtail search backends implement the interface defined in ``wagtail/wagtail/wagtailsearch/backends/base.py``. At a minimum, the backend's ``search()`` method must return a collection of objects or ``model.objects.none()``. For a fully-featured search backend, examine the Elasticsearch backend code in ``elasticsearch.py``.
diff --git a/wagtail/wagtailadmin/locale/zh/LC_MESSAGES/django.po b/wagtail/wagtailadmin/locale/zh/LC_MESSAGES/django.po
index 80a75d43f..c43755acc 100644
--- a/wagtail/wagtailadmin/locale/zh/LC_MESSAGES/django.po
+++ b/wagtail/wagtailadmin/locale/zh/LC_MESSAGES/django.po
@@ -31,11 +31,11 @@ msgstr "搜索词"
#: .\forms.py:42
msgid "Enter your username"
-msgstr ""
+msgstr "请输入用户名"
#: .\forms.py:45
msgid "Enter password"
-msgstr ""
+msgstr "请输入密码"
#: .\forms.py:50
msgid "Enter your email address to reset your password"
@@ -89,7 +89,7 @@ msgstr "登录Wagtail"
#: .\templates\wagtailadmin\login.html:42
msgid "Forgotten it?"
-msgstr "忘记了?"
+msgstr "忘记密码?"
#: .\templates\wagtailadmin\account\account.html:4
msgid "Account"
@@ -104,7 +104,7 @@ msgid ""
"Your avatar image is provided by Gravatar and is connected to your email "
"address. With a Gravatar account you can set an avatar for any number of "
"other email addresses you use."
-msgstr "您的头像图片是由Gravatar提供的,并且关联了您的电子邮件地址。一个Gravatar账号可以设置多个电子邮件地址的头像图片。"
+msgstr "您的头像图片是由Gravatar提供的,并且关联了您的电子邮箱。一个Gravatar账号可以设置多个电子邮箱的头像图片。"
#: .\templates\wagtailadmin\account\account.html:23
#: .\templates\wagtailadmin\account\change_password.html:4
@@ -113,7 +113,7 @@ msgstr "修改密码"
#: .\templates\wagtailadmin\account\account.html:27
msgid "Change the password you use to log in."
-msgstr "修改您用于登录的密码。"
+msgstr "修改登录密码。"
#: .\templates\wagtailadmin\account\change_password.html:16
msgid "Change Password"
diff --git a/wagtail/wagtailadmin/locale/zh_TW/LC_MESSAGES/django.mo b/wagtail/wagtailadmin/locale/zh_TW/LC_MESSAGES/django.mo
new file mode 100644
index 000000000..a00aa643b
Binary files /dev/null and b/wagtail/wagtailadmin/locale/zh_TW/LC_MESSAGES/django.mo differ
diff --git a/wagtail/wagtailadmin/locale/zh_TW/LC_MESSAGES/django.po b/wagtail/wagtailadmin/locale/zh_TW/LC_MESSAGES/django.po
new file mode 100644
index 000000000..f4d70b60e
--- /dev/null
+++ b/wagtail/wagtailadmin/locale/zh_TW/LC_MESSAGES/django.po
@@ -0,0 +1,843 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Wagtail\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-03-14 23:02+0200\n"
+"PO-Revision-Date: 2014-05-01 12:09+0000\n"
+"Last-Translator: wdv4758h
\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: .\edit_handlers.py:81 .\edit_handlers.py:130 .\edit_handlers.py:134
+msgid "Please type a valid time"
+msgstr "請輸入一個有效的時間"
+
+#: .\edit_handlers.py:724
+msgid "Common page configuration"
+msgstr "一般頁面設定"
+
+#: .\forms.py:18
+msgid "Search term"
+msgstr "搜尋關鍵字"
+
+#: .\forms.py:42
+msgid "Enter your username"
+msgstr "請輸入您的帳號"
+
+#: .\forms.py:45
+msgid "Enter password"
+msgstr "請輸入密碼"
+
+#: .\forms.py:50
+msgid "Enter your email address to reset your password"
+msgstr "請輸入您的電子信箱來重新設定密碼"
+
+#: .\forms.py:59
+msgid "Please fill your email address."
+msgstr "請輸入您的電子信箱"
+
+#: .\forms.py:72
+msgid ""
+"Sorry, you cannot reset your password here as your user account is managed "
+"by another server."
+msgstr "對不起,您不能在此重新設定您的密碼,因為您的帳號是由其他伺服器所管理。"
+
+#: .\forms.py:75
+msgid "This email address is not recognised."
+msgstr "找不到這個電子信箱。"
+
+#: .\templates\wagtailadmin\base.html:7 .\templates\wagtailadmin\home.html:4
+msgid "Dashboard"
+msgstr "Dashboard"
+
+#: .\templates\wagtailadmin\base.html:31
+msgid "Menu"
+msgstr "選單"
+
+#: .\templates\wagtailadmin\home.html:22
+#, python-format
+msgid "Welcome to the %(site_name)s Wagtail CMS"
+msgstr "歡迎進入 %(site_name)s 的 Wagtail 內容管理系統"
+
+#: .\templates\wagtailadmin\home.html:33
+msgid ""
+"This is your dashboard on which helpful information about content you've "
+"created will be displayed."
+msgstr "這是您的 Dashboard,會顯示對於已建立的內容有幫助的訊息。"
+
+#: .\templates\wagtailadmin\login.html:4
+#: .\templates\wagtailadmin\login.html:55
+msgid "Sign in"
+msgstr "登入"
+
+#: .\templates\wagtailadmin\login.html:18
+msgid "Your username and password didn't match. Please try again."
+msgstr "您的帳號和密碼輸入錯誤,請再試一次。"
+
+#: .\templates\wagtailadmin\login.html:26
+msgid "Sign in to Wagtail"
+msgstr "登入 Wagtail"
+
+#: .\templates\wagtailadmin\login.html:42
+msgid "Forgotten it?"
+msgstr "忘記了嗎?"
+
+#: .\templates\wagtailadmin\account\account.html:4
+msgid "Account"
+msgstr "帳號"
+
+#: .\templates\wagtailadmin\account\account.html:11
+msgid "Set gravatar"
+msgstr "設定 gravatar"
+
+#: .\templates\wagtailadmin\account\account.html:15
+msgid ""
+"Your avatar image is provided by Gravatar and is connected to your email "
+"address. With a Gravatar account you can set an avatar for any number of "
+"other email addresses you use."
+msgstr "您的頭像是由 Gravatar 所提供,並且已經聯結你的電子信箱。一個 Gravatar 帳號可以設定多個電子信箱的頭像圖片。"
+
+#: .\templates\wagtailadmin\account\account.html:23
+#: .\templates\wagtailadmin\account\change_password.html:4
+msgid "Change password"
+msgstr "修改密碼"
+
+#: .\templates\wagtailadmin\account\account.html:27
+msgid "Change the password you use to log in."
+msgstr "修改登入用的密碼。"
+
+#: .\templates\wagtailadmin\account\change_password.html:16
+msgid "Change Password"
+msgstr "修改密碼"
+
+#: .\templates\wagtailadmin\account\change_password.html:19
+msgid ""
+"Your password can't be changed here. Please contact a site administrator."
+msgstr "您的密碼不能在這更改。請聯絡網站管理員。"
+
+#: .\templates\wagtailadmin\account\password_reset\complete.html:4
+#: .\templates\wagtailadmin\account\password_reset\confirm.html:42
+#: .\templates\wagtailadmin\account\password_reset\done.html:4
+#: .\templates\wagtailadmin\account\password_reset\form.html:37
+msgid "Reset password"
+msgstr "重新設定密碼"
+
+#: .\templates\wagtailadmin\account\password_reset\complete.html:15
+msgid "Password change successful"
+msgstr "密碼修改成功"
+
+#: .\templates\wagtailadmin\account\password_reset\complete.html:16
+msgid "Login"
+msgstr "登入"
+
+#: .\templates\wagtailadmin\account\password_reset\confirm.html:4
+#: .\templates\wagtailadmin\account\password_reset\confirm.html:26
+msgid "Set your new password"
+msgstr "設定您的新密碼"
+
+#: .\templates\wagtailadmin\account\password_reset\confirm.html:19
+msgid "The passwords do not match. Please try again."
+msgstr "密碼不一致,請再試一次。"
+
+#: .\templates\wagtailadmin\account\password_reset\done.html:15
+msgid "Check your email"
+msgstr "請檢查您的電子信箱"
+
+#: .\templates\wagtailadmin\account\password_reset\done.html:16
+msgid "A link to reset your password has been emailed to you."
+msgstr "一個重新設定密碼連結已經寄到您的電子信箱了"
+
+#: .\templates\wagtailadmin\account\password_reset\email.txt:2
+msgid "Please follow the link below to reset your password"
+msgstr "請點擊下面的連結來重新設定您的密碼"
+
+#: .\templates\wagtailadmin\account\password_reset\email_subject.txt:2
+msgid "Password reset"
+msgstr "密碼已經重新設定"
+
+#: .\templates\wagtailadmin\account\password_reset\form.html:27
+msgid "Reset your password"
+msgstr "重新設定您的密碼"
+
+#: .\templates\wagtailadmin\chooser\_link_types.html:5
+#: .\templates\wagtailadmin\chooser\_link_types.html:7
+msgid "Internal link"
+msgstr "內部連結"
+
+#: .\templates\wagtailadmin\chooser\_link_types.html:11
+#: .\templates\wagtailadmin\chooser\_link_types.html:13
+msgid "External link"
+msgstr "外部連結"
+
+#: .\templates\wagtailadmin\chooser\_link_types.html:17
+#: .\templates\wagtailadmin\chooser\_link_types.html:19
+msgid "Email link"
+msgstr "電子信箱連結"
+
+#: .\templates\wagtailadmin\chooser\_search_form.html:7
+#: .\templates\wagtailadmin\pages\search.html:3
+#: .\templates\wagtailadmin\pages\search.html:16
+#: .\templatetags\wagtailadmin_nav.py:44
+msgid "Search"
+msgstr "搜尋"
+
+#: .\templates\wagtailadmin\chooser\_search_results.html:3
+#: .\templatetags\wagtailadmin_nav.py:43
+msgid "Explorer"
+msgstr "瀏覽"
+
+#: .\templates\wagtailadmin\chooser\_search_results.html:5
+#: .\templates\wagtailadmin\pages\index.html:15
+#: .\templates\wagtailadmin\pages\move_choose_destination.html:10
+msgid "Home"
+msgstr "首頁"
+
+#: .\templates\wagtailadmin\chooser\_search_results.html:13
+#, python-format
+msgid ""
+"\n"
+" There is one match\n"
+" "
+msgid_plural ""
+"\n"
+" There are %(counter)s matches\n"
+" "
+msgstr[0] "\n 有一個符合"
+msgstr[1] "\n 有 $(counter)s 個符合"
+
+#: .\templates\wagtailadmin\chooser\browse.html:2
+#: .\templates\wagtailadmin\chooser\search.html:2
+#: .\templates\wagtailadmin\edit_handlers\page_chooser_panel.html:13
+msgid "Choose a page"
+msgstr "選擇一個頁面"
+
+#: .\templates\wagtailadmin\chooser\email_link.html:2
+msgid "Add an email link"
+msgstr "新增一個電子信箱"
+
+#: .\templates\wagtailadmin\chooser\email_link.html:14
+#: .\templates\wagtailadmin\chooser\external_link.html:14
+msgid "Insert link"
+msgstr "插入一個連結"
+
+#: .\templates\wagtailadmin\chooser\external_link.html:2
+msgid "Add an external link"
+msgstr "新增一個外部連結"
+
+#: .\templates\wagtailadmin\edit_handlers\chooser_panel.html:20
+msgid "Clear choice"
+msgstr "清除選擇"
+
+#: .\templates\wagtailadmin\edit_handlers\chooser_panel.html:22
+msgid "Choose another item"
+msgstr "選擇其他選項"
+
+#: .\templates\wagtailadmin\edit_handlers\chooser_panel.html:27
+msgid "Choose an item"
+msgstr "選擇一個選項"
+
+#: .\templates\wagtailadmin\edit_handlers\inline_panel_child.html:5
+msgid "Move up"
+msgstr "往上移動"
+
+#: .\templates\wagtailadmin\edit_handlers\inline_panel_child.html:6
+msgid "Move down"
+msgstr "往下移動"
+
+#: .\templates\wagtailadmin\edit_handlers\inline_panel_child.html:8
+#: .\templates\wagtailadmin\pages\confirm_delete.html:7
+#: .\templates\wagtailadmin\pages\edit.html:36
+#: .\templates\wagtailadmin\pages\list.html:68
+#: .\templates\wagtailadmin\pages\list.html:188
+msgid "Delete"
+msgstr "刪除"
+
+#: .\templates\wagtailadmin\edit_handlers\page_chooser_panel.html:12
+msgid "Choose another page"
+msgstr "選擇另外一個頁面"
+
+#: .\templates\wagtailadmin\home\pages_for_moderation.html:5
+msgid "Pages awaiting moderation"
+msgstr "這些頁面正等待審核"
+
+#: .\templates\wagtailadmin\home\pages_for_moderation.html:13
+#: .\templates\wagtailadmin\home\recent_edits.html:12
+#: .\templates\wagtailadmin\pages\list.html:101
+msgid "Title"
+msgstr "標題"
+
+#: .\templates\wagtailadmin\home\pages_for_moderation.html:14
+#: .\templates\wagtailadmin\pages\list.html:22
+msgid "Parent"
+msgstr "上一層"
+
+#: .\templates\wagtailadmin\home\pages_for_moderation.html:15
+#: .\templates\wagtailadmin\pages\list.html:24
+#: .\templates\wagtailadmin\pages\list.html:116
+msgid "Type"
+msgstr "類型"
+
+#: .\templates\wagtailadmin\home\pages_for_moderation.html:16
+msgid "Edited"
+msgstr "編輯"
+
+#: .\templates\wagtailadmin\home\pages_for_moderation.html:23
+#: .\templates\wagtailadmin\home\recent_edits.html:21
+#: .\templates\wagtailadmin\pages\list.html:167
+#: .\templates\wagtailadmin\pages\list.html:176
+msgid "Edit this page"
+msgstr "編輯這個頁面"
+
+#: .\templates\wagtailadmin\home\pages_for_moderation.html:28
+#: .\templates\wagtailadmin\pages\_moderator_userbar.html:12
+msgid "Approve"
+msgstr "通過"
+
+#: .\templates\wagtailadmin\home\pages_for_moderation.html:34
+#: .\templates\wagtailadmin\pages\_moderator_userbar.html:17
+msgid "Reject"
+msgstr "拒絕"
+
+#: .\templates\wagtailadmin\home\pages_for_moderation.html:37
+#: .\templates\wagtailadmin\home\recent_edits.html:23
+#: .\templates\wagtailadmin\pages\_moderator_userbar.html:9
+#: .\templates\wagtailadmin\pages\list.html:56
+#: .\templates\wagtailadmin\pages\list.html:176
+msgid "Edit"
+msgstr "編輯"
+
+#: .\templates\wagtailadmin\home\pages_for_moderation.html:38
+#: .\templates\wagtailadmin\pages\create.html:24
+#: .\templates\wagtailadmin\pages\edit.html:42
+msgid "Preview"
+msgstr "預覽"
+
+#: .\templates\wagtailadmin\home\recent_edits.html:5
+msgid "Your most recent edits"
+msgstr "你最近的編輯"
+
+#: .\templates\wagtailadmin\home\recent_edits.html:13
+msgid "Date"
+msgstr "日期"
+
+#: .\templates\wagtailadmin\home\recent_edits.html:14
+#: .\templates\wagtailadmin\pages\list.html:25
+#: .\templates\wagtailadmin\pages\list.html:128
+msgid "Status"
+msgstr "狀態"
+
+#: .\templates\wagtailadmin\home\recent_edits.html:25
+#: .\templates\wagtailadmin\pages\list.html:59
+#: .\templates\wagtailadmin\pages\list.html:179
+msgid "View draft"
+msgstr "觀看草稿"
+
+#: .\templates\wagtailadmin\home\recent_edits.html:28
+#: .\templates\wagtailadmin\pages\list.html:62
+#: .\templates\wagtailadmin\pages\list.html:182
+msgid "View live"
+msgstr "觀看線上版"
+
+#: .\templates\wagtailadmin\home\site_summary.html:3
+msgid "Site summary"
+msgstr "網站摘要"
+
+#: .\templates\wagtailadmin\home\site_summary.html:6
+#, python-format
+msgid ""
+"\n"
+" %(total_pages)s Page\n"
+" "
+msgid_plural ""
+"\n"
+" %(total_pages)s Pages\n"
+" "
+msgstr[0] "\n %(total_pages)s 頁面\n "
+msgstr[1] "\n %(total_pages)s 頁面\n "
+
+#: .\templates\wagtailadmin\home\site_summary.html:13
+#, python-format
+msgid ""
+"\n"
+" %(total_images)s Image\n"
+" "
+msgid_plural ""
+"\n"
+" %(total_images)s Images\n"
+" "
+msgstr[0] "\n %(total_images)s 圖片\n "
+msgstr[1] "\n %(total_images)s 圖片\n "
+
+#: .\templates\wagtailadmin\home\site_summary.html:20
+#, python-format
+msgid ""
+"\n"
+" %(total_docs)s Document\n"
+" "
+msgid_plural ""
+"\n"
+" %(total_docs)s Documents\n"
+" "
+msgstr[0] "\n %(total_docs)s 文件\n "
+msgstr[1] "\n %(total_docs)s 文件\n "
+
+#: .\templates\wagtailadmin\notifications\approved.html:1
+#, python-format
+msgid "The page \"%(title)s\" has been approved"
+msgstr "這個頁面 \"%(title)s\" 已經通過"
+
+#: .\templates\wagtailadmin\notifications\approved.html:2
+#, python-format
+msgid "The page \"%(title)s\" has been approved."
+msgstr "這個頁面 \"%(title)s\" 已經通過"
+
+#: .\templates\wagtailadmin\notifications\approved.html:4
+msgid "You can view the page here:"
+msgstr "你可以在此觀看這個頁面"
+
+#: .\templates\wagtailadmin\notifications\rejected.html:1
+#, python-format
+msgid "The page \"%(title)s\" has been rejected"
+msgstr "這個頁面 \"%(title)s\" 已經被拒絕"
+
+#: .\templates\wagtailadmin\notifications\rejected.html:2
+#, python-format
+msgid "The page \"%(title)s\" has been rejected."
+msgstr "這個頁面 \"%(title)s\" 已經被拒絕"
+
+#: .\templates\wagtailadmin\notifications\rejected.html:4
+#: .\templates\wagtailadmin\notifications\submitted.html:5
+msgid "You can edit the page here:"
+msgstr "你可以在此編輯這個頁面:"
+
+#: .\templates\wagtailadmin\notifications\submitted.html:1
+#, python-format
+msgid "The page \"%(page)s\" has been submitted for moderation"
+msgstr "這個頁面 \"%(page)s\" 已經送審"
+
+#: .\templates\wagtailadmin\notifications\submitted.html:2
+#, python-format
+msgid "The page \"%(page)s\" has been submitted for moderation."
+msgstr "這個頁面 \"%(page)s\" 已經送審。"
+
+#: .\templates\wagtailadmin\notifications\submitted.html:4
+msgid "You can preview the page here:"
+msgstr "你可以在此預覽這個頁面:"
+
+#: .\templates\wagtailadmin\pages\_moderator_userbar.html:4
+#, python-format
+msgid ""
+"\n"
+" Previewing '%(title)s', submitted by %(submitted_by)s on %(submitted_on)s.\n"
+" "
+msgstr "\n 預覽 '%(title)s', %(submitted_by)s 在 %(submitted_on)s 送審。\n "
+
+#: .\templates\wagtailadmin\pages\add_subpage.html:6
+#, python-format
+msgid "Create a page in %(title)s"
+msgstr "以 %(title)s 為題建立一個頁面"
+
+#: .\templates\wagtailadmin\pages\add_subpage.html:9
+msgid "Create a page in"
+msgstr "在這建立一個頁面"
+
+#: .\templates\wagtailadmin\pages\add_subpage.html:13
+msgid "Choose which type of page you'd like to create."
+msgstr "選擇希望建立的頁面類型。"
+
+#: .\templates\wagtailadmin\pages\add_subpage.html:26
+#, python-format
+msgid "Pages using %(page_type)s"
+msgstr "%(page_type)s 類的頁面"
+
+#: .\templates\wagtailadmin\pages\confirm_delete.html:3
+#, python-format
+msgid "Delete %(title)s"
+msgstr "刪除 %(title)s"
+
+#: .\templates\wagtailadmin\pages\confirm_delete.html:12
+msgid "Are you sure you want to delete this page?"
+msgstr "你確定要刪除這頁嗎?"
+
+#: .\templates\wagtailadmin\pages\confirm_delete.html:14
+#, python-format
+msgid ""
+"\n"
+" This will also delete one more subpage.\n"
+" "
+msgid_plural ""
+"\n"
+" This will also delete %(descendant_count)s more subpages.\n"
+" "
+msgstr[0] "\n 這也會刪除一個子頁面。 "
+msgstr[1] "\n 這也會刪除 %(descendant_count)s 個子頁面。 "
+
+#: .\templates\wagtailadmin\pages\confirm_delete.html:22
+msgid ""
+"Alternatively you can unpublish the page. This removes the page from public "
+"view and you can edit or publish it again later."
+msgstr "你可以選擇取消發佈此頁面。此頁面將將無法從外部觀看,你可以編輯後再次發。"
+
+#: .\templates\wagtailadmin\pages\confirm_delete.html:26
+msgid "Delete it"
+msgstr "刪除"
+
+#: .\templates\wagtailadmin\pages\confirm_delete.html:26
+msgid "Unpublish it"
+msgstr "取消發佈"
+
+#: .\templates\wagtailadmin\pages\confirm_move.html:3
+#, python-format
+msgid "Move %(title)s"
+msgstr "移動 %(title)s"
+
+#: .\templates\wagtailadmin\pages\confirm_move.html:6
+#: .\templates\wagtailadmin\pages\list.html:65
+#: .\templates\wagtailadmin\pages\list.html:185
+msgid "Move"
+msgstr "移動"
+
+#: .\templates\wagtailadmin\pages\confirm_move.html:11
+#, python-format
+msgid "Are you sure you want to move this page into '%(title)s'?"
+msgstr "你確定想要移動此頁面至 '%(title)s' 嗎?"
+
+#: .\templates\wagtailadmin\pages\confirm_move.html:13
+#, python-format
+msgid ""
+"Are you sure you want to move this page and all of its children into "
+"'%(title)s'?"
+msgstr "你確定要移動此頁面和其所有子頁面至 '%(title)s' 嗎?"
+
+#: .\templates\wagtailadmin\pages\confirm_move.html:18
+msgid "Yes, move this page"
+msgstr "是的,移動此頁面"
+
+#: .\templates\wagtailadmin\pages\confirm_unpublish.html:3
+#, python-format
+msgid "Unpublish %(title)s"
+msgstr "取消發佈 %(title)s"
+
+#: .\templates\wagtailadmin\pages\confirm_unpublish.html:6
+#: .\templates\wagtailadmin\pages\edit.html:33
+#: .\templates\wagtailadmin\pages\list.html:71
+#: .\templates\wagtailadmin\pages\list.html:191
+msgid "Unpublish"
+msgstr "取消發佈"
+
+#: .\templates\wagtailadmin\pages\confirm_unpublish.html:10
+msgid "Are you sure you want to unpublish this page?"
+msgstr "你確定想取消發佈此頁面嗎?"
+
+#: .\templates\wagtailadmin\pages\confirm_unpublish.html:13
+msgid "Yes, unpublish it"
+msgstr "是的,取消發佈"
+
+#: .\templates\wagtailadmin\pages\content_type_use.html:7
+msgid "Pages using"
+msgstr "頁面正在使用"
+
+#: .\templates\wagtailadmin\pages\create.html:5
+#, python-format
+msgid "New %(page_type)s"
+msgstr "新 %(page_type)s 分類"
+
+#: .\templates\wagtailadmin\pages\create.html:9
+msgid "New"
+msgstr "新"
+
+#: .\templates\wagtailadmin\pages\create.html:21
+msgid "Save as draft"
+msgstr "儲存為草稿"
+
+#: .\templates\wagtailadmin\pages\create.html:26
+#: .\templates\wagtailadmin\pages\edit.html:39
+msgid "Publish"
+msgstr "發佈"
+
+#: .\templates\wagtailadmin\pages\create.html:28
+#: .\templates\wagtailadmin\pages\edit.html:41
+msgid "Submit for moderation"
+msgstr "送審"
+
+#: .\templates\wagtailadmin\pages\edit.html:5
+#, python-format
+msgid "Editing %(title)s"
+msgstr "編輯 %(title)s"
+
+#: .\templates\wagtailadmin\pages\edit.html:12
+#, python-format
+msgid "Editing %(title)s"
+msgstr "編輯 %(title)s"
+
+#: .\templates\wagtailadmin\pages\edit.html:15
+msgid "Status:"
+msgstr "狀態:"
+
+#: .\templates\wagtailadmin\pages\edit.html:29
+msgid "Save draft"
+msgstr "儲存草稿"
+
+#: .\templates\wagtailadmin\pages\edit.html:52
+#, python-format
+msgid "Last modified: %(last_mod)s"
+msgstr "上一次編輯:%(last_mod)s"
+
+#: .\templates\wagtailadmin\pages\edit.html:54
+#, python-format
+msgid "by %(modified_by)s"
+msgstr "作者 %(modified_by)s"
+
+#: .\templates\wagtailadmin\pages\index.html:4
+#, python-format
+msgid "Exploring %(title)s"
+msgstr "瀏覽%(title)s"
+
+#: .\templates\wagtailadmin\pages\list.html:53
+#: .\templates\wagtailadmin\pages\list.html:194
+msgid "Add child page"
+msgstr "新增子頁面"
+
+#: .\templates\wagtailadmin\pages\list.html:94
+msgid "Disable ordering of child pages"
+msgstr "禁止子頁面的排序"
+
+#: .\templates\wagtailadmin\pages\list.html:94
+#: .\templates\wagtailadmin\pages\list.html:96
+msgid "Order"
+msgstr "排序"
+
+#: .\templates\wagtailadmin\pages\list.html:96
+msgid "Enable ordering of child pages"
+msgstr "開啟子頁面排序"
+
+#: .\templates\wagtailadmin\pages\list.html:149
+msgid "Drag"
+msgstr "拖曳"
+
+#: .\templates\wagtailadmin\pages\list.html:220
+#: .\templates\wagtailadmin\pages\list.html:224
+#, python-format
+msgid "Explorer subpages of '%(title)s'"
+msgstr "瀏覽 '%(title)s' 的子頁面"
+
+#: .\templates\wagtailadmin\pages\list.html:220
+#: .\templates\wagtailadmin\pages\list.html:224
+#: .\templates\wagtailadmin\pages\list.html:228
+msgid "Explore"
+msgstr "瀏覽"
+
+#: .\templates\wagtailadmin\pages\list.html:228
+#, python-format
+msgid "Explorer child pages of '%(title)s'"
+msgstr "瀏覽 '%(title)s' 的子頁面"
+
+#: .\templates\wagtailadmin\pages\list.html:230
+#, python-format
+msgid "Add a child page to '%(title)s'"
+msgstr "新增子頁面至 '%(title)s'"
+
+#: .\templates\wagtailadmin\pages\list.html:230
+msgid "Add subpage"
+msgstr "新增子頁面"
+
+#: .\templates\wagtailadmin\pages\list.html:239
+msgid "No pages have been created."
+msgstr "沒有已儲存的頁面"
+
+#: .\templates\wagtailadmin\pages\list.html:239
+#, python-format
+msgid "Why not add one?"
+msgstr "為什麼不 新增一個頁面呢?"
+
+#: .\templates\wagtailadmin\pages\move_choose_destination.html:3
+#, python-format
+msgid "Select a new parent page for %(title)s"
+msgstr "為 %(title)s 選擇一個新的母頁面"
+
+#: .\templates\wagtailadmin\pages\move_choose_destination.html:7
+#, python-format
+msgid "Select a new parent page for %(title)s"
+msgstr "為 %(title)s 選擇一個新的母頁面"
+
+#: .\templates\wagtailadmin\pages\search_results.html:6
+#, python-format
+msgid ""
+"\n"
+" There is one match\n"
+" "
+msgid_plural ""
+"\n"
+" There are %(counter)s matches\n"
+" "
+msgstr[0] "\n 有一個符合"
+msgstr[1] "\n 有 $(counter)s 個符合"
+
+#: .\templates\wagtailadmin\pages\search_results.html:17
+#, python-format
+msgid ""
+"\n"
+" Page %(page_number)s of %(num_pages)s.\n"
+" "
+msgstr "\n 第 %(page_number)s / %(num_pages)s頁。\n "
+
+#: .\templates\wagtailadmin\pages\search_results.html:24
+#: .\templates\wagtailadmin\pages\search_results.html:26
+#: .\templates\wagtailadmin\shared\pagination_nav.html:8
+#: .\templates\wagtailadmin\shared\pagination_nav.html:10
+#: .\templates\wagtailadmin\shared\pagination_nav.html:14
+msgid "Previous"
+msgstr "往前"
+
+#: .\templates\wagtailadmin\pages\search_results.html:33
+#: .\templates\wagtailadmin\pages\search_results.html:35
+#: .\templates\wagtailadmin\shared\pagination_nav.html:21
+#: .\templates\wagtailadmin\shared\pagination_nav.html:23
+#: .\templates\wagtailadmin\shared\pagination_nav.html:25
+msgid "Next"
+msgstr "往後"
+
+#: .\templates\wagtailadmin\pages\search_results.html:43
+#, python-format
+msgid "Sorry, no pages match \"%(query_string)s\""
+msgstr "對不起,沒有任何頁面符合 \"%(query_string)s\""
+
+#: .\templates\wagtailadmin\pages\search_results.html:45
+msgid "Enter a search term above"
+msgstr "請輸入關鍵字"
+
+#: .\templates\wagtailadmin\pages\select_location.html:3
+#, python-format
+msgid "Where do you want to create a %(page_type)s"
+msgstr "你想在哪建立 %(page_type)s"
+
+#: .\templates\wagtailadmin\pages\select_location.html:5
+msgid "Where do you want to create this"
+msgstr "你想在哪建立這個"
+
+#: .\templates\wagtailadmin\pages\select_type.html:3
+#: .\templates\wagtailadmin\pages\select_type.html:6
+msgid "Create a new page"
+msgstr "建立一個新頁面"
+
+#: .\templates\wagtailadmin\pages\select_type.html:10
+msgid ""
+"Your new page will be saved in the top level of your website. You "
+"can move it after saving."
+msgstr "你的新頁面將會儲存到網站的 最上層 你可以在儲存後移動它。"
+
+#: .\templates\wagtailadmin\shared\main_nav.html:15
+msgid "Account settings"
+msgstr "帳號設定"
+
+#: .\templates\wagtailadmin\shared\main_nav.html:16
+msgid "Log out"
+msgstr "登出"
+
+#: .\templates\wagtailadmin\shared\main_nav.html:20
+msgid "More"
+msgstr "更多"
+
+#: .\templates\wagtailadmin\shared\main_nav.html:22
+msgid "Redirects"
+msgstr "重導向"
+
+#: .\templates\wagtailadmin\shared\main_nav.html:23
+msgid "Editors Picks"
+msgstr "編者精選"
+
+#: .\templates\wagtailadmin\shared\pagination_nav.html:3
+#, python-format
+msgid "Page %(page_num)s of %(total_pages)s."
+msgstr "第 %(page_num)s 頁 共 %(total_pages)s 頁"
+
+#: .\templatetags\wagtailadmin_nav.py:52
+msgid "Images"
+msgstr "圖片"
+
+#: .\templatetags\wagtailadmin_nav.py:56
+msgid "Documents"
+msgstr "文件"
+
+#: .\templatetags\wagtailadmin_nav.py:61
+msgid "Snippets"
+msgstr "片段"
+
+#: .\templatetags\wagtailadmin_nav.py:66
+msgid "Users"
+msgstr "使用者"
+
+#: .\views\account.py:26
+msgid "Your password has been changed successfully!"
+msgstr "您的密碼已經更改成功。"
+
+#: .\views\pages.py:99
+msgid "Sorry, you do not have access to create a page of type '{0}'."
+msgstr "對不起,你沒有建立 '{0}' 類型頁面的權限。"
+
+#: .\views\pages.py:103
+msgid ""
+"Pages of this type can only be created as children of '{0}'. This "
+"new page will be saved there."
+msgstr "這一類的頁面只能建立為 '{0}' 的子頁面。此頁面將會儲存在那邊。"
+
+#: .\views\pages.py:166
+msgid "This slug is already in use"
+msgstr "這個地址已被使用"
+
+#: .\views\pages.py:187 .\views\pages.py:254 .\views\pages.py:589
+msgid "Page '{0}' published."
+msgstr "第 '{0}' 頁已發佈。"
+
+#: .\views\pages.py:189 .\views\pages.py:256
+msgid "Page '{0}' submitted for moderation."
+msgstr "第 '{0}' 頁已送審。"
+
+#: .\views\pages.py:192
+msgid "Page '{0}' created."
+msgstr "第 '{0}' 頁已建立。"
+
+#: .\views\pages.py:201
+msgid "The page could not be created due to errors."
+msgstr "這頁面因有錯誤而無法建立。"
+
+#: .\views\pages.py:259
+msgid "Page '{0}' updated."
+msgstr "第 '{0}' 頁已更新"
+
+#: .\views\pages.py:268
+msgid "The page could not be saved due to validation errors"
+msgstr "這頁面因有驗證錯誤而無法儲存。"
+
+#: .\views\pages.py:280
+msgid "This page is currently awaiting moderation"
+msgstr "這頁正等待審核"
+
+#: .\views\pages.py:298
+msgid "Page '{0}' deleted."
+msgstr "第 '{0}' 頁已刪除"
+
+#: .\views\pages.py:428
+msgid "Page '{0}' unpublished."
+msgstr "第 '{0}' 頁已取消發佈"
+
+#: .\views\pages.py:479
+msgid "Page '{0}' moved."
+msgstr "第 '{0}' 頁已移動。"
+
+#: .\views\pages.py:584 .\views\pages.py:602 .\views\pages.py:621
+msgid "The page '{0}' is not currently awaiting moderation."
+msgstr "第 '{0}' 頁目前不需要等待審核。"
+
+#: .\views\pages.py:608
+msgid "Page '{0}' rejected for publication."
+msgstr "第 '{0}' 頁已被拒絕發佈。"
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/userbar.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/userbar.scss
index 84b99b537..af9e20195 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/userbar.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/userbar.scss
@@ -87,11 +87,13 @@ li, .home{
.action{
@include transition(background-color 0.2s ease, color 0.2s ease);
background-color:$color-teal;
- color:white;
+ color:$color-teal;
&:before{
margin-right:0.4em;
vertical-align:middle;
+ font-size:1.7em;
+ color:white;
}
&:hover{
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/chooser/_search_behaviour.js b/wagtail/wagtailadmin/templates/wagtailadmin/chooser/_search_behaviour.js
index 9c3f77154..a3fee7722 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/chooser/_search_behaviour.js
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/chooser/_search_behaviour.js
@@ -1,6 +1,6 @@
-modal.ajaxifyForm($('form.search-bar', modal.body));
+modal.ajaxifyForm($('form.search-form', modal.body));
-var searchUrl = $('form.search-bar', modal.body).attr('action');
+var searchUrl = $('form.search-form', modal.body).attr('action');
function search() {
$.ajax({
diff --git a/wagtail/wagtailcore/locale/zh_TW/LC_MESSAGES/django.mo b/wagtail/wagtailcore/locale/zh_TW/LC_MESSAGES/django.mo
new file mode 100644
index 000000000..db50be133
Binary files /dev/null and b/wagtail/wagtailcore/locale/zh_TW/LC_MESSAGES/django.mo differ
diff --git a/wagtail/wagtailcore/locale/zh_TW/LC_MESSAGES/django.po b/wagtail/wagtailcore/locale/zh_TW/LC_MESSAGES/django.po
new file mode 100644
index 000000000..a5da59aff
--- /dev/null
+++ b/wagtail/wagtailcore/locale/zh_TW/LC_MESSAGES/django.po
@@ -0,0 +1,64 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Wagtail\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-03-10 12:24+0200\n"
+"PO-Revision-Date: 2014-02-28 16:07+0000\n"
+"Last-Translator: wdv4758h \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: .\models.py:36
+msgid ""
+"Set this to something other than 80 if you need a specific port number to "
+"appear in URLs (e.g. development on port 8000). Does not affect request "
+"handling (so port forwarding still works)."
+msgstr ""
+"如果你需要指定 port,請選擇一個非 80 的 port number (例如: 開發中用 8000 port)。 不影響 request 處理"
+" (port forwarding 仍然有效)"
+
+#: .\models.py:38
+msgid ""
+"If true, this site will handle requests for all other hostnames that do not "
+"have a site entry of their own"
+msgstr ""
+"如果這是 Ture 的話,這個網站將處理其他沒有自己網站的 hostname 的 request。"
+
+#: .\models.py:163
+msgid "The page title as you'd like it to be seen by the public"
+msgstr "頁面標題 (你想讓外界看到的)"
+
+#: .\models.py:164
+msgid ""
+"The name of the page as it will appear in URLs e.g http://domain.com/blog/"
+"[my-slug]/"
+msgstr "一個出現在 URL 的名字,例如 http://domain.com/blog/[my-slug]/"
+
+#: .\models.py:173
+msgid "Page title"
+msgstr "頁面標題"
+
+#: .\models.py:173
+msgid ""
+"Optional. 'Search Engine Friendly' title. This will appear at the top of the "
+"browser window."
+msgstr "(可選) '搜尋引擎友善' 標題。 這會顯示在瀏覽器的視窗最上方"
+
+#: .\models.py:174
+msgid ""
+"Whether a link to this page will appear in automatically generated menus"
+msgstr "是否在自動生成的 Menu 裡顯示一個連結到此頁面"
+
+#: .\models.py:418
+#, python-format
+msgid "name '%s' (used in subpage_types list) is not defined."
+msgstr "'%s' (用於子頁面類型列表) 沒有被建立。"
diff --git a/wagtail/wagtaildocs/locale/zh_TW/LC_MESSAGES/django.mo b/wagtail/wagtaildocs/locale/zh_TW/LC_MESSAGES/django.mo
new file mode 100644
index 000000000..65fb219cc
Binary files /dev/null and b/wagtail/wagtaildocs/locale/zh_TW/LC_MESSAGES/django.mo differ
diff --git a/wagtail/wagtaildocs/locale/zh_TW/LC_MESSAGES/django.po b/wagtail/wagtaildocs/locale/zh_TW/LC_MESSAGES/django.po
new file mode 100644
index 000000000..f5bff5468
--- /dev/null
+++ b/wagtail/wagtaildocs/locale/zh_TW/LC_MESSAGES/django.po
@@ -0,0 +1,157 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Wagtail\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-03-14 23:09+0200\n"
+"PO-Revision-Date: 2014-03-14 21:12+0000\n"
+"Last-Translator: wdv4758h \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: .\models.py:16 .\templates\wagtaildocs\documents\list.html:9
+msgid "Title"
+msgstr "標題"
+
+#: .\models.py:17 .\templates\wagtaildocs\documents\list.html:18
+msgid "File"
+msgstr "文件"
+
+#: .\models.py:21
+msgid "Tags"
+msgstr "標籤"
+
+#: .\templates\wagtaildocs\chooser\chooser.html:2
+#: .\templates\wagtaildocs\edit_handlers\document_chooser_panel.html:11
+msgid "Choose a document"
+msgstr "選擇一個文件"
+
+#: .\templates\wagtaildocs\chooser\chooser.html:7
+#: .\templates\wagtaildocs\chooser\chooser.html:19
+msgid "Search"
+msgstr "搜尋"
+
+#: .\templates\wagtaildocs\chooser\chooser.html:8
+msgid "Upload"
+msgstr "上傳"
+
+#: .\templates\wagtaildocs\chooser\chooser.html:34
+#: .\templates\wagtaildocs\documents\add.html:25
+#: .\templates\wagtaildocs\documents\edit.html:29
+msgid "Save"
+msgstr "儲存"
+
+#: .\templates\wagtaildocs\chooser\results.html:5
+#: .\templates\wagtaildocs\documents\results.html:5
+#, python-format
+msgid ""
+"\n"
+" There is one match\n"
+" "
+msgid_plural ""
+"\n"
+" There are %(counter)s matches\n"
+" "
+msgstr[0] "\n 有一個符合"
+msgstr[1] "\n 有 $(counter)s 個符合"
+
+#: .\templates\wagtaildocs\chooser\results.html:12
+msgid "Latest documents"
+msgstr "最新文件"
+
+#: .\templates\wagtaildocs\chooser\results.html:19
+#: .\templates\wagtaildocs\documents\results.html:18
+#, python-format
+msgid "Sorry, no documents match \"%(query_string)s\""
+msgstr "對不起,沒有文件符合 \"%(query_string)s\""
+
+#: .\templates\wagtaildocs\documents\_file_field.html:5
+msgid "Change document:"
+msgstr "修改文件:"
+
+#: .\templates\wagtaildocs\documents\add.html:4
+#: .\templates\wagtaildocs\documents\index.html:17
+msgid "Add a document"
+msgstr "新增一份文件"
+
+#: .\templates\wagtaildocs\documents\add.html:15
+msgid "Add document"
+msgstr "新增文件"
+
+#: .\templates\wagtaildocs\documents\confirm_delete.html:3
+#, python-format
+msgid "Delete %(title)s"
+msgstr "刪除 %(title)s"
+
+#: .\templates\wagtaildocs\documents\confirm_delete.html:6
+#: .\templates\wagtaildocs\documents\edit.html:29
+msgid "Delete document"
+msgstr "刪除文件"
+
+#: .\templates\wagtaildocs\documents\confirm_delete.html:10
+msgid "Are you sure you want to delete this document?"
+msgstr "你確定你要刪除這份文件嗎?"
+
+#: .\templates\wagtaildocs\documents\confirm_delete.html:13
+msgid "Yes, delete"
+msgstr "是的,刪除"
+
+#: .\templates\wagtaildocs\documents\edit.html:4
+#, python-format
+msgid "Editing %(title)s"
+msgstr "編輯 %(title)s"
+
+#: .\templates\wagtaildocs\documents\edit.html:15
+msgid "Editing"
+msgstr "編輯"
+
+#: .\templates\wagtaildocs\documents\index.html:16
+msgid "Documents"
+msgstr "文件"
+
+#: .\templates\wagtaildocs\documents\list.html:20
+msgid "Uploaded"
+msgstr "已上傳"
+
+#: .\templates\wagtaildocs\documents\results.html:21
+#, python-format
+msgid ""
+"You haven't uploaded any documents. Why not upload one now?"
+msgstr "你沒有上傳任何文件。 為什麼不 上傳一份?"
+
+#: .\templates\wagtaildocs\edit_handlers\document_chooser_panel.html:9
+msgid "Clear choice"
+msgstr "清除選擇"
+
+#: .\templates\wagtaildocs\edit_handlers\document_chooser_panel.html:10
+msgid "Choose another document"
+msgstr "選擇另外一份文件"
+
+#: .\views\documents.py:34 .\views\documents.py:43
+msgid "Search documents"
+msgstr "搜尋文件"
+
+#: .\views\documents.py:83
+msgid "Document '{0}' added."
+msgstr "文件 '{0}' 已加入"
+
+#: .\views\documents.py:86 .\views\documents.py:115
+msgid "The document could not be saved due to errors."
+msgstr "這文件因有錯誤而無法建立。"
+
+#: .\views\documents.py:112
+msgid "Document '{0}' updated"
+msgstr "文件 '{0}' 已更新"
+
+#: .\views\documents.py:134
+msgid "Document '{0}' deleted."
+msgstr "文件 '{0}' 已刪除"
diff --git a/wagtail/wagtailembeds/locale/zh_TW/LC_MESSAGES/django.mo b/wagtail/wagtailembeds/locale/zh_TW/LC_MESSAGES/django.mo
new file mode 100644
index 000000000..7a51d6e23
Binary files /dev/null and b/wagtail/wagtailembeds/locale/zh_TW/LC_MESSAGES/django.mo differ
diff --git a/wagtail/wagtailembeds/locale/zh_TW/LC_MESSAGES/django.po b/wagtail/wagtailembeds/locale/zh_TW/LC_MESSAGES/django.po
new file mode 100644
index 000000000..43227b1dc
--- /dev/null
+++ b/wagtail/wagtailembeds/locale/zh_TW/LC_MESSAGES/django.po
@@ -0,0 +1,54 @@
+# -*- coding: utf-8 -*-
+
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators: Lihan Li , 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: Wagtail\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-02-22 19:56+0200\n"
+"PO-Revision-Date: 2014-02-24 17:34+0000\n"
+"Last-Translator: wdv4758h \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: .\forms.py:11
+msgid "Please enter a valid URL"
+msgstr "請輸入有效的 URL"
+
+#: .\forms.py:15
+msgid "URL"
+msgstr "URL"
+
+#: .\templates\wagtailembeds\chooser\chooser.html:3
+msgid "Insert embed"
+msgstr "插入 embed"
+
+#: .\templates\wagtailembeds\chooser\chooser.html:14
+msgid "Insert"
+msgstr "插入"
+
+#: .\views\chooser.py:34
+msgid ""
+"There seems to be a problem with your embedly API key. Please check your "
+"settings."
+msgstr "embedly API key 有問題。請檢查設定。"
+
+#: .\views\chooser.py:36
+msgid "Cannot find an embed for this URL."
+msgstr "在這個 URL 中無法找到 embed"
+
+#: .\views\chooser.py:38
+msgid ""
+"There seems to be an error with Embedly while trying to embed this URL. "
+"Please try again later."
+msgstr ""
+"在嵌入這個 URL 的時候,Embedly 似乎有錯。"
+"請稍候再試."
diff --git a/wagtail/wagtailimages/locale/zh_TW/LC_MESSAGES/django.mo b/wagtail/wagtailimages/locale/zh_TW/LC_MESSAGES/django.mo
new file mode 100644
index 000000000..284cefcb2
Binary files /dev/null and b/wagtail/wagtailimages/locale/zh_TW/LC_MESSAGES/django.mo differ
diff --git a/wagtail/wagtailimages/locale/zh_TW/LC_MESSAGES/django.po b/wagtail/wagtailimages/locale/zh_TW/LC_MESSAGES/django.po
new file mode 100644
index 000000000..5db580a36
--- /dev/null
+++ b/wagtail/wagtailimages/locale/zh_TW/LC_MESSAGES/django.po
@@ -0,0 +1,170 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Wagtail\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-03-14 23:02+0200\n"
+"PO-Revision-Date: 2014-03-14 21:12+0000\n"
+"Last-Translator: wdv4758h \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: .\models.py:22
+msgid "Title"
+msgstr "標題"
+
+#: .\models.py:39
+msgid "Not a valid image format. Please use a gif, jpeg or png file instead."
+msgstr "不是有效的圖片格式。請用 gif、jpeg 或者 png 格式的圖片"
+
+#: .\models.py:41
+msgid "File"
+msgstr "文件"
+
+#: .\models.py:47
+msgid "Tags"
+msgstr "標籤"
+
+#: .\templates\wagtailimages\chooser\chooser.html:3
+#: .\templates\wagtailimages\edit_handlers\image_chooser_panel.html:19
+msgid "Choose an image"
+msgstr "選擇一個圖片"
+
+#: .\templates\wagtailimages\chooser\chooser.html:8
+#: .\templates\wagtailimages\chooser\chooser.html:20
+msgid "Search"
+msgstr "搜尋"
+
+#: .\templates\wagtailimages\chooser\chooser.html:9
+#: .\templates\wagtailimages\chooser\chooser.html:43
+msgid "Upload"
+msgstr "上傳"
+
+#: .\templates\wagtailimages\chooser\chooser.html:23
+msgid "Popular tags"
+msgstr "熱門的標籤"
+
+#: .\templates\wagtailimages\chooser\results.html:6
+#: .\templates\wagtailimages\images\results.html:6
+#, python-format
+msgid ""
+"\n"
+" There is one match\n"
+" "
+msgid_plural ""
+"\n"
+" There are %(counter)s matches\n"
+" "
+msgstr[0] "\n 有一個符合"
+msgstr[1] "\n 有 $(counter)s 個符合"
+
+#: .\templates\wagtailimages\chooser\results.html:13
+#: .\templates\wagtailimages\images\results.html:13
+msgid "Latest images"
+msgstr "最新圖片"
+
+#: .\templates\wagtailimages\chooser\select_format.html:3
+msgid "Choose a format"
+msgstr "選擇一個格式"
+
+#: .\templates\wagtailimages\chooser\select_format.html:17
+msgid "Insert image"
+msgstr "插入圖片"
+
+#: .\templates\wagtailimages\edit_handlers\image_chooser_panel.html:17
+msgid "Clear image"
+msgstr "清除圖片"
+
+#: .\templates\wagtailimages\edit_handlers\image_chooser_panel.html:18
+msgid "Choose another image"
+msgstr "選擇另外一個圖片"
+
+#: .\templates\wagtailimages\images\_file_field.html:6
+msgid "Change image:"
+msgstr "更改圖片:"
+
+#: .\templates\wagtailimages\images\add.html:4
+#: .\templates\wagtailimages\images\index.html:19
+msgid "Add an image"
+msgstr "新增一個圖片"
+
+#: .\templates\wagtailimages\images\add.html:15
+msgid "Add image"
+msgstr "新增圖片"
+
+#: .\templates\wagtailimages\images\add.html:25
+#: .\templates\wagtailimages\images\edit.html:33
+msgid "Save"
+msgstr "儲存"
+
+#: .\templates\wagtailimages\images\confirm_delete.html:4
+#: .\templates\wagtailimages\images\confirm_delete.html:8
+#: .\templates\wagtailimages\images\edit.html:33
+msgid "Delete image"
+msgstr "刪除圖片"
+
+#: .\templates\wagtailimages\images\confirm_delete.html:16
+msgid "Are you sure you want to delete this image?"
+msgstr "你確定要刪除這個圖片嗎?"
+
+#: .\templates\wagtailimages\images\confirm_delete.html:19
+msgid "Yes, delete"
+msgstr "是的,刪除"
+
+#: .\templates\wagtailimages\images\edit.html:4
+#, python-format
+msgid "Editing image %(title)s"
+msgstr "編輯圖片 %(title)s"
+
+#: .\templates\wagtailimages\images\edit.html:15
+msgid "Editing"
+msgstr "編輯"
+
+#: .\templates\wagtailimages\images\index.html:5
+#: .\templates\wagtailimages\images\index.html:18
+msgid "Images"
+msgstr "圖片"
+
+#: .\templates\wagtailimages\images\results.html:31
+#, python-format
+msgid "Sorry, no images match \"%(query_string)s\""
+msgstr "對不起,沒有任何圖片符合 \"%(query_string)s\""
+
+#: .\templates\wagtailimages\images\results.html:34
+#, python-format
+msgid ""
+"You've not uploaded any images. Why not add one now?"
+msgstr "沒有任何上傳的圖片。為什麼不 新增一個呢?"
+
+#: .\views\images.py:29 .\views\images.py:40
+msgid "Search images"
+msgstr "搜尋圖片"
+
+#: .\views\images.py:92
+msgid "Image '{0}' updated."
+msgstr "圖片 '{0}' 已更新"
+
+#: .\views\images.py:95
+msgid "The image could not be saved due to errors."
+msgstr "圖片因有錯誤而無法儲存。"
+
+#: .\views\images.py:114
+msgid "Image '{0}' deleted."
+msgstr "圖片 '{0}' 已刪除."
+
+#: .\views\images.py:132
+msgid "Image '{0}' added."
+msgstr "圖片 '{0}' 已加入."
+
+#: .\views\images.py:135
+msgid "The image could not be created due to errors."
+msgstr "圖片因有錯而不能被建立。"
diff --git a/wagtail/wagtailimages/templates/wagtailimages/chooser/chooser.html b/wagtail/wagtailimages/templates/wagtailimages/chooser/chooser.html
index 03b4554c8..1fcadb3f9 100644
--- a/wagtail/wagtailimages/templates/wagtailimages/chooser/chooser.html
+++ b/wagtail/wagtailimages/templates/wagtailimages/chooser/chooser.html
@@ -5,13 +5,13 @@
{% if uploadform %}
{% endif %}
{% if uploadform %}
-