diff options
| author | Unknwon <u@gogs.io> | 2015-08-10 23:01:41 +0800 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2015-08-10 23:01:41 +0800 |
| commit | 887bc1b594ef5c279c28c90009e67b068978482f (patch) | |
| tree | d4390bf5b8a6b4f581fc322a3290e69315060b78 /conf | |
| parent | 884bc4ffd81f5b952df172d43ba7b16e1844ff19 (diff) | |
| parent | 2aea247208d4429d111fb9725c16a8e9ea24860f (diff) | |
| download | gitea-887bc1b594ef5c279c28c90009e67b068978482f.tar.gz gitea-887bc1b594ef5c279c28c90009e67b068978482f.zip | |
Merge branch 'develop' of github.com:gogits/gogs into feature/pull_request2
# Conflicts:
# modules/bindata/bindata.go
# public/css/gogs.min.css
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/app.ini | 3 | ||||
| -rw-r--r-- | conf/locale/locale_en-US.ini | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/conf/app.ini b/conf/app.ini index 8710e3d01b..3e6e615a55 100644 --- a/conf/app.ini +++ b/conf/app.ini @@ -198,6 +198,7 @@ SESSION_LIFE_TIME = 86400 SERVICE = server AVATAR_UPLOAD_PATH = data/avatars ; Chinese users can choose "duoshuo" +; or a custom avatar source, like: http://cn.gravatar.com/avatar/ GRAVATAR_SOURCE = gravatar DISABLE_GRAVATAR = false @@ -317,4 +318,4 @@ bg-BG = bg it-IT = it [other] -SHOW_FOOTER_BRANDING = false
\ No newline at end of file +SHOW_FOOTER_BRANDING = false diff --git a/conf/locale/locale_en-US.ini b/conf/locale/locale_en-US.ini index 594e422654..528ab9fe08 100644 --- a/conf/locale/locale_en-US.ini +++ b/conf/locale/locale_en-US.ini @@ -14,6 +14,9 @@ version = Version page = Page template = Template language = Language +create_new = Create new... +user_profile_and_more = User profile and more +signed_in_as = Signed in as username = Username email = E-mail @@ -32,6 +35,8 @@ manage_org = Manage Organizations admin_panel = Admin Panel account_settings = Account Settings settings = Settings +your_profile = Your Profile +your_settings = Your Settings news_feed = News Feed pull_requests = Pull Requests |