summaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorSandro Santilli <strk@kbt.io>2016-06-26 19:51:09 +0200
committer无闻 <u@gogs.io>2016-06-27 01:51:09 +0800
commit76a0e43e88c4c43e81d8ef883c8a3483df3109a4 (patch)
tree7a714dc8a07ccb3611e3173d75516fd60e2e77d3 /conf
parent24caccccdd2d5e53a66a73b026eea45327596395 (diff)
downloadgitea-76a0e43e88c4c43e81d8ef883c8a3483df3109a4.tar.gz
gitea-76a0e43e88c4c43e81d8ef883c8a3483df3109a4.zip
Do not assume avatar needs be changed from gravatar.com (#3209)
Always send user to settings screen to change avatar. Drops "change_custom_avatar" localized message, keeps "change_avatar" for the generic one. NOTE: only changes the en-US locale, as per https://github.com/gogits/gogs/wiki/Contributing-Code#those-we-do-not-accept NOTE: requires rebuild of bindata.go to fully see effects
Diffstat (limited to 'conf')
-rw-r--r--conf/locale/locale_en-US.ini3
1 files changed, 1 insertions, 2 deletions
diff --git a/conf/locale/locale_en-US.ini b/conf/locale/locale_en-US.ini
index 6bbf1e1839..636a1b28fd 100644
--- a/conf/locale/locale_en-US.ini
+++ b/conf/locale/locale_en-US.ini
@@ -220,8 +220,7 @@ org_still_own_repo = This organization still has ownership of repositories, you
target_branch_not_exist = Target branch does not exist.
[user]
-change_avatar = Change your avatar at gravatar.com
-change_custom_avatar = Change your avatar in settings
+change_avatar = Change your avatar
join_on = Joined on
repositories = Repositories
activity = Public Activity