From 7e40999e06448db0a5459192e1aaf24a5ce50adb Mon Sep 17 00:00:00 2001 From: baiyu Date: Thu, 12 Sep 2013 09:06:21 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=A2=9E=E5=8A=A0=E4=BA=86=E2=80=9C?= =?UTF-8?q?=E6=B3=A8=E5=86=8C=E2=80=9D=E9=87=8C=E7=9A=84=E2=80=9C=E8=BA=AB?= =?UTF-8?q?=E4=BB=BD=E2=80=9D=202=E3=80=81=E5=A2=9E=E5=8A=A0=E4=BA=86?= =?UTF-8?q?=E2=80=9C=E6=88=91=E7=9A=84=E8=B4=A6=E5=8F=B7=E2=80=9D=E9=87=8C?= =?UTF-8?q?=E7=9A=84=E2=80=9C=E5=B7=A5=E4=BD=9C=E5=8D=95=E4=BD=8D=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/account/register.html.erb | 2 +- config/locales/zh.yml | 13 ++++--------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/app/views/account/register.html.erb b/app/views/account/register.html.erb index 295d58426..292cf9a74 100644 --- a/app/views/account/register.html.erb +++ b/app/views/account/register.html.erb @@ -1,4 +1,4 @@ -

<%=l(:label_register)%> <%=link_to l(:label_login_with_open_id_option), signin_url if Setting.openid? %>

+

<%=l(:label_register)%> <%=link_to l(:label_loginkk), signin_url if Setting.openid? %>

<%= labelled_form_for @user, :url => register_path do |f| %> <%= error_messages_for 'user' %> diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 373e080ce..d31671777 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -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 +