summaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
author无闻 <joe2010xtmf@163.com>2014-09-07 19:30:51 -0400
committer无闻 <joe2010xtmf@163.com>2014-09-07 19:30:51 -0400
commite79e4b158090bf7c5dd86ac21cd0dbf44fbc82bd (patch)
treeaec4d8a53265080363b3ab7a4423bc0820133ea5 /conf
parent40bc130b19cf71a997d5073a2587ea2649128bf8 (diff)
parentf7be61c81935a30c21797351db5da32183e3188d (diff)
downloadgitea-e79e4b158090bf7c5dd86ac21cd0dbf44fbc82bd.tar.gz
gitea-e79e4b158090bf7c5dd86ac21cd0dbf44fbc82bd.zip
Merge pull request #442 from compressed/org_hook
Organization-level Webhooks
Diffstat (limited to 'conf')
-rw-r--r--conf/locale/locale_en-US.ini5
1 files changed, 3 insertions, 2 deletions
diff --git a/conf/locale/locale_en-US.ini b/conf/locale/locale_en-US.ini
index 50fbc3cd5a..ba9bef6d52 100644
--- a/conf/locale/locale_en-US.ini
+++ b/conf/locale/locale_en-US.ini
@@ -207,7 +207,7 @@ unbind = Unbind
unbind_success = Social account has been unbound.
delete_account = Delete Your Account
-delete_prompt = The operation will delete your account permanently, and <strong>CANNOT</strong> be undo!
+delete_prompt = The operation will delete your account permanently, and <strong>CANNOT</strong> be undone!
confirm_delete_account = Confirm Deletion
[repo]
@@ -316,8 +316,9 @@ settings.update_settings = Update Settings
settings.update_setting_success = Organization setting has been successfully updated.
settings.delete = Delete Organization
settings.delete_account = Delete This Organization
-settings.delete_prompt = The operation will delete this organization permanently, and <strong>CANNOT</strong> be undo!
+settings.delete_prompt = The operation will delete this organization permanently, and <strong>CANNOT</strong> be undone!
settings.confirm_delete_account = Confirm Deletion
+settings.hooks_desc = Add webhooks that will be triggered for <strong>all repositories</strong> under this organization.
members.public = Public
members.public_helper = make private