diff options
author | Unknwon <u@gogs.io> | 2015-02-28 22:25:10 -0500 |
---|---|---|
committer | Unknwon <u@gogs.io> | 2015-02-28 22:25:10 -0500 |
commit | a6a2f59d1da927a1fae9d009f58e63881c4c029a (patch) | |
tree | 0587d3bb75fc9605c0e1c659e5044b63eaf51880 /conf | |
parent | b0b11fd7b1bd5e556c27ccae73668b7df74cd73e (diff) | |
parent | d446be9f5f1e4584c329dc418a9699960cb431e1 (diff) | |
download | gitea-a6a2f59d1da927a1fae9d009f58e63881c4c029a.tar.gz gitea-a6a2f59d1da927a1fae9d009f58e63881c4c029a.zip |
Merge branch 'access' of github.com:gogits/gogs into dev
Diffstat (limited to 'conf')
-rw-r--r-- | conf/locale/locale_en-US.ini | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/conf/locale/locale_en-US.ini b/conf/locale/locale_en-US.ini index f05287f51e..7e32a21eec 100644 --- a/conf/locale/locale_en-US.ini +++ b/conf/locale/locale_en-US.ini @@ -149,7 +149,7 @@ repo_name_been_taken = Repository name has been already taken. org_name_been_taken = Organization name has been already taken. team_name_been_taken = Team name has been already taken. email_been_used = E-mail address has been already used. -ssh_key_been_used = Public key name has been used. +ssh_key_been_used = Public key name or content has been used. illegal_username = Your username contains illegal characters. illegal_repo_name = Repository name contains illegal characters. illegal_org_name = Organization name contains illegal characters. |