summaryrefslogtreecommitdiffstats
path: root/options
diff options
context:
space:
mode:
authorRémy Boulanouar <rboulanouar@gmail.com>2017-06-02 10:43:44 +0200
committerBo-Yi Wu <appleboy.tw@gmail.com>2017-06-02 03:43:44 -0500
commit62f600cf1ca5ffe029e470644839ea39283bf023 (patch)
treeb2de4dda4c42354b2f0452c17c00084f89fd8912 /options
parent976c2a05fafcecc454634206f9072f3ae23bc055 (diff)
downloadgitea-62f600cf1ca5ffe029e470644839ea39283bf023.tar.gz
gitea-62f600cf1ca5ffe029e470644839ea39283bf023.zip
Display all organization from user settings (#1739)
* Display all organization from user settings * fix Tab selection * Update locale_en-US.ini * Add a condition for display Create organization button * Remove french translation * Remove unnecessary admin flag
Diffstat (limited to 'options')
-rw-r--r--options/locale/locale_en-US.ini3
1 files changed, 3 insertions, 0 deletions
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index e369ee8b30..00b374835f 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -298,6 +298,7 @@ orgs = Organizations
delete = Delete Account
twofa = Two-Factor Authentication
account_link = External Accounts
+organization = Organization
uid = Uid
public_profile = Public Profile
@@ -431,6 +432,8 @@ remove_account_link = Remove linked account
remove_account_link_desc = Removing this linked account will revoke all related access using this account. Do you want to continue?
remove_account_link_success = Account link has been removed successfully!
+orgs_none = You are not a member of any organizations.
+
delete_account = Delete Your Account
delete_prompt = The operation will delete your account permanently, and <strong>CANNOT</strong> be undone!
confirm_delete_account = Confirm Deletion