From 98131614119f39a3f341392c98a4d2320b5b8e21 Mon Sep 17 00:00:00 2001 From: Unknwon Date: Sat, 26 Jul 2014 23:53:16 -0400 Subject: Reser repo owner to organization when error occurs in repo create page, dashboard news feed page, create organization page --- conf/locale/locale_en-US.ini | 8 ++++++++ conf/locale/locale_zh-CN.ini | 8 ++++++++ 2 files changed, 16 insertions(+) (limited to 'conf/locale') diff --git a/conf/locale/locale_en-US.ini b/conf/locale/locale_en-US.ini index c673ca9f..8d5e85d8 100644 --- a/conf/locale/locale_en-US.ini +++ b/conf/locale/locale_en-US.ini @@ -74,10 +74,12 @@ password_not_match = Password and re-type password are not same. username_been_taken = Username has been already taken. repo_name_been_taken = Repository name has been already taken. +org_name_been_taken = Organization 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. illegal_username = Your username contains illegal characters. illegal_repo_name = Repository name contains illegal characters. +illegal_org_name = Organization name contains illegal characters. username_password_incorrect = Username or password is not correct. invalid_ssh_key = Sorry, we're not able to verify your SSH key: %s @@ -140,6 +142,12 @@ license_helper = Select a license file init_readme = Initialize this repository with a README.md create_repo = Create Repository +[org] +org_name_holder = Organization Name +org_name_helper = Great organization names are short and memorable. +org_email_helper = Organization's Email receives all notifications and confirmations. +create_org = Create Organization + [action] create_repo = created repository %s commit_repo = pushed to %s at %s diff --git a/conf/locale/locale_zh-CN.ini b/conf/locale/locale_zh-CN.ini index ff542a37..9ec267cd 100644 --- a/conf/locale/locale_zh-CN.ini +++ b/conf/locale/locale_zh-CN.ini @@ -74,10 +74,12 @@ password_not_match = 密码与确认密码未匹配。 username_been_taken = 用户名已经被占用。 repo_name_been_taken = 仓库名称已经被占用。 +org_name_been_taken = 组织名称已经被占用。 email_been_used = 邮箱地址已经被使用。 ssh_key_been_used = SSH 密钥已经被使用。 illegal_username = 您的用户名包含非法字符。 illegal_repo_name = 仓库名称包含非法字符。 +illegal_org_name = 组织名称包含非法字符。 username_password_incorrect = 用户名或密码不正确。 invalid_ssh_key = 很抱歉，我们无法验证您输入的 SSH 密钥：%s @@ -140,6 +142,12 @@ license_helper = 请选择授权许可文件 init_readme = 使用 README.md 文件初始化仓库 create_repo = 创建仓库 +[org] +org_name_holder = 组织名称 +org_name_helper = 伟大的组织都有一个简短而寓意深刻的名字。 +org_email_helper = 组织的邮箱用于接收所有通知和确认邮件。 +create_org = 创建组织 + [action] create_repo = 创建了仓库 %s commit_repo = 推送了 %s 分支的代码到 %s -- cgit v1.2.3