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/05_roadmap.mkd |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/docs/05_roadmap.mkd b/docs/05_roadmap.mkd
index 562cc7e..4ac9b47 100644
--- a/docs/05_roadmap.mkd
+++ b/docs/05_roadmap.mkd
@@ -13,10 +13,6 @@
 ### TODO (medium priority)
 
 * Gitblit: editable settings page in GO/WAR
-* Gitblit: investigate create-repository-on-push.
-    * Maybe a new user role to allow this?
-    * Maybe a server setting to disable this completely?
-    * Pusher/Creator becomes repository owner and can then manipulate access lists, etc?
 * Gitblit: Clone Repository feature (issue 5)
     * optional scheduled pulls
     * optional automatic push to origin/remotes?
@@ -25,9 +21,11 @@
 
 ### IDEAS
 
+* Gitblit: Pull requests
+* Gitblit: Watch/Star like github with personalized activity feed
+* Gitblit: Push database or orphan branch
 * Gitblit: Re-use the EGit branch visualization table cell renderer as some sort of servlet
 * Gitblit: diff should highlight inserted/removed fragment compared to original line
-* Gitblit: implement branch permission controls as Groovy pre-receive script.  
-*Maintain permissions text file similar to a gitolite configuration file or svn authz file.*
+* Gitblit: respect Gerrit branch permissions
 * Gitblit: Consider creating more Git model objects and exposing them via the JSON RPC interface to allow inspection/retrieval of Git commits, Git trees, etc from Gitblit.
 * Gitblit: Blame coloring by author (issue 2)

--
Gitblit v1.9.1