parent
a2cc191a4e
commit
7e40999e06
|
@ -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' %>
|
||||
|
|
|
@ -679,7 +679,7 @@ zh:
|
|||
label_all_words: 所有单词
|
||||
label_wiki: Wiki
|
||||
label_wiki_edit: Wiki 编辑
|
||||
label_wiki_edit_plural: Wiki 编辑记录
|
||||
label_wiki_edit_plural: Wiki 编辑记录
|
||||
label_wiki_page: Wiki 页面
|
||||
label_wiki_page_plural: Wiki 页面
|
||||
label_index_by_title: 按标题索引
|
||||
|
@ -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
|
||||
|
||||
#end
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue