From aefb59ef98522ef8a10ab64b25840f11e622e1c7 Mon Sep 17 00:00:00 2001
From: Stardrad Yin <yin8086@gmail.com>
Date: Wed, 23 Jan 2013 03:16:08 -0500
Subject: [PATCH] Modify Chinese translation in properties file, and add new translation that synchronizes with commit synchronize with commit e4e6829

---
 docs/01_features.mkd |   66 +++++++++++++++++++++++---------
 1 files changed, 47 insertions(+), 19 deletions(-)

diff --git a/docs/01_features.mkd b/docs/01_features.mkd
index 3769ead..b99aa52 100644
--- a/docs/01_features.mkd
+++ b/docs/01_features.mkd
@@ -1,18 +1,44 @@
-## Gitblit Features
+## Standard Features (GO/WAR)
 - JGit SmartHTTP servlet
 - Browser and git client authentication
-- Four *per-repository* access control configurations with a Read-Only control flag
+- Four *per-repository* access restriction configurations with a Read-Only control flag
     - ![anonymous](blank.png) *Anonymous View, Clone & Push*
     - ![push](lock_go_16x16.png) *Authenticated Push*
     - ![clone](lock_pull_16x16.png) *Authenticated Clone & Push*
     - ![view](shield_16x16.png) *Authenticated View, Clone & Push*
     - ![freeze](cold_16x16.png) Freeze repository (i.e. deny push, make read-only)
+- Six *per-user/team* repository access permissions
+    - **V** (view in web ui, RSS feeds, download zip)
+    - **R** (clone)
+    - **RW** (clone and push)
+    - **RWC** (clone and push with ref creation)
+    - **RWD** (clone and push with ref creation, deletion)
+    - **RW+** (clone and push with ref creation, deletion, rewind)
+- Optional feature to allow users to create personal repositories
+- Optional feature to fork a repository to a personal repository
+- Optional feature to create a repository on push
+- *Experimental* built-in Garbage Collection
 - Ability to federate with one or more other Gitblit instances
+- RSS/JSON RPC interface
+- Java/Swing Gitblit Manager tool
 - Gitweb inspired web UI
-- Administrators may create, edit, rename, or delete repositories through the web UI
-- Administrators may create, edit, rename, or delete users through the web UI
+- Responsive web UI that subtracts elements to be usable on phones, tablets, and desktop browsers
+- Groovy pre- and post- push hook scripts, per-repository or globally for all repositories
+- Email push notifications *(via sendmail.groovy push script)*
+- Lucene indexing of specified repository branches
+- Administrators may create, edit, rename, or delete repositories through the web UI or RPC interface
+- Administrators may create, edit, rename, or delete users through the web UI or RPC interface
+- Administrators may create, edit, rename, or delete teams through the web UI or RPC interface
 - Repository Owners may edit repositories through the web UI
-- Git-notes support
+- Administrators and Repository Owners may set the default branch through the web UI or RPC interface
+- LDAP authentication and optional LDAP-controlled Team memberships
+- Redmine authentication
+- Gravatar integration
+- Git-notes display support
+- Submodule support
+- Push log based on a hidden, orphan branch refs/gitblit/pushes
+- Fanout PubSub notifications service for self-hosted [Sparkleshare](http://sparkleshare.org) use
+- gh-pages display support (Jekyll is not supported)
 - Branch metrics (uses Google Charts)
 - HEAD and Branch RSS feeds
 - Blame annotations view
@@ -26,25 +52,27 @@
 - Single text file for users configuration
 - Optional utility pages
     - ![docs](book_16x16.png) Docs page which enumerates all Markdown files within a repository
-    - ![tickets](bug_16x16.png) Ticgit ticket pages *(based on last MIT release bf57b032 2009-01-27)*
+    - ![tickets](bug_16x16.png) **readonly** Ticgit ticket pages *(based on last MIT release bf57b032 2009-01-27)*
+- Translations
+    - English
+    - Japanese
+    - Spanish
+    - Polish
+    - Korean
+	- Brazilian Portuguese
+	- Dutch
+	- Chinese (zh_CN)
 
 ## Gitblit GO Features
 - Out-of-the-box integrated stack requiring minimal configuration
-- Automatically generates a self-signed certificate for *localhost* https communications  
-    (includes script to generate a self-signed certificate for *your hostname*, see [setup](/setup.html) for details)
+- Automatic generation of ssl certificate for https communications
+- Integrated GUI tool to facilitate x509 PKI including ssl and client certificate generation, client certificate revocation, and client certificate distribution
 - Single text file for configuring server and gitblit
 - A Windows service installation script and configuration tool
+- Built-in AJP connector for Apache httpd
 
 ## Limitations
-- HTTP/HTTPS are the only supported protocols
-- Access controls are not path-based, they are repository-based
-- Only Administrators can create, rename or delete repositories
-- Only Administrators can create, modify or delete users
-- Commit hooks are not supported
-- Native Git may be needed to periodically run git-gc as [JGit][jgit] does not fully support the git-gc featureset.
+- HTTP/HTTPS are the only supported Git protocols
+- Built-in access controls are not path-based, they are repository-based.
 
-### Caveats
-- Gitblit may eat your data.  Use at your own risk.
-- Gitblit may have security holes.  Patches welcome.  :)
-
-[jgit]: http://eclipse.org/jgit "Eclipse JGit Site"
\ No newline at end of file
+[jgit]: http://eclipse.org/jgit "Eclipse JGit Site"

--
Gitblit v1.9.1