1、增加了“注册”里的“身份”

2、增加了“我的账号”里的“工作单位”

app/views/account/register.html.erb

@@ -1,4 +1,4 @@
-<h3><%=l(:label_register)%> <%=link_to l(:label_login_with_open_id_option), signin_url if Setting.openid? %></h3>
+<h3><%=l(:label_register)%> <%=link_to l(:label_loginkk), signin_url if Setting.openid? %></h3>
 
 <%= labelled_form_for @user, :url => register_path do |f| %>
 <%= error_messages_for 'user' %>

config/locales/zh.yml

@@ -1418,18 +1418,13 @@ zh:
   button_projects_feedback_respond: 回复
   label_projects_feedback_respond_content: 请输入回复内容
   label_user_create_project: 创建了
-<<<<<<< Updated upstream
-#added by bai
-=======
 
->>>>>>> Stashed changes
+#added by bai
   label_identity: 身份
   label_teacher: 教师
   label_student: 学生
   label_other: 其他
-<<<<<<< Updated upstream
+
 #end
-=======
 
->>>>>>> Stashed changes