Changed files that don't need to be translated

4 files changed, 305 insertions, 154 deletions

diff --git a/docs/_locale/zh_CN/api.po b/docs/_locale/zh_CN/api.po
index 48da59e..6a93707 100644
--- a/docs/_locale/zh_CN/api.po
+++ b/docs/_locale/zh_CN/api.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Bottle 0.12-dev\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-07 12:33\n"
+"POT-Creation-Date: 2013-02-16 21:45\n"
 "PO-Revision-Date: 2012-11-09 16:39+0800\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -266,6 +266,11 @@ msgid ""
 "`input_encoding`. Some libraries (e.g. WTForms) want a unicode dictionary."
 msgstr ""
 
+# 7fc82cc9c0834b7da08e3b3860e1a9d6
+#: ../../../bottle.py:docstring of bottle.FormsDict.getunicode:1
+msgid "Return the value as a unicode string, or the default."
+msgstr ""
+
 # 19ac58e686224a19b67845c5061582f2
 #: ../../../bottle.py:docstring of bottle.WSGIHeaderDict:1
 msgid ""
@@ -357,8 +362,56 @@ msgstr ""
 msgid "Find a resource and return a file object, or raise IOError."
 msgstr ""
 
+# fcec5a93e13a48b68e251a6a8f94d74f
+#: ../../../bottle.py:docstring of bottle.FileUpload.file:1
+msgid "Open file(-like) object (BytesIO buffer or temporary file)"
+msgstr ""
+
+# 48ffa5c976f245d0becc21a9e2c62bb6
+#: ../../../bottle.py:docstring of bottle.FileUpload.name:1
+msgid "Name of the upload form field"
+msgstr ""
+
+# 2a94d248a0804134b8b2950ee6872a16
+#: ../../../bottle.py:docstring of bottle.FileUpload.raw_filename:1
+msgid "Raw filename as sent by the client (may contain unsafe characters)"
+msgstr ""
+
+# e6845621bb9d42ccba141441bc8a5bc5
+#: ../../../bottle.py:docstring of bottle.FileUpload.headers:1
+msgid "A :class:`HeaderDict` with additional headers (e.g. content-type)"
+msgstr ""
+
+# ec33f9a869df439ab4ca59a460350271
+#: ../../../bottle.py:docstring of bottle.FileUpload.content_type:1
+#: bottle.BaseResponse.content_type:1
+msgid "Current value of the 'Content-Type' header."
+msgstr ""
+
+# 001c6d13b2db4841b81f6b23b55a4fcb
+#: ../../../bottle.py:docstring of bottle.FileUpload.content_length:1
+#: bottle.BaseResponse.content_length:1
+msgid "Current value of the 'Content-Length' header."
+msgstr ""
+
+# 44d2df642fd545b08b622a73a84bd9e6
+#: ../../../bottle.py:docstring of bottle.FileUpload.filename:1
+msgid ""
+"Name of the file on the client file system, but normalized to ensure file "
+"system compatibility (lowercase, no whitespace, no path separators, no "
+"unsafe characters, ASCII only). An empty filename is returned as 'empty'."
+msgstr ""
+
+# ba76ee38fe954b458ba7e961b3caad15
+#: ../../../bottle.py:docstring of bottle.FileUpload.save:1
+msgid ""
+"Save file to disk or copy its content to an open file(-like) object. If "
+"*destination* is a directory, :attr:`filename` is added to the path. "
+"Existing files are not overwritten by default (IOError)."
+msgstr ""
+
 # 841c0e821e284d91b7b014ab046f0b29
-#: ../../api.rst:105
+#: ../../api.rst:108
 msgid "Exceptions"
 msgstr ""
 
@@ -368,7 +421,7 @@ msgid "A base class for exceptions used by bottle."
 msgstr ""
 
 # acafc1e6403e44b4bd5821201cdb82fa
-#: ../../api.rst:113
+#: ../../api.rst:116
 msgid "The :class:`Bottle` Class"
 msgstr ""
 
@@ -599,6 +652,13 @@ msgid ""
 "and meta-data."
 msgstr ""
 
+# 0943215c952f4b53b91d4630599c798c
+#: ../../../bottle.py:docstring of bottle.Route.call:1
+msgid ""
+"The route callback with all plugins applied. This property is created on "
+"demand and then cached to speed up subsequent requests."
+msgstr ""
+
 # 498d6f0a85a541eba29a8f48855750f7
 #: ../../../bottle.py:docstring of bottle.Route.reset:1
 msgid ""
@@ -617,12 +677,12 @@ msgid "Yield all Plugins affecting this route."
 msgstr ""
 
 # 62603aa4019e4732a6caa0083f27ceee
-#: ../../api.rst:123
+#: ../../api.rst:126
 msgid "The :class:`Request` Object"
 msgstr ""
 
 # 39128b7c74ed400e9a103a6b37e84b43
-#: ../../api.rst:125
+#: ../../api.rst:128
 msgid ""
 "The :class:`Request` class wraps a WSGI environment and provides helpful "
 "methods to parse and access form data, cookies, file uploads and other "
@@ -666,6 +726,11 @@ msgstr ""
 msgid "Bottle application handling this request."
 msgstr ""
 
+# c41f7380550042b4ac7111a188a88f77
+#: ../../../bottle.py:docstring of bottle.BaseRequest.route:1
+msgid "The bottle :class:`Route` object that matches this request."
+msgstr ""
+
 # 037aee056fb248628a52cf2447ab4c82
 #: ../../../bottle.py:docstring of bottle.BaseRequest.path:1
 msgid ""
@@ -733,29 +798,8 @@ msgstr ""
 # 7e4b95b0b3054f54a33b518c161f0f86
 #: ../../../bottle.py:docstring of bottle.BaseRequest.files:1
 msgid ""
-"File uploads parsed from an `url-encoded` or `multipart/form-data` encoded "
-"POST or PUT request body. The values are instances of :class:`cgi."
-"FieldStorage`. The most important attributes are:"
-msgstr ""
-
-# 118bf5eae0a947848d43ef5c945cd3a4
-#: ../../../bottle.py:docstring of bottle.BaseRequest.files:6
-msgid ""
-"The filename, if specified; otherwise None; this is the client side "
-"filename, *not* the file name on which it is stored (that's a temporary file "
-"you don't deal with)"
-msgstr ""
-
-# fcec5a93e13a48b68e251a6a8f94d74f
-#: ../../../bottle.py:docstring of bottle.BaseRequest.files:10
-msgid "The file(-like) object from which you can read the data."
-msgstr ""
-
-# 58d08039baa3464d9ec39e3d8c603d19
-#: ../../../bottle.py:docstring of bottle.BaseRequest.files:12
-msgid ""
-"The value as a *string*; for file uploads, this transparently reads the file "
-"every time you request the value. Do not do this on big files."
+"File uploads parsed from `multipart/form-data` encoded POST or PUT request "
+"body. The values are instances of :class:`FileUpload`."
 msgstr ""
 
 # 0d0624fb0853462aab441d63adc1a3be
@@ -894,7 +938,7 @@ msgid "Return a new :class:`Request` with a shallow :attr:`environ` copy."
 msgstr ""
 
 # 21846efc4aa7410cbe609eaf42910736
-#: ../../api.rst:133
+#: ../../api.rst:136
 msgid ""
 "The module-level :data:`bottle.request` is a proxy object (implemented in :"
 "class:`LocalRequest`) and always refers to the `current` request, or in "
@@ -924,12 +968,12 @@ msgid "Thread-local property stored in :data:`_lctx.request_environ`"
 msgstr ""
 
 # 106092478f51479997b74ebeccd2ea06
-#: ../../api.rst:140
+#: ../../api.rst:145
 msgid "The :class:`Response` Object"
 msgstr ""
 
 # bde46b3aad08469aa59a263616041959
-#: ../../api.rst:142
+#: ../../api.rst:147
 msgid ""
 "The :class:`Response` class stores the HTTP status code as well as headers "
 "and cookies that are to be sent to the client. Similar to :data:`bottle."
@@ -1021,16 +1065,6 @@ msgstr ""
 msgid "WSGI conform list of (header, value) tuples."
 msgstr ""
 
-# ec33f9a869df439ab4ca59a460350271
-#: ../../../bottle.py:docstring of bottle.BaseResponse.content_type:1
-msgid "Current value of the 'Content-Type' header."
-msgstr ""
-
-# 001c6d13b2db4841b81f6b23b55a4fcb
-#: ../../../bottle.py:docstring of bottle.BaseResponse.content_length:1
-msgid "Current value of the 'Content-Length' header."
-msgstr ""
-
 # c9a8f8c5c29c4dfdbd5c77e910133ed9
 #: ../../../bottle.py:docstring of bottle.BaseResponse.charset:1
 msgid ""
@@ -1104,7 +1138,7 @@ msgid "Thread-local property stored in :data:`_lctx.response_body`"
 msgstr ""
 
 # 8ca709f8313b482da65c7268859ae250
-#: ../../api.rst:154
+#: ../../api.rst:159
 msgid ""
 "The following two classes can be raised as an exception. The most noticeable "
 "difference is that bottle invokes error handlers for :class:`HTTPError`, but "
@@ -1117,12 +1151,12 @@ msgid "Alias for .body"
 msgstr ""
 
 # 50180b5649a744c987ed84c266b7a9bd
-#: ../../api.rst:166
+#: ../../api.rst:171
 msgid "Templates"
 msgstr ""
 
 # b4f775e4de0b4249b8e33108e33a7a49
-#: ../../api.rst:168
+#: ../../api.rst:173
 msgid ""
 "All template engines supported by :mod:`bottle` implement the :class:"
 "`BaseTemplate` API. This way it is possible to switch and mix template "
@@ -1171,7 +1205,7 @@ msgid ""
 "Render the template with the specified local variables and return a single "
 "byte or unicode string. If it is a byte string, the encoding must match self."
 "encoding. This method must be thread-safe! Local variables may be provided "
-"in dictionaries (*args) or directly, as keywords (**kwargs)."
+"in dictionaries (args) or directly, as keywords (kwargs)."
 msgstr ""
 
 # 6b1c141cf449499b9ae972b7975d2a3b
@@ -1204,7 +1238,7 @@ msgid ""
 msgstr ""
 
 # 24d18841c1104f21bc1e523a11d37f9b
-#: ../../api.rst:179
+#: ../../api.rst:184
 msgid ""
 "You can write your own adapter for your favourite template engine or use one "
 "of the predefined adapters. Currently there are four fully supported "
@@ -1212,107 +1246,107 @@ msgid ""
 msgstr ""
 
 # 0b18f89b92bd47cea75484f063b4a305
-#: ../../api.rst:182
+#: ../../api.rst:187
 msgid "Class"
 msgstr ""
 
 # e61c4e15bcac42e4b82f9dca7f257058
-#: ../../api.rst:182
+#: ../../api.rst:187
 msgid "URL"
 msgstr ""
 
 # 1d62c00724264840af5a38445a2f2046
-#: ../../api.rst:182
+#: ../../api.rst:187
 msgid "Decorator"
 msgstr ""
 
 # f358c8038cb54d25a612ce662ac57e66
-#: ../../api.rst:182
+#: ../../api.rst:187
 msgid "Render function"
 msgstr ""
 
 # b53044adf2c64defa1fc407003b81f86
-#: ../../api.rst:184
+#: ../../api.rst:189
 msgid ":class:`SimpleTemplate`"
 msgstr ""
 
 # a1a04a507e14417ab3539197b18afa4b
-#: ../../api.rst:184
+#: ../../api.rst:189
 msgid ":doc:`stpl`"
 msgstr ""
 
 # 33dca0a76e23412abee840c3dbd6dcf6
-#: ../../api.rst:184
+#: ../../api.rst:189
 msgid ":func:`view`"
 msgstr ""
 
 # 1e86243291384e2d92ed890830d4d338
-#: ../../api.rst:184
+#: ../../api.rst:189
 msgid ":func:`template`"
 msgstr ""
 
 # 4d3a8eb5e32d40fda44342622bba81b8
-#: ../../api.rst:185
+#: ../../api.rst:190
 msgid ":class:`MakoTemplate`"
 msgstr ""
 
 # 6c423025f4cb4d4a801b605bafecb026
-#: ../../api.rst:185
+#: ../../api.rst:190
 msgid "http://www.makotemplates.org"
 msgstr ""
 
 # bc162e8800634503978fee1cfc325f3c
-#: ../../api.rst:185
+#: ../../api.rst:190
 msgid ":func:`mako_view`"
 msgstr ""
 
 # e777be7d76044134b1b534e5612a397f
-#: ../../api.rst:185
+#: ../../api.rst:190
 msgid ":func:`mako_template`"
 msgstr ""
 
 # 1169be7e540d4b028108f0437d1fb791
-#: ../../api.rst:186
+#: ../../api.rst:191
 msgid ":class:`CheetahTemplate`"
 msgstr ""
 
 # 81026d25ce3948468a6e4f7ff2eb49ac
-#: ../../api.rst:186
+#: ../../api.rst:191
 msgid "http://www.cheetahtemplate.org/"
 msgstr ""
 
 # a5003711086e4b729b97068f1d5e3d93
-#: ../../api.rst:186
+#: ../../api.rst:191
 msgid ":func:`cheetah_view`"
 msgstr ""
 
 # 41355d3738e145589e85992557dd818e
-#: ../../api.rst:186
+#: ../../api.rst:191
 msgid ":func:`cheetah_template`"
 msgstr ""
 
 # 4cecefe7caf84f7bbbf14deba520fd62
-#: ../../api.rst:187
+#: ../../api.rst:192
 msgid ":class:`Jinja2Template`"
 msgstr ""
 
 # a2dc200da35848f5b9b36d8d0cea1f33
-#: ../../api.rst:187
+#: ../../api.rst:192
 msgid "http://jinja.pocoo.org/"
 msgstr ""
 
 # 19500baf956c445fac89420ee8b30d57
-#: ../../api.rst:187
+#: ../../api.rst:192
 msgid ":func:`jinja2_view`"
 msgstr ""
 
 # 1a5f61a4b9aa4aa0a2933ef65e5cb88f
-#: ../../api.rst:187
+#: ../../api.rst:192
 msgid ":func:`jinja2_template`"
 msgstr ""
 
 # a113494ab5c348cdbb1d5c7b9533f062
-#: ../../api.rst:190
+#: ../../api.rst:195
 msgid ""
 "To use :class:`MakoTemplate` as your default template engine, just import "
 "its specialised decorator and render function::"
diff --git a/docs/_locale/zh_CN/changelog.po b/docs/_locale/zh_CN/changelog.po
index de80b5b..3a85d80 100644
--- a/docs/_locale/zh_CN/changelog.po
+++ b/docs/_locale/zh_CN/changelog.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Bottle 0.12-dev\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-07 12:33\n"
+"POT-Creation-Date: 2013-02-16 21:45\n"
 "PO-Revision-Date: 2012-11-09 16:39+0800\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -22,69 +22,76 @@ msgid "Release Notes and Changelog"
 msgstr "发布摘要和更改历史(不译)"
 
 # a97673c7116a4c3b8743eebe4b2d5a3e
-#: ../../changelog.rst:9
+#: ../../changelog.rst:9 ../../changelog.rst:17
 msgid "Release 0.11"
 msgstr ""
 
-# 6731700ec87a44e788d995610cedd01c
+# a109362aa7f44d64adb92bb0b9823353
 #: ../../changelog.rst:13
 msgid ""
+"The new :meth:`BaseRequest.route` property returns the :class:`Route` that "
+"matched the request."
+msgstr ""
+
+# 6731700ec87a44e788d995610cedd01c
+#: ../../changelog.rst:21
+msgid ""
 "Native support for Python 2.x and 3.x syntax. No need to run 2to3 anymore."
 msgstr ""
 
 # 6b9ce1b8ed83434ab1f16a966e20e8f9
-#: ../../changelog.rst:14
+#: ../../changelog.rst:22
 msgid ""
 "Support for partial downloads (``Range`` header) in :func:`static_file`."
 msgstr ""
 
 # e5bb007545f84215afaeabbf80c32589
-#: ../../changelog.rst:15
+#: ../../changelog.rst:23
 msgid ""
 "The new :class:`ResourceManager` interface helps locating files bundled with "
 "an application."
 msgstr ""
 
 # db95b112ec664973b25c1651b6b599d0
-#: ../../changelog.rst:16
+#: ../../changelog.rst:24
 msgid ""
 "Added a server adapter for `waitress <http://docs.pylonsproject.org/projects/"
 "waitress/en/latest/>`_."
 msgstr ""
 
 # f5b8dfb81e8446ac8133d757d683d667
-#: ../../changelog.rst:17
+#: ../../changelog.rst:25
 msgid ""
 "New :meth:`Bottle.merge` method to install all routes from one application "
 "into another."
 msgstr ""
 
 # a109362aa7f44d64adb92bb0b9823353
-#: ../../changelog.rst:18
+#: ../../changelog.rst:26
 msgid ""
 "New :attr:`BaseRequest.app` property to get the application object that "
 "handles a request."
 msgstr ""
 
 # 6b57a33990c64361b1ad2db50f53b000
-#: ../../changelog.rst:19
+#: ../../changelog.rst:27
 msgid ""
 "Added :meth:`FormsDict.decode()` to get an all-unicode version (needed by "
 "WTForms)."
 msgstr ""
 
 # c20daa7d47b54d8a822c0bf71decf822
-#: ../../changelog.rst:20
+#: ../../changelog.rst:28
 msgid ":class:`MultiDict` and subclasses are now pickle-able."
 msgstr ""
 
 # e86dad3a34f6465c89f5637165bc312c
-#: ../../changelog.rst:23
+#: ../../changelog.rst:31
 msgid "API Changes"
 msgstr ""
 
 # 73bb02534f0b49ec9c08de53ccbd60a8
-#: ../../changelog.rst:24
+#: ../../changelog.rst:32
 msgid ""
 ":attr:`Response.status` is a read-write property that can be assigned either "
 "a numeric status code or a status string with a reason phrase (``200 OK``). "
@@ -94,33 +101,33 @@ msgid ""
 msgstr ""
 
 # 5772862eb6624e688fbc4af59dd1988c
-#: ../../changelog.rst:27
+#: ../../changelog.rst:35
 msgid "API Deprecations"
 msgstr ""
 
 # b4e888031c9e4efabda02834f1f21867
-#: ../../changelog.rst:28
+#: ../../changelog.rst:36
 msgid ""
 ":class:`SimpleTALTemplate` is now deprecating. There seems to be no demand."
 msgstr ""
 
 # 44359592bf86402aa2d88d227a948cff
-#: ../../changelog.rst:31
+#: ../../changelog.rst:39
 msgid "Release 0.10"
 msgstr ""
 
 # 4dec1a937025421dbc41cc67f1f57bf5
-#: ../../changelog.rst:33
+#: ../../changelog.rst:41
 msgid "Plugin API v2"
 msgstr ""
 
 # a23578035d494816ab995e2fea0cc4a8
-#: ../../changelog.rst:35
+#: ../../changelog.rst:43
 msgid "To use the new API, set :attr:`Plugin.api` to ``2``."
 msgstr ""
 
 # 9b6f06b4607c4a83b128c436635c0e7b
-#: ../../changelog.rst:36
+#: ../../changelog.rst:44
 msgid ""
 ":meth:`Plugin.apply` receives a :class:`Route` object instead of a context "
 "dictionary as second parameter. The new object offers some additional "
@@ -128,7 +135,7 @@ msgid ""
 msgstr ""
 
 # 736de72390b847b0b094c61446e3b83d
-#: ../../changelog.rst:37
+#: ../../changelog.rst:45
 msgid ""
 "Plugin names are considered unique now. The topmost plugin with a given name "
 "on a given route is installed, all other plugins with the same name are "
@@ -136,12 +143,12 @@ msgid ""
 msgstr ""
 
 # 065c1f375b0d47f8a8851d6df581722c
-#: ../../changelog.rst:39
+#: ../../changelog.rst:47
 msgid "The Request/Response Objects"
 msgstr ""
 
 # 566c0eab00e54295939eef631f59d2f8
-#: ../../changelog.rst:41
+#: ../../changelog.rst:49
 msgid ""
 "Added :attr:`BaseRequest.json`, :attr:`BaseRequest.remote_route`, :attr:"
 "`BaseRequest.remote_addr`, :attr:`BaseRequest.query` and :attr:`BaseRequest."
@@ -149,7 +156,7 @@ msgid ""
 msgstr ""
 
 # c830c4ee4ad848f1b1f205ed53e05870
-#: ../../changelog.rst:42
+#: ../../changelog.rst:50
 msgid ""
 "Added :attr:`BaseResponse.status_line` and :attr:`BaseResponse.status_code` "
 "attributes. In future releases, :attr:`BaseResponse.status` will return a "
@@ -159,7 +166,7 @@ msgid ""
 msgstr ""
 
 # 45f4cc97a9fc4d4c88ede6131214b378
-#: ../../changelog.rst:43
+#: ../../changelog.rst:51
 msgid ""
 "Replaced :class:`MultiDict` with a specialized :class:`FormsDict` in many "
 "places. The new dict implementation allows attribute access and handles "
@@ -167,12 +174,12 @@ msgid ""
 msgstr ""
 
 # 9ed871a4ef814b268c9e32e6a0a98493
-#: ../../changelog.rst:45
+#: ../../changelog.rst:53
 msgid "Templates"
 msgstr ""
 
 # 55e66477c8414856a940b14cc9fbf01f
-#: ../../changelog.rst:47
+#: ../../changelog.rst:55
 msgid ""
 "Added three new functions to the SimpleTemplate default namespace that "
 "handle undefined variables: :func:`stpl.defined`, :func:`stpl.get` and :func:"
@@ -180,144 +187,144 @@ msgid ""
 msgstr ""
 
 # 6231999b3223400281c6f121c3ec9539
-#: ../../changelog.rst:48
+#: ../../changelog.rst:56
 msgid ""
 "The default escape function for SimpleTemplate now additionally escapes "
 "single and double quotes."
 msgstr ""
 
 # d5da0048d0e54adcbf4a6eca77d24b03
-#: ../../changelog.rst:50
+#: ../../changelog.rst:58
 msgid "Routing"
 msgstr ""
 
 # 4f100bf5c0244f6b844b9c80458afd78
-#: ../../changelog.rst:52
+#: ../../changelog.rst:60
 msgid ""
 "A new route syntax (e.g. ``/object/<id:int>``) and support for route "
 "wildcard filters."
 msgstr ""
 
 # 76bf73f4d1154f699127453d3305cf41
-#: ../../changelog.rst:53
+#: ../../changelog.rst:61
 msgid "Four new wildcard filters: `int`, `float`, `path` and `re`."
 msgstr ""
 
 # c7351cc69a214beb916e48c6ba290f1a
-#: ../../changelog.rst:55
+#: ../../changelog.rst:63
 msgid "Oher changes"
 msgstr ""
 
 # 4e05013ef2554d89b298d321a0c130bf
-#: ../../changelog.rst:57
+#: ../../changelog.rst:65
 msgid "Added command line interface to load applications and start servers."
 msgstr ""
 
 # 0d60ba54697545d6b867c274f4d05833
-#: ../../changelog.rst:58
+#: ../../changelog.rst:66
 msgid ""
 "Introduced a :class:`ConfigDict` that makes accessing configuration a lot "
 "easier (attribute access and auto-expanding namespaces)."
 msgstr ""
 
 # 124fc7cd3d784edc8c2a4cd522393e85
-#: ../../changelog.rst:59
+#: ../../changelog.rst:67
 msgid "Added support for raw WSGI applications to :meth:`Bottle.mount`."
 msgstr ""
 
 # 83811d6a04d544c18508b3dd75c18391
-#: ../../changelog.rst:60
+#: ../../changelog.rst:68
 msgid ":meth:`Bottle.mount` parameter order changed."
 msgstr ""
 
 # 85e4e2d1c2c2476ca6125a5f4cfb467c
-#: ../../changelog.rst:61
+#: ../../changelog.rst:69
 msgid ""
 ":meth:`Bottle.route` now accpets an import string for the ``callback`` "
 "parameter."
 msgstr ""
 
 # 824284a34edd4f99ad16418c4ab77790
-#: ../../changelog.rst:62
+#: ../../changelog.rst:70
 msgid "Dropped Gunicorn 0.8 support. Current supported version is 0.13."
 msgstr ""
 
 # 8ff0d29768f34cf3b525c2330139e146
-#: ../../changelog.rst:63
+#: ../../changelog.rst:71
 msgid "Added custom options to Gunicorn server."
 msgstr ""
 
 # 9deeaef2ec5a4b7a803c705792b9dda8
-#: ../../changelog.rst:64
+#: ../../changelog.rst:72
 msgid ""
 "Finally dropped support for type filters. Replace with a custom plugin of "
 "needed."
 msgstr ""
 
 # 4f1fed330d1d47168ae311e0e3a8f8ac
-#: ../../changelog.rst:68
+#: ../../changelog.rst:76
 msgid "Release 0.9"
 msgstr ""
 
 # d5d0f375fb4749a69c9403412a7eb5ae
-#: ../../changelog.rst:71
+#: ../../changelog.rst:79
 msgid "Whats new?"
 msgstr ""
 
 # 8b8a0a81954b4ba1b74a6ee31ca3a53c
-#: ../../changelog.rst:72
+#: ../../changelog.rst:80
 msgid ""
 "A brand new plugin-API. See :ref:`plugins` and :doc:`plugindev` for details."
 msgstr ""
 
 # 7507729af5ec4cb88c6e5cf549cc93e3
-#: ../../changelog.rst:73
+#: ../../changelog.rst:81
 msgid ""
 "The :func:`route` decorator got a lot of new features. See :meth:`Bottle."
 "route` for details."
 msgstr ""
 
 # 207cf445fdd34b639c2ae07ac6a85090
-#: ../../changelog.rst:74
+#: ../../changelog.rst:82
 msgid ""
 "New server adapters for `gevent <http://www.gevent.org/>`_, `meinheld "
 "<http://meinheld.org/>`_ and `bjoern <https://github.com/jonashaag/bjoern>`_."
 msgstr ""
 
 # daa55ce0e10f45d183c1b365dc2ccba0
-#: ../../changelog.rst:75
+#: ../../changelog.rst:83
 msgid "Support for SimpleTAL templates."
 msgstr ""
 
 # 1905b888cb7b4a1b9d3ebe3c0ef7a66f
-#: ../../changelog.rst:76
+#: ../../changelog.rst:84
 msgid "Better runtime exception handling for mako templates in debug mode."
 msgstr ""
 
 # 9a81aa701ae24a6aa4a26e0aa3567d32
-#: ../../changelog.rst:77
+#: ../../changelog.rst:85
 msgid "Lots of documentation, fixes and small improvements."
 msgstr ""
 
 # 4321fbe631844b8d84ca43fad60e8b27
-#: ../../changelog.rst:78
+#: ../../changelog.rst:86
 msgid "A new :data:`Request.urlparts` property."
 msgstr ""
 
 # 4e839c60c903480690fd424f143c3757
-#: ../../changelog.rst:81
+#: ../../changelog.rst:89
 msgid "Performance improvements"
 msgstr ""
 
 # 85fe44152baa4daca39a7b1e93c00ad4
-#: ../../changelog.rst:82
+#: ../../changelog.rst:90
 msgid ""
 "The :class:`Router` now special-cases ``wsgi.run_once`` environments to "
 "speed up CGI."
 msgstr ""
 
 # b909340087724797bd7bf31da068edaa
-#: ../../changelog.rst:83
+#: ../../changelog.rst:91
 msgid ""
 "Reduced module load time by ~30% and optimized template parser. See `8ccb2d "
 "</commit/8ccb2d>`_, `f72a7c </commit/f72a7c>`_ and `b14b9a </commit/"
@@ -325,14 +332,14 @@ msgid ""
 msgstr ""
 
 # 72e73bff954c4217a09e2401bac9674c
-#: ../../changelog.rst:84
+#: ../../changelog.rst:92
 msgid ""
 "Support for \"App Caching\" on Google App Engine. See `af93ec </commit/"
 "af93ec>`_."
 msgstr ""
 
 # d9923a5832b142f6afaa67f61a3d3fcf
-#: ../../changelog.rst:85
+#: ../../changelog.rst:93
 msgid ""
 "Some of the rarely used or deprecated features are now plugins that avoid "
 "overhead if the feature is not used."
@@ -340,62 +347,62 @@ msgstr ""
 
 # 1139037ba4c74e8dbacb963e86b1734a
 # 70b7ae6d681745ec8f6d7bae78a2d9b3
-#: ../../changelog.rst:88 ../../changelog.rst:99
+#: ../../changelog.rst:96 ../../changelog.rst:107
 msgid "API changes"
 msgstr ""
 
 # 7a0ea9dcf798416e8870410cf7c67aef
-#: ../../changelog.rst:89
+#: ../../changelog.rst:97
 msgid ""
 "This release is mostly backward compatible, but some APIs are marked "
 "deprecated now and will be removed for the next release. Most noteworthy:"
 msgstr ""
 
 # 5e21a9d02a434dd582e322125054fd88
-#: ../../changelog.rst:91
+#: ../../changelog.rst:99
 msgid ""
 "The ``static`` route parameter is deprecated. You can escape wild-cards with "
 "a backslash."
 msgstr ""
 
 # 1b6da094ff5d4e7f9aa311c9b7b3491b
-#: ../../changelog.rst:92
+#: ../../changelog.rst:100
 msgid ""
 "Type-based output filters are deprecated. They can easily be replaced with "
 "plugins."
 msgstr ""
 
 # b0f7b728309c4b7690e2e4225a4b8a2e
-#: ../../changelog.rst:96
+#: ../../changelog.rst:104
 msgid "Release 0.8"
 msgstr ""
 
 # 5c282c9843094792a4307b3034967be9
-#: ../../changelog.rst:100
+#: ../../changelog.rst:108
 msgid "These changes may break compatibility with previous versions."
 msgstr ""
 
 # 684f663e070f4b09b48180ca47839c75
-#: ../../changelog.rst:102
+#: ../../changelog.rst:110
 msgid ""
 "The built-in Key/Value database is not available anymore. It is marked "
 "deprecated since 0.6.4"
 msgstr ""
 
 # ab818cf68d8a4e9ba07ffbabfd3339de
-#: ../../changelog.rst:103
+#: ../../changelog.rst:111
 msgid "The Route syntax and behaviour changed."
 msgstr ""
 
 # 1e6b6b4d1d3a42a09840dd65a3329a8f
-#: ../../changelog.rst:105
+#: ../../changelog.rst:113
 msgid ""
 "Regular expressions must be encapsulated with ``#``. In 0.6 all non-"
 "alphanumeric characters not present in the regular expression were allowed."
 msgstr ""
 
 # 71c8af4451404191b1f0d4cbe8c5e4ec
-#: ../../changelog.rst:106
+#: ../../changelog.rst:114
 msgid ""
 "Regular expressions not part of a route wildcard are escaped automatically. "
 "You don't have to escape dots or other regular control characters anymore. "
@@ -404,73 +411,73 @@ msgid ""
 msgstr ""
 
 # 27f16af5e0ca47a5a555d1b193780839
-#: ../../changelog.rst:108
+#: ../../changelog.rst:116
 msgid ""
 "The ``BreakTheBottle`` exception is gone. Use :class:`HTTPResponse` instead."
 msgstr ""
 
 # a4d29013e8bd4e0d8ab3a69f2d215b0c
-#: ../../changelog.rst:109
+#: ../../changelog.rst:117
 msgid ""
-"The :class:`SimpleTemplate` engine escapes HTML special characters in ``"
-"{{bad_html}}`` expressions automatically. Use the new ``{{!good_html}}`` "
+"The :class:`SimpleTemplate` engine escapes HTML special characters in "
+"``{{bad_html}}`` expressions automatically. Use the new ``{{!good_html}}`` "
 "syntax to get old behaviour (no escaping)."
 msgstr ""
 
 # 0ca575ecd26446f981bedadf96ca4075
-#: ../../changelog.rst:110
+#: ../../changelog.rst:118
 msgid ""
 "The :class:`SimpleTemplate` engine returns unicode strings instead of lists "
 "of byte strings."
 msgstr ""
 
 # 44edac6789ef4e09a8ce012c161b5143
-#: ../../changelog.rst:111
+#: ../../changelog.rst:119
 msgid "``bottle.optimize()`` and the automatic route optimization is obsolete."
 msgstr ""
 
 # 9d76cc1eee7d4ffc8856e7cc36b03afb
-#: ../../changelog.rst:112
+#: ../../changelog.rst:120
 msgid "Some functions and attributes were renamed:"
 msgstr ""
 
 # 2476d07cfb614c1589d293b030ead391
-#: ../../changelog.rst:114
+#: ../../changelog.rst:122
 msgid ":attr:`Request._environ` is now :attr:`Request.environ`"
 msgstr ""
 
 # 078eea95ecef4111a9c366da245647bb
-#: ../../changelog.rst:115
+#: ../../changelog.rst:123
 msgid ":attr:`Response.header` is now :attr:`Response.headers`"
 msgstr ""
 
 # 521c767a85e748848aa22a37b85824b0
-#: ../../changelog.rst:116
+#: ../../changelog.rst:124
 msgid ":func:`default_app` is obsolete. Use :func:`app` instead."
 msgstr ""
 
 # c06f82820b6647a69b2ba0a5bf7fc709
-#: ../../changelog.rst:118
+#: ../../changelog.rst:126
 msgid "The default :func:`redirect` code changed from 307 to 303."
 msgstr ""
 
 # 023b03a59c374d43b8abfd0b2c67985a
-#: ../../changelog.rst:119
+#: ../../changelog.rst:127
 msgid "Removed support for ``@default``. Use ``@error(404)`` instead."
 msgstr ""
 
 # 0f3f04e5fb1f4e8abddb03e2420cbdfe
-#: ../../changelog.rst:123
+#: ../../changelog.rst:131
 msgid "New features"
 msgstr ""
 
 # 68ec57e76d7c464fa97c2adb8fa7782a
-#: ../../changelog.rst:124
+#: ../../changelog.rst:132
 msgid "This is an incomplete list of new features and improved functionality."
 msgstr ""
 
 # a371732ab6744c0f9dfa6d9ac04e5f83
-#: ../../changelog.rst:126
+#: ../../changelog.rst:134
 msgid ""
 "The :class:`Request` object got new properties: :attr:`Request.body`, :attr:"
 "`Request.auth`, :attr:`Request.url`, :attr:`Request.header`, :attr:`Request."
@@ -478,7 +485,7 @@ msgid ""
 msgstr ""
 
 # c21e44bb8b464528ac46f154770df091
-#: ../../changelog.rst:127
+#: ../../changelog.rst:135
 msgid ""
 "The :meth:`Response.set_cookie` and :meth:`Request.get_cookie` methods are "
 "now able to encode and decode python objects. This is called a *secure "
@@ -487,7 +494,7 @@ msgid ""
 msgstr ""
 
 # a87aa779e91b44ca985910e27559bb56
-#: ../../changelog.rst:128
+#: ../../changelog.rst:136
 msgid ""
 "The new :class:`Router` class drastically improves performance for setups "
 "with lots of dynamic routes and supports named routes (named route + dict = "
@@ -495,14 +502,14 @@ msgid ""
 msgstr ""
 
 # 3dcf1f0ad1684a1bbeec83c1432f51cc
-#: ../../changelog.rst:129
+#: ../../changelog.rst:137
 msgid ""
 "It is now possible (and recommended) to return :exc:`HTTPError` and :exc:"
 "`HTTPResponse` instances or other exception objects instead of raising them."
 msgstr ""
 
 # 5bbedf45b10e4286a457b982a9be595f
-#: ../../changelog.rst:130
+#: ../../changelog.rst:138
 msgid ""
 "The new function :func:`static_file` equals :func:`send_file` but returns a :"
 "exc:`HTTPResponse` or :exc:`HTTPError` instead of raising it. :func:"
@@ -510,23 +517,23 @@ msgid ""
 msgstr ""
 
 # a25f7ad0c1c94ddaa447da64fe73c796
-#: ../../changelog.rst:131
+#: ../../changelog.rst:139
 msgid ""
 "New :func:`get`, :func:`post`, :func:`put` and :func:`delete` decorators."
 msgstr ""
 
 # 569fa16a63714dddb16fe9d53f06dec4
-#: ../../changelog.rst:132
+#: ../../changelog.rst:140
 msgid "The :class:`SimpleTemplate` engine got full unicode support."
 msgstr ""
 
 # 981b75a9f823425cb1ad7f074d56570d
-#: ../../changelog.rst:133
+#: ../../changelog.rst:141
 msgid "Lots of non-critical bugfixes."
 msgstr ""
 
 # 29d64452b9d54e018ffb4749c7a406cf
-#: ../../changelog.rst:139
+#: ../../changelog.rst:147
 msgid "Contributors"
 msgstr ""
 
diff --git a/docs/_locale/zh_CN/development.po b/docs/_locale/zh_CN/development.po
index b3c9edb..2d77a49 100644
--- a/docs/_locale/zh_CN/development.po
+++ b/docs/_locale/zh_CN/development.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Bottle 0.12-dev\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-09 18:23\n"
+"POT-Creation-Date: 2013-02-16 21:45\n"
 "PO-Revision-Date: 2012-11-09 15:47+0800\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -161,6 +161,11 @@ msgstr ""
 "修复，然后通过所有渠道发布(邮件列表, twitter, github)。不重要的bug修复或特征"
 "不保证添加到旧版本中。这个情况在未来也许会改变。"
 
+# 9ecb2ba91a264d909f35e766e4526450
+#: ../../development.rst:36
+msgid "Major Release (x.0)"
+msgstr ""
+
 # 03d00f16fb6b4214899a04cba5c35a6d
 #: ../../development.rst:36
 msgid ""
@@ -172,6 +177,11 @@ msgstr ""
 "在重要的里程碑达成或新的更新和旧版本彻底不兼容时，会增加major版本号。为了使用"
 "新版本，你也许需要修改整个应用，但major版本号极少会改变。"
 
+# c9620f52ec754a4aab875fdb2137c0cc
+#: ../../development.rst:39
+msgid "Minor Release (x.y)"
+msgstr ""
+
 # 7a1a1638c40e43e0b01af3627996a080
 #: ../../development.rst:39
 msgid ""
@@ -188,6 +198,11 @@ msgstr ""
 "新，但这不是必须的。0.8版本是一个特例，它 *不兼容* 旧版本(所以我们跳过了0.7版"
 "本直接发布0.8版本)，不好意思。"
 
+# c1cd34f3caf846dab76881dac14c53e2
+#: ../../development.rst:42
+msgid "Revision (x.y.z)"
+msgstr ""
+
 # ba5728b974e14b75911cbbea41cbe6d7
 #: ../../development.rst:42
 msgid ""
@@ -200,6 +215,11 @@ msgstr ""
 "新，而不用修改你应用的代码。事实上，你确实应该更新这类版本，因为它常常修复一"
 "些安全问题。"
 
+# 7629abe7b2f144bc9f1de10aad83d468
+#: ../../development.rst:46
+msgid "Pre-Release Versions"
+msgstr ""
+
 # e7d78ebc45b147989ff9c8cb1ae39a91
 #: ../../development.rst:45
 msgid ""
@@ -220,6 +240,11 @@ msgstr "代码仓库结构"
 msgid "The source repository is structured as follows:"
 msgstr "代码仓库的结构如下:"
 
+# 7dcc7cc36e324c829aebbafe37c3796f
+#: ../../development.rst:54
+msgid "``master`` branch"
+msgstr ""
+
 # d116d802a64e43788fceb4041ce2a7a2
 #: ../../development.rst:54
 msgid ""
@@ -229,6 +254,11 @@ msgstr ""
 "该分支用于集成，测试和开发。所有计划添加到下一版本的改动，会在这里合并和测"
 "试。"
 
+# 6abfeb26070147c09c19c10a7090f44a
+#: ../../development.rst:57
+msgid "``release-x.y`` branches"
+msgstr ""
+
 # bc12377068154a19a6f9a3bffda6d913
 #: ../../development.rst:57
 msgid ""
@@ -246,6 +276,11 @@ msgstr ""
 "受bug-fix，但仅限关键的bug-fix。每次更改后，版本号都会更新，这样你就能及时获"
 "取重要的改动了。"
 
+# 30902a4eb31141c4b9e2e99195dc69df
+#: ../../development.rst:60
+msgid "``bugfix_name-x.y`` branches"
+msgstr ""
+
 # 6724eda55b8a4e02a39d970badc69f0b
 #: ../../development.rst:60
 msgid ""
@@ -256,6 +291,11 @@ msgstr ""
 "这些分支是临时性的，用于修复现有发布版本的bug。在合并到其他分支后，它们就会被"
 "删除。"
 
+# 1c189971e0b846d8935a5c9f4fcf6374
+#: ../../development.rst:64
+msgid "Feature branches"
+msgstr ""
+
 # 23e018316a6343b88a255c80f908693f
 #: ../../development.rst:63
 msgid ""
diff --git a/docs/_locale/zh_CN/plugins.po b/docs/_locale/zh_CN/plugins.po
index 8452ef9..6d49568 100644
--- a/docs/_locale/zh_CN/plugins.po
+++ b/docs/_locale/zh_CN/plugins.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Bottle 0.12-dev\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-09 18:23\n"
+"POT-Creation-Date: 2013-02-16 21:45\n"
 "PO-Revision-Date: 2012-11-09 15:59+0800\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -38,6 +38,11 @@ msgstr ""
 "在 :ref:`plugins` 查看常见的插件问题(安装，使用)。如果你计划开发一个新的插"
 "件， :doc:`/plugindev` 也许对你有帮助。"
 
+# fb445e42b73949198b058b1f52f5258b
+#: ../../plugins/index.rst:12
+msgid "`Bottle-Cork <http://cork.firelet.net/>`_"
+msgstr ""
+
 # 58f41b1d6aac4800bd5312e03b93c028
 #: ../../plugins/index.rst:12
 msgid ""
@@ -45,66 +50,131 @@ msgid ""
 "Authorization in web applications based on Bottle."
 msgstr "Cork插件基于Bottle，提供了一些简单的方法来实现Web应用的权限验证。"
 
+# fe631d4ca8544947ae22feafb3125dcb
+#: ../../plugins/index.rst:15
+msgid "`Bottle-Extras <http://pypi.python.org/pypi/bottle-extras/>`_"
+msgstr ""
+
 # aff1d22e623a4776bcc5be08a0f5c569
 #: ../../plugins/index.rst:15
 msgid "Meta package to install the bottle plugin collection."
 msgstr "安装Bottle插件的集合"
 
+# 938a054fadf54609b09fadca18915629
+#: ../../plugins/index.rst:18
+msgid "`Bottle-Flash <http://pypi.python.org/pypi/bottle-flash/>`_"
+msgstr ""
+
 # 746812f7a019498e87758355943a3193
 #: ../../plugins/index.rst:18
 msgid "flash plugin for bottle"
 msgstr "Bottle的flash插件"
 
+# dd53dc05c1e84435b86efb8411a5c41a
+#: ../../plugins/index.rst:21
+msgid "`Bottle-Hotqueue <http://pypi.python.org/pypi/bottle-hotqueue/>`_"
+msgstr ""
+
 # 535e939a040146ae8fab322db9025380
 #: ../../plugins/index.rst:21
 msgid "FIFO Queue for Bottle built upon redis"
 msgstr "基于redis的FIFO队列服务"
 
+# afafe43d5de6451a96b6b32ccb99fd00
+#: ../../plugins/index.rst:24
+msgid "`Macaron <http://nobrin.github.com/macaron/webapp.html>`_"
+msgstr ""
+
 # f6272745bb7a4b5286ad41059624da3c
 #: ../../plugins/index.rst:24
 msgid "Macaron is an object-relational mapper (ORM) for SQLite."
 msgstr "Macaron是用于SQLite的ORM"
 
+# 68c2f103e32d43fb952f052d3cb3a4e6
+#: ../../plugins/index.rst:27
+msgid "`Bottle-Memcache <http://pypi.python.org/pypi/bottle-memcache/>`_"
+msgstr ""
+
 # 02a84e17b8c6429984ebb78334ee31a5
 #: ../../plugins/index.rst:27
 msgid "Memcache integration for Bottle."
 msgstr "Memcache集成"
 
+# 64780d9112694cd09aab9de5283c5a3a
+#: ../../plugins/index.rst:30
+msgid "`Bottle-MongoDB <http://pypi.python.org/pypi/bottle-mongodb/>`_"
+msgstr ""
+
 # e0e067d5ae414b7395a2192ca8b35cd3
 #: ../../plugins/index.rst:30
 msgid "MongoDB integration for Bottle"
 msgstr "MongoDB集成"
 
+# e2e6dc5ed6e44dd19b6d381c21ce4274
+#: ../../plugins/index.rst:33
+msgid "`Bottle-Redis <http://pypi.python.org/pypi/bottle-redis/>`_"
+msgstr ""
+
 # 68bc58b5015c402d90ae0d5350260080
 #: ../../plugins/index.rst:33
 msgid "Redis integration for Bottle."
 msgstr "Redis集成"
 
+# c74f6cb622be491aa618c25d819a17dd
+#: ../../plugins/index.rst:36
+msgid "`Bottle-Renderer <http://pypi.python.org/pypi/bottle-renderer/>`_"
+msgstr ""
+
 # 2213271856294ba184e3d73817e7306d
 #: ../../plugins/index.rst:36
 msgid "Renderer plugin for bottle"
 msgstr "Renderer插件"
 
+# 4287e3df39264e7baab8f046b7b3353b
+#: ../../plugins/index.rst:39
+msgid "`Bottle-Servefiles <http://pypi.python.org/pypi/bottle-servefiles/>`_"
+msgstr ""
+
 # e63027f3c7594930be7b6a2d3d9c8af1
 #: ../../plugins/index.rst:39
 msgid "A reusable app that serves static files for bottle apps"
 msgstr "一个可重用的APP，为Bottle应用提供静态文件服务。"
 
+# ea6c00ae10624fffa161c35bc588e09b
+#: ../../plugins/index.rst:42
+msgid "`Bottle-Sqlalchemy <http://pypi.python.org/pypi/bottle-sqlalchemy/>`_"
+msgstr ""
+
 # 2a76b62faec84b3684c2d8747fe06c35
 #: ../../plugins/index.rst:42
 msgid "SQLAlchemy integration for Bottle."
 msgstr "SQLAlchemy集成"
 
+# cab6769882cf4596bb782cb657b17f49
+#: ../../plugins/index.rst:45
+msgid "`Bottle-Sqlite <http://pypi.python.org/pypi/bottle-sqlite/>`_"
+msgstr ""
+
 # ef35627e5de14711a12f782786de93d4
 #: ../../plugins/index.rst:45
 msgid "SQLite3 database integration for Bottle."
 msgstr "SQLite3数据库集成"
 
+# c3eb03bbe1ef4bc1b97c2eb850aed3c4
+#: ../../plugins/index.rst:48
+msgid "`Bottle-Web2pydal <http://pypi.python.org/pypi/bottle-web2pydal/>`_"
+msgstr ""
+
 # f01e53ed49544cd487224b2ae784236a
 #: ../../plugins/index.rst:48
 msgid "Web2py Dal integration for Bottle."
 msgstr "Wbe2py的Dal集成"
 
+# e1260f9c9c4d4ba5b5b0b6e67b853da1
+#: ../../plugins/index.rst:51
+msgid "`Bottle-Werkzeug <http://pypi.python.org/pypi/bottle-werkzeug/>`_"
+msgstr ""
+
 # ceb2ae912be74561b44d9b9a4a38d9b1
 #: ../../plugins/index.rst:51
 msgid ""