summaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorUnknwon <joe2010xtmf@163.com>2014-07-26 02:28:04 -0400
committerUnknwon <joe2010xtmf@163.com>2014-07-26 02:28:04 -0400
commit5c4bc3c848fb4bd46ad5ceeacd82cdfa8f2b5635 (patch)
tree213666141efaf773c4411d41482387f1250068f8 /conf
parent3f38ff6c09f0497980ad13fda9803907cee6d612 (diff)
downloadgitea-5c4bc3c848fb4bd46ad5ceeacd82cdfa8f2b5635.tar.gz
gitea-5c4bc3c848fb4bd46ad5ceeacd82cdfa8f2b5635.zip
Huge updates!!!!! Be careful to merge!!!!
Diffstat (limited to 'conf')
-rw-r--r--conf/locale/locale_en-US.ini2
-rw-r--r--conf/locale/locale_zh-CN.ini2
2 files changed, 4 insertions, 0 deletions
diff --git a/conf/locale/locale_en-US.ini b/conf/locale/locale_en-US.ini
index b8832167ae..c673ca9f49 100644
--- a/conf/locale/locale_en-US.ini
+++ b/conf/locale/locale_en-US.ini
@@ -89,6 +89,7 @@ profile = Profile
password = Password
ssh_keys = SSH Keys
social = Social Accounts
+orgs = Organizations
delete = Delete Accoount
public_profile = Public Profile
@@ -118,6 +119,7 @@ add_on = Added on
last_used = Last used on
no_activity = No recent activity
+manage_orgs = Manage Organizations
manage_social = Manage Associated Social Accounts
delete_account = Delete Your Account
diff --git a/conf/locale/locale_zh-CN.ini b/conf/locale/locale_zh-CN.ini
index 30e683071e..ff542a374c 100644
--- a/conf/locale/locale_zh-CN.ini
+++ b/conf/locale/locale_zh-CN.ini
@@ -89,6 +89,7 @@ profile = 个人信息
password = 修改密码
ssh_keys = 管理 SSH 密钥
social = 社交帐号绑定
+orgs = 管理组织
delete = 删除帐户
public_profile = 公开信息
@@ -118,6 +119,7 @@ add_on = 增加于
last_used = 上次使用在
no_activity = 没有最近活动
+manage_orgs = 管理我的组织
manage_social = 管理关联社交帐户
delete_account = 删除当前帐户