Merge branch 'master' of github.com:gogits/gogs into develop

This commit is contained in:
Unknwon 2015-03-22 19:19:34 -04:00
commit 5c3cac3bc0

View file

@ -90,7 +90,7 @@ invalid_repo_path = Repository root path is invalid: %v
run_user_not_match = Run user isn't the current user: %s -> %s run_user_not_match = Run user isn't the current user: %s -> %s
save_config_failed = Fail to save configuration: %v save_config_failed = Fail to save configuration: %v
invalid_admin_setting = Admin account setting is invalid: %v invalid_admin_setting = Admin account setting is invalid: %v
install_success = Welcome! We're glad that you choose Gogs, have fun and take care. install_success = Welcome! We're glad that you chose Gogs, have fun and take care.
[home] [home]
uname_holder = Username or E-mail uname_holder = Username or E-mail