summaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorUnknwon <joe2010xtmf@163.com>2014-11-21 12:51:36 -0500
committerUnknwon <joe2010xtmf@163.com>2014-11-21 12:51:36 -0500
commitef275ebf62608b1bd2c7e48862e723cd822d93c2 (patch)
tree1ff4e8cd2a7b85b85b19d03855cb51e6327c3e8a /conf
parent22ab4fa1b0bdbea10979ae87568452b5bbf9b6af (diff)
downloadgitea-ef275ebf62608b1bd2c7e48862e723cd822d93c2.tar.gz
gitea-ef275ebf62608b1bd2c7e48862e723cd822d93c2.zip
more on change avatar
Diffstat (limited to 'conf')
-rw-r--r--conf/locale/locale_en-US.ini9
-rwxr-xr-xconf/locale/locale_zh-CN.ini8
2 files changed, 14 insertions, 3 deletions
diff --git a/conf/locale/locale_en-US.ini b/conf/locale/locale_en-US.ini
index 6334966602..f82e834c2e 100644
--- a/conf/locale/locale_en-US.ini
+++ b/conf/locale/locale_en-US.ini
@@ -202,10 +202,13 @@ change_username = Username Changed
change_username_desc = Username has been changed, do you want to continue? This will affect all links relate to your account.
continue = Continue
cancel = Cancel
+
+enable_custom_avatar = Enable Custom Avatar
+enable_custom_avatar_helper = Enable this to disable fetch from Gravatar
choose_new_avatar = Choose new avatar
-upload_avatar = Upload Avatar
-uploaded_avatar_not_a_image = Uploaded file is not a image
-upload_avatar_success = Your new avatar has been uploaded successfully.
+update_avatar = Update Avatar Setting
+uploaded_avatar_not_a_image = Uploaded file is not a image.
+update_avatar_success = Your avatar setting has been updated successfully.
change_password = Change Password
old_password = Current Password
diff --git a/conf/locale/locale_zh-CN.ini b/conf/locale/locale_zh-CN.ini
index 02cf77c5c9..09030a387f 100755
--- a/conf/locale/locale_zh-CN.ini
+++ b/conf/locale/locale_zh-CN.ini
@@ -173,6 +173,7 @@ target_branch_not_exist=目标分支不存在。
[user]
change_avatar=到 gravatar.com 上修改您的头像
+change_custom_avatar=到个人设置中修改头像
join_on=加入于
repositories=仓库列表
activity=公开活动
@@ -202,6 +203,13 @@ change_username_desc=用户名被修改,您确定要继续操作吗?这将
continue=继续操作
cancel=取消操作
+enable_custom_avatar=启动自定义头像
+enable_custom_avatar_helper=激活该选项来禁止从 Gravatar 获取头像
+choose_new_avatar=选择新的头像
+update_avatar=更新头像设置
+uploaded_avatar_not_a_image=上传的文件不是一张图片!
+update_avatar_success=您的头像设置更新成功!
+
change_password=修改密码
old_password=当前密码
new_password=新的密码