summaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorUnknwon <joe2010xtmf@163.com>2014-08-09 17:25:02 -0700
committerUnknwon <joe2010xtmf@163.com>2014-08-09 17:25:02 -0700
commit78defd238c939ff577041f2e7b95b2ae48a9fb27 (patch)
tree5dd168d880ece655796558874f352b2c2263e965 /conf
parent08c6d07aad65f45efd5bf9f50d9cda68f59c0e69 (diff)
downloadgitea-78defd238c939ff577041f2e7b95b2ae48a9fb27.tar.gz
gitea-78defd238c939ff577041f2e7b95b2ae48a9fb27.zip
Page: Manage social accounts
Diffstat (limited to 'conf')
-rw-r--r--conf/locale/locale_en-US.ini8
-rw-r--r--conf/locale/locale_zh-CN.ini7
2 files changed, 13 insertions, 2 deletions
diff --git a/conf/locale/locale_en-US.ini b/conf/locale/locale_en-US.ini
index 42fffa08da..9e2302195d 100644
--- a/conf/locale/locale_en-US.ini
+++ b/conf/locale/locale_en-US.ini
@@ -5,6 +5,7 @@ dashboard = Dashboard
explore = Explore
help = Help
sign_in = Sign In
+social_sign_in = Social Sign In: 2nd Step <small>associate account</small>
sign_out = Sign Out
sign_up = Sign Up
register = Register
@@ -49,6 +50,7 @@ my_mirrors = My Mirrors
[auth]
create_new_account = Create New Account
register_hepler_msg = Already have an account? Sign in now!
+social_register_hepler_msg = Already have an account? Bind now!
disable_register_prompt = Sorry, registration has been disabled. Please contact the site administrator.
remember_me = Remember Me
forget_password = Fotget password?
@@ -129,8 +131,12 @@ add_on = Added on
last_used = Last used on
no_activity = No recent activity
-manage_orgs = Manage Organizations
manage_social = Manage Associated Social Accounts
+social_desc = This is a list of associated social accounts. Remove any binding that you do not recognize.
+unbind = Unbind
+unbind_success = Social account has been unbinded.
+
+manage_orgs = Manage Organizations
delete_account = Delete Your Account
delete_prompt = The operation will delete your account permanently, and <strong>CANNOT</strong> be undo!
diff --git a/conf/locale/locale_zh-CN.ini b/conf/locale/locale_zh-CN.ini
index fb49ade8c4..31b99c6024 100644
--- a/conf/locale/locale_zh-CN.ini
+++ b/conf/locale/locale_zh-CN.ini
@@ -49,6 +49,7 @@ my_mirrors = 我的镜像
[auth]
create_new_account = 创建帐户
register_hepler_msg = 已经注册?立即登录!
+social_register_hepler_msg = 已经注册?立即绑定!
disable_register_prompt = 对不起,注册功能已被关闭。请联系网站管理员。
remember_me = 记住登录
forget_password = 忘记密码?
@@ -129,8 +130,12 @@ add_on = 增加于
last_used = 上次使用在
no_activity = 没有最近活动
-manage_orgs = 管理我的组织
manage_social = 管理关联社交帐户
+social_desc = 以下是与您帐户所关联的社交帐号,如果您发现有陌生的关联,请立即解除绑定!
+unbind = 解除绑定
+unbind_success = 社交帐号解除绑定成功!
+
+manage_orgs = 管理我的组织
delete_account = 删除当前帐户
delete_prompt = 删除操作会永久清除您的帐户信息,并且 <strong>不可恢复</strong>!