diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-03-06 14:03:56 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-03-06 14:03:56 +0000 |
| commit | c01597499cbfbce0a429b7196a315e1643d9e5c2 (patch) | |
| tree | a93e25f2581db47848a99cbde681193e35f6f74f /phpBB/language | |
| parent | 14b6714c93944b6af9ec01d978cfe7f387dc7e9a (diff) | |
| download | forums-c01597499cbfbce0a429b7196a315e1643d9e5c2.tar forums-c01597499cbfbce0a429b7196a315e1643d9e5c2.tar.gz forums-c01597499cbfbce0a429b7196a315e1643d9e5c2.tar.bz2 forums-c01597499cbfbce0a429b7196a315e1643d9e5c2.tar.xz forums-c01597499cbfbce0a429b7196a315e1643d9e5c2.zip | |
- added "display_on_posting" setting to custom bbcodes (creates a button with the bbcode tag)
- fixed forum editing and parent id selection
- completely removed HTML support (it only creates security problems)
- changed cache_moderators() to reflect permission changes
git-svn-id: file:///svn/phpbb/trunk@5603 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language')
| -rw-r--r-- | phpBB/language/en/acp/board.php | 7 | ||||
| -rw-r--r-- | phpBB/language/en/acp/common.php | 25 | ||||
| -rw-r--r-- | phpBB/language/en/acp/permissions_phpbb.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/help_faq.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/posting.php | 4 | ||||
| -rw-r--r-- | phpBB/language/en/ucp.php | 1 |
6 files changed, 15 insertions, 26 deletions
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php index b28827a0c9..ab1a6a9e98 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -71,7 +71,6 @@ $lang = array_merge($lang, array( 'PM_EDIT_TIME_EXPLAIN' => 'Limits the time available to edit a private message not already delivered, zero equals infinity', 'ALLOW_MASS_PM' => 'Allow Mass PM\'s', - 'ALLOW_HTML_PM' => 'Allow HTML in private messages', 'ALLOW_BBCODE_PM' => 'Allow BBCode in private messages', 'ALLOW_SMILIES_PM' => 'Allow smilies in private messages', 'ALLOW_DOWNLOAD_PM' => 'Allow downloading of attachments in private messages', @@ -330,7 +329,7 @@ $lang = array_merge($lang, array( // Board defaults $lang = array_merge($lang, array( - 'ACP_BOARD_DEFAULTS_EXPLAIN' => 'These settings allow you to define a number of default or global settings used by the board. For example, to disable the use of HTML across the entire board alter the relevant setting below. This data is also used for new user registrations and (where relevant) guest users. Please note that registered users can override some of these options with their own settings.', + 'ACP_BOARD_DEFAULTS_EXPLAIN' => 'These settings allow you to define a number of default or global settings used by the board. This data is also used for new user registrations and (where relevant) guest users. Please note that registered users can override some of these options with their own settings.', 'DEFAULT_STYLE' => 'Default Style', 'OVERRIDE_STYLE' => 'Override user style', 'OVERRIDE_STYLE_EXPLAIN' => 'Replaces users style with the default.', @@ -359,16 +358,12 @@ $lang = array_merge($lang, array( 'MIN_RATINGS_EXPLAIN' => 'Number of distinct ratings before users karma is calculated.', 'ALLOW_ATTACHMENTS' => 'Allow Attachments', 'ALLOW_PM_ATTACHMENTS' => 'Allow Attachments in Private Messages', - 'ALLOW_HTML' => 'Allow HTML', - 'ALLOWED_TAGS' => 'Allowed HTML tags', - 'ALLOWED_TAGS_EXPLAIN' => 'Separate tags with commas.', 'ALLOW_BBCODE' => 'Allow BBCode', 'ALLOW_SMILIES' => 'Allow Smilies', 'ALLOW_SIG' => 'Allow Signatures', 'ALLOW_SIG_IMG' => 'Allow use of IMG BBCode Tag in user signatures', 'ALLOW_SIG_BBCODE' => 'Allow BBCode in user signatures', 'ALLOW_SIG_SMILIES' => 'Allow use of smilies in user signatures', - 'ALLOW_SIG_HTML' => 'Allow use of HTML in user signatures', 'ALLOW_SIG_FLASH' => 'Allow use of FLASH BBCode Tag in user signatures', 'ALLOW_NO_CENSORS' => 'Allow Disable of Censors', 'ALLOW_NO_CENSORS_EXPLAIN' => 'User can disable word censoring.', diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php index 93f42b58ec..32a7bed741 100644 --- a/phpBB/language/en/acp/common.php +++ b/phpBB/language/en/acp/common.php @@ -110,7 +110,7 @@ $lang = array_merge($lang, array( 'ACP_MESSAGE_SETTINGS' => 'Message Settings', 'ACP_MODULE_MANAGEMENT' => 'Module Management', 'ACP_MOD_LOGS' => 'Moderator Log', - 'ACP_MOD_ROLES' => 'Mod Roles', + 'ACP_MOD_ROLES' => 'Moderator Roles', 'ACP_ORPHAN_ATTACHMENTS' => 'Orphan Attachments', @@ -377,18 +377,19 @@ $lang = array_merge($lang, array( 'LOG_ERROR_EMAIL' => '<b>Email Error</b><br />» %s', 'LOG_FORUM_ADD' => '<b>Created new forum</b><br />» %s', + 'LOG_FORUM_DEL_FORUM' => '<b>Deleted forum</b><br />» %s', + 'LOG_FORUM_DEL_FORUMS' => '<b>Deleted forum and its subforums</b><br />» %s', + 'LOG_FORUM_DEL_MOVE_FORUMS' => '<b>Deleted forum and moved subforums</b> to %s<br />» %s', + 'LOG_FORUM_DEL_MOVE_POSTS' => '<b>Deleted forum and moved posts </b> to %s<br />» %s', + 'LOG_FORUM_DEL_MOVE_POSTS_FORUMS' => '<b>Deleted forum and its subforums, moved messages</b> to %s<br />» %s', + 'LOG_FORUM_DEL_MOVE_POSTS_MOVE_FORUMS' => '<b>Deleted forum, moved posts</b> to %s <b>and subforums</b> to %s<br />» %s', + 'LOG_FORUM_DEL_POSTS' => '<b>Deleted forum and its messages</b><br />» %s', + 'LOG_FORUM_DEL_POSTS_FORUMS' => '<b>Deleted forum, its messages and subforums</b><br />» %s', + 'LOG_FORUM_DEL_POSTS_MOVE_FORUMS' => '<b>Deleted forum and its messages, moved subforums</b> to %s<br />» %s', 'LOG_FORUM_EDIT' => '<b>Edited forum details</b><br />» %s', 'LOG_FORUM_MOVE_DOWN' => '<b>Moved forum</b> %s <b>below</b> %s', 'LOG_FORUM_MOVE_UP' => '<b>Moved forum</b> %s <b>above</b> %s', 'LOG_FORUM_SYNC' => '<b>Re-synchronised forum</b><br />» %s', - 'LOG_FORUM_DEL_POSTS' => '<b>Deleted forum and its messages</b><br />» %s', - 'LOG_FORUM_DEL_FORUMS' => '<b>Deleted forum and its subforums</b><br />» %s', - 'LOG_FORUM_DEL_POSTS_MOVE_FORUMS' => '<b>Deleted forum and its messages, moved subforums</b> to %s<br />» %s', - 'LOG_FORUM_DEL_MOVE_POSTS_FORUMS' => '<b>Deleted forum and its subforums, moved messages</b> to %s<br />» %s', - 'LOG_FORUM_DEL_MOVE_POSTS' => '<b>Deleted forum and moved posts </b> to %s<br />» %s', - 'LOG_FORUM_DEL_MOVE_FORUMS' => '<b>Deleted forum and moved subforums</b> to %s<br />» %s', - 'LOG_FORUM_DEL_POSTS_FORUMS' => '<b>Deleted forum, its messages and subforums</b><br />» %s', - 'LOG_FORUM_DEL_MOVE_POSTS_MOVE_FORUMS' => '<b>Deleted forum, moved posts</b> to %s <b>and subforums</b> to %s<br />» %s', 'LOG_GROUP_CREATED' => '<b>New usergroup created</b><br />» %s', 'LOG_GROUP_DEFAULTS' => '<b>Group made default for members</b><br />» %s', @@ -438,9 +439,9 @@ $lang = array_merge($lang, array( 'LOG_F_ROLE_ADD' => '<b>Forum Role added</b><br />» %s', 'LOG_F_ROLE_EDIT' => '<b>Forum Role edited</b><br />» %s', 'LOG_F_ROLE_REMOVED' => '<b>Forum Role removed</b><br />» %s', - 'LOG_M_ROLE_ADD' => '<b>Mod Role added</b><br />» %s', - 'LOG_M_ROLE_EDIT' => '<b>Mod Role edited</b><br />» %s', - 'LOG_M_ROLE_REMOVED' => '<b>Mod Role removed</b><br />» %s', + 'LOG_M_ROLE_ADD' => '<b>Moderator Role added</b><br />» %s', + 'LOG_M_ROLE_EDIT' => '<b>Moderator Role edited</b><br />» %s', + 'LOG_M_ROLE_REMOVED' => '<b>Moderator Role removed</b><br />» %s', 'LOG_U_ROLE_ADD' => '<b>User Role added</b><br />» %s', 'LOG_U_ROLE_EDIT' => '<b>User Role edited</b><br />» %s', 'LOG_U_ROLE_REMOVED' => '<b>User Role removed</b><br />» %s', diff --git a/phpBB/language/en/acp/permissions_phpbb.php b/phpBB/language/en/acp/permissions_phpbb.php index 20f1cebe84..bbbb52d390 100644 --- a/phpBB/language/en/acp/permissions_phpbb.php +++ b/phpBB/language/en/acp/permissions_phpbb.php @@ -103,7 +103,6 @@ $lang = array_merge($lang, array( 'acl_u_pm_attach' => array('lang' => 'Can attach files in private messages', 'cat' => 'pm'), 'acl_u_pm_download' => array('lang' => 'Can download files in private messages', 'cat' => 'pm'), 'acl_u_pm_bbcode' => array('lang' => 'Can post BBCode in private messages', 'cat' => 'pm'), - 'acl_u_pm_html' => array('lang' => 'Can post HTML in private messages', 'cat' => 'pm'), 'acl_u_pm_smilies' => array('lang' => 'Can post smilies in private messages', 'cat' => 'pm'), 'acl_u_pm_img' => array('lang' => 'Can post images in private messages', 'cat' => 'pm'), 'acl_u_pm_flash' => array('lang' => 'Can post Flash in private messages', 'cat' => 'pm'), @@ -134,7 +133,6 @@ $lang = array_merge($lang, array( 'acl_f_attach' => array('lang' => 'Can attach files', 'cat' => 'content'), 'acl_f_download' => array('lang' => 'Can download files', 'cat' => 'content'), 'acl_f_sigs' => array('lang' => 'Can use signatures', 'cat' => 'content'), - 'acl_f_html' => array('lang' => 'Can post HTML', 'cat' => 'content'), 'acl_f_bbcode' => array('lang' => 'Can post BBCode', 'cat' => 'content'), 'acl_f_smilies' => array('lang' => 'Can post smilies', 'cat' => 'content'), 'acl_f_img' => array('lang' => 'Can post images', 'cat' => 'content'), diff --git a/phpBB/language/en/help_faq.php b/phpBB/language/en/help_faq.php index 5ac25650d2..3a25caeb3b 100644 --- a/phpBB/language/en/help_faq.php +++ b/phpBB/language/en/help_faq.php @@ -130,7 +130,7 @@ $help = array( ), array( 0 => 'Can I use HTML?', - 1 => 'That depends on whether the administrator allows you too, they have complete control over it. If you are allowed to use it you will probably find only certain tags work. This is a <i>safety</i> feature to prevent people abusing the board by using tags which may destroy the layout or cause other problems. If HTML is enabled you can disable it on a per post basis from the posting form.' + 1 => '...' ), array( 0 => 'What are Smileys?', diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php index e76831cef1..d1d507a94b 100644 --- a/phpBB/language/en/posting.php +++ b/phpBB/language/en/posting.php @@ -74,7 +74,6 @@ $lang = array_merge($lang, array( 'DELETE_POST_CONFIRM' => 'Are you sure you want to delete this message?', 'DELETE_POST_WARN' => 'Once deleted the post cannot be recovered', 'DISABLE_BBCODE' => 'Disable BBCode', - 'DISABLE_HTML' => 'Disable HTML', 'DISABLE_MAGIC_URL' => 'Do not automatically parse URLs', 'DISABLE_SMILIES' => 'Disable Smilies', 'DISALLOWED_EXTENSION' => 'The Extension %s is not allowed', @@ -100,9 +99,6 @@ $lang = array_merge($lang, array( 'GENERAL_UPLOAD_ERROR' => 'Could not upload Attachment to %s', - 'HTML_IS_OFF' => 'HTML is <u>OFF</u>', - 'HTML_IS_ON' => 'HTML is <u>ON</u>', - 'IMAGES_ARE_OFF' => '[img] is <u>OFF</u>', 'IMAGES_ARE_ON' => '[img] is <u>ON</u>', 'INVALID_FILENAME' => '%s is an invalid filename', diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index 235ade1d58..bab24a78a6 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -102,7 +102,6 @@ $lang = array_merge($lang, array( 'DEFAULT_ACTION_EXPLAIN' => 'This Action will be triggered if none of the above is applicable', 'DEFAULT_ADD_SIG' => 'Attach my signature by default', 'DEFAULT_BBCODE' => 'Enable BBCode by default', - 'DEFAULT_HTML' => 'Enable HTML by default', 'DEFAULT_NOTIFY' => 'Notify me upon replies by default', 'DEFAULT_SMILIES' => 'Enable smilies by default', 'DEFINED_RULES' => 'Defined Rules', |