diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index 126b269bb..f2f10d5b6 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -46,16 +46,21 @@ class RepositoriesController < ApplicationController
 
   rescue_from Redmine::Scm::Adapters::CommandFailed, :with => :show_error_command_failed
   def new
-    scm = params[:repository_scm] || (Redmine::Scm::Base.all & Setting.enabled_scm).first
-    @repository = Repository.factory(scm)
-    @repository.is_default = @project.repository.nil?
-    @repository.project = @project
-    @course_tag = params[:course]
-    if @course_tag == 1
-      render :layout => 'base_courses'
+    if @project.repositories.count == 0
+      scm = params[:repository_scm] || (Redmine::Scm::Base.all & Setting.enabled_scm).first
+      @repository = Repository.factory(scm)
+      @repository.is_default = @project.repository.nil?
+      @repository.project = @project
+      @course_tag = params[:course]
+      if @course_tag == 1
+        render :layout => 'base_courses'
+      else
+        render :layout => 'base_projects'
+      end
     else
-      render :layout => 'base_projects'
+      render_403
     end
+
   end
   
   
diff --git a/app/views/projects/settings/_new_repositories.html.erb b/app/views/projects/settings/_new_repositories.html.erb
index 410bd8c32..0859e5e19 100644
--- a/app/views/projects/settings/_new_repositories.html.erb
+++ b/app/views/projects/settings/_new_repositories.html.erb
@@ -8,93 +8,98 @@
 <% project_path_cut = RepositoriesHelper::PROJECT_PATH_CUT %>
 <% ip = RepositoriesHelper::REPO_IP_ADDRESS %><!--Added by tanxianbo For formatting project's path-->
 <% if @project.repositories.any? %>
-  <table class="pro_table">
-    <tbody>
-    <tr class="pro_table_tit">
-    <td class=" w150"><%= l(:field_identifier) %></td>
-    <td class="w150"> <%= l(:field_repository_is_default) %></td>
-    <td class="w150"><%= l(:label_scm) %> </td>
-    <td class="w150" ><%= l(:label_repository_path) %> </td>
-    <td class="w150"> </td>
-    <td class="w150"> </td>
-  </tr>
-  <% @project.repositories.sort.each do |repository| %>
-  <tr class="<%= cycle 'pro_table_on', '' %>">
-    <td><a href="javascript:viod(0)" title="<%= repository.identifier %>">
-      <%= link_to  truncate(repository.identifier), ({:controller => 'repositories', :action => 'show', :id => @project, :repository_id => repository.identifier_param} if repository.identifier.present?) %></a></td>
-    <td> <%= checked_image repository.is_default? %></td>
-    <td><%=h repository.scm_name %></td>
-    <%if repository.scm_name=="Git"%>
-        <td style="white-space:nowrap;overflow:hidden;text-overflow:ellipsis;" title="http://<%=  repository.login.to_s %>_<%= repository.identifier.to_s%>@<%= ip %>
+    <table class="pro_table">
+      <tbody>
+      <tr class="pro_table_tit">
+        <td class=" w150"><%= l(:field_identifier) %></td>
+        <td class="w150"> <%= l(:field_repository_is_default) %></td>
+        <td class="w150"><%= l(:label_scm) %> </td>
+        <td class="w150" ><%= l(:label_repository_path) %> </td>
+        <td class="w150"> </td>
+        <td class="w150"> </td>
+      </tr>
+      <% @project.repositories.sort.each do |repository| %>
+          <tr class="<%= cycle 'pro_table_on', '' %>">
+            <td><a href="javascript:viod(0)" title="<%= repository.identifier %>">
+              <%= link_to  truncate(repository.identifier), ({:controller => 'repositories', :action => 'show', :id => @project, :repository_id => repository.identifier_param} if repository.identifier.present?) %></a></td>
+            <td> <%= checked_image repository.is_default? %></td>
+            <td><%=h repository.scm_name %></td>
+            <%if repository.scm_name=="Git"%>
+                <td style="white-space:nowrap;overflow:hidden;text-overflow:ellipsis;" title="http://<%=  repository.login.to_s %>_<%= repository.identifier.to_s%>@<%= ip %>
          <%=h repository.url.slice(project_path_cut, repository.url.length) %>"> <%=truncate( 'http://' <<  repository.login.to_s << '_'<<   repository.identifier.to_s << '@'<< ip.to_s << h( repository.url.slice(project_path_cut, repository.url.length)),:length=>20)%></td><!--Modified by tanxianbo-->
-    <%else %>
-        <td style="white-space:nowrap;overflow:hidden;text-overflow:ellipsis;" ><%=h truncate(repository.url,:length=>10) %></td>
-    <% end %>
-    <td><a href="javascript:viod(0)" class="c_blue" >
-      <% if repository.scm_name=="Git"%>
-        <%if User.current.allowed_to?(:manage_repository, @project) %>
-          <%= link_to(l(:label_user_plural), committers_repository_path(repository)) %>
-        <% end %>
-  <% end %>
-    </a></td>
-    <td>
-      <% if repository.login.to_s==User.current.login.to_s %>
-          <%= delete_new_link repository_path(repository) %>
-      <% end %></td>
-  </tr>
-  <% end %>
+            <%else %>
+                <td style="white-space:nowrap;overflow:hidden;text-overflow:ellipsis;" ><%=h truncate(repository.url,:length=>10) %></td>
+            <% end %>
+            <td><a href="javascript:viod(0)" class="c_blue" >
+              <% if repository.scm_name=="Git"%>
+                  <%if User.current.allowed_to?(:manage_repository, @project) %>
+                      <%= link_to(l(:label_user_plural), committers_repository_path(repository)) %>
+                  <% end %>
+              <% end %>
+            </a></td>
+            <td>
+              <% if repository.login.to_s==User.current.login.to_s %>
+                  <%= delete_new_link repository_path(repository) %>
+              <% end %></td>
+          </tr>
+      <% end %>
+      </tbody>
+    </table>
 <% else %>
-  <p class="nodata"><%= l(:label_no_data) %></p>
+    <p class="nodata"><%= l(:label_repository_no_data) %></p>
 <% end %>
 
-  </tbody>
-</table>
-<a href="javascript:viod(0)" class="pic_add fl mr5" onclick="pro_st_show_ku();"></a>
-<a href="javascript:viod(0)" class="c_blue fl" onclick="pro_st_show_ku();">
-  <% course_tag = @project.project_type %>
-  <% if User.current.allowed_to?(:manage_repository, @project) %>
-      <!--newrepo_project_repository_path(@project, :course => course_tag) -->
-      <%= link_to l(:label_repository_new_repos),"#" , :onclick=>"pro_st_show_ku();", :class => 'c_blue fl' %></p>
-  <% end %>
-</a>
-<div class="cl"></div>
+<%# 新建版本库 %>
+<% if @project.repositories.count == 0 %>
+    <a href="javascript:viod(0)" class="pic_add fl mr5" onclick="pro_st_show_ku();"></a>
+    <a href="javascript:viod(0)" class="c_blue fl" onclick="pro_st_show_ku();">
+      <% course_tag = @project.project_type %>
+      <% if User.current.allowed_to?(:manage_repository, @project) %>
+          <!--newrepo_project_repository_path(@project, :course => course_tag) -->
+          <%= link_to l(:label_repository_new_repos),"#" , :onclick=>"pro_st_show_ku();", :class => 'c_blue fl' %></p>
+      <% end %>
+    </a>
+    <div class="cl"></div>
 
-<%= labelled_form_for :repository, @repository, :url =>project_repositories_path(@project),:html => {:id => 'repository-form',:method=>"post",:autocomplete=>'off'} do |f| %>
-<div id="pro_st_edit_ku" class="pro_st_edit_ku">
-  <ul>
-    <li >
-      <label class="label02"><%=l(:label_scm)%>：</label>
-      <%= select_tag('repository_scm',
-             options_for_select(["Git"],@repository.class.name.demodulize),
-             :data => {:remote => true, :method => 'get'})%>
-             <% if @repository && ! @repository.class.scm_available %>
-             <span class="c_grey"><%= l(:text_scm_command_not_available) %></span>
-             <% end %>
-    </li>
+    <%= labelled_form_for :repository, @repository, :url =>project_repositories_path(@project),:html => {:id => 'repository-form',:method=>"post",:autocomplete=>'off'} do |f| %>
+        <div id="pro_st_edit_ku" class="pro_st_edit_ku">
+          <ul>
+            <li >
+              <label class="label02"><%=l(:label_scm)%>：</label>
+              <%= select_tag('repository_scm',
+                             options_for_select(["Git"],@repository.class.name.demodulize),
+                             :data => {:remote => true, :method => 'get'})%>
+              <% if @repository && ! @repository.class.scm_available %>
+                  <span class="c_grey"><%= l(:text_scm_command_not_available) %></span>
+              <% end %>
+            </li>
 
-    <% unless judge_main_repository(@project) %>
-        <li>
-            <label class="label02"><%=l(:field_repository_is_default)%>：</label>
-            <%= f.check_box :is_default, :label => "", :no_label => true %></p>
-        </li>
+            <% unless judge_main_repository(@project) %>
+                <li>
+                  <label class="label02"><%=l(:field_repository_is_default)%>：</label>
+                  <%= f.check_box :is_default, :label => "", :no_label => true %></p>
+                </li>
+            <% end %>
+            <li >
+              <input type="text" style="display: none"/> <!--阻止表单自动填充 -->
+              <input type="password" style="display: none"/> <!--阻止表单自动填充 -->
+              <label class="label02"><span class="c_red">*</span><%=l(:label_repository_name)%>：</label>
+              <%= f.text_field :identifier, :disabled =>@repository.nil? || @repository.identifier_frozen? ? true:false,:label=>"", :no_label => true %>
+              <% unless @repository.identifier_frozen? %>
+                  <span class="c_grey"><%=l(:text_length_between,:min=>1,:max=>254)<<l(:text_project_identifier_info) %></span>
+              <% end %>
+            </li>
+            <li >
+              <label class="label02"><span class="c_red">*</span><%=l(:label_password)%></label>
+              <%= f.password_field :upassword, :label=> "", :no_label => true%>
+              <span class="c_grey"><%= l(:label_upassword_info)%></span>
+            </li>
+            <div class="cl"></div>
+          </ul>
+          <a href="#" onclick="$('#repository-form').submit();" class="blue_btn fl ml110"><%=l(:button_save)%></a>
+          <a href="<%= settings_project_path(@project, :tab => 'repositories')%>" class="grey_btn fl ml10"><%=l(:button_cancel)%></a>
+        </div><!--pro_st_edit_issues end-->
     <% end %>
-    <li >
-      <input type="text" style="display: none"/> <!--阻止表单自动填充 -->
-      <input type="password" style="display: none"/> <!--阻止表单自动填充 -->
-      <label class="label02"><span class="c_red">*</span><%=l(:label_repository_name)%>：</label>
-      <%= f.text_field :identifier, :disabled =>@repository.nil? || @repository.identifier_frozen? ? true:false,:label=>"", :no_label => true %>
-      <% unless @repository.identifier_frozen? %>
-         <span class="c_grey"><%=l(:text_length_between,:min=>1,:max=>254)<<l(:text_project_identifier_info) %></span>
-      <% end %>
-    </li>
-    <li >
-      <label class="label02"><span class="c_red">*</span><%=l(:label_password)%></label>
-      <%= f.password_field :upassword, :label=> "", :no_label => true%>
-      <span class="c_grey"><%= l(:label_upassword_info)%></span>
-    </li>
-    <div class="cl"></div>
-  </ul>
-  <a href="#" onclick="$('#repository-form').submit();" class="blue_btn fl ml110"><%=l(:button_save)%></a>
-  <a href="<%= settings_project_path(@project, :tab => 'repositories')%>" class="grey_btn fl ml10"><%=l(:button_cancel)%></a>
-</div><!--pro_st_edit_issues end-->
+
 <% end %>
+
diff --git a/config/locales/commons/zh.yml b/config/locales/commons/zh.yml
index 7cbb223c6..61bad2a00 100644
--- a/config/locales/commons/zh.yml
+++ b/config/locales/commons/zh.yml
@@ -199,7 +199,8 @@ zh:
   label_descripition_blank: 描述不能为空
   label_subject_empty: 主题不能为空
 
-  label_no_data: 没有任何数据可供显示  
+  label_no_data: 没有任何数据可供显示
+  label_repository_no_data: 您还没有创建版本库，每个项目只允许创建一个版本库！
   # 项目、课程、用户公用
   label_settings: 配置
   label_information_plural: 信息