mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-14 04:34:07 +02:00
Code Issues Releases Wiki Activity

again, a lot of bug fixes

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@7909 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
2007-07-19 20:38:38 +00:00
parent 870991c060
commit 75a5162945
54 changed files with 307 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
phpBB/language/en/acp/board.php
View File

@@ -55,6 +55,8 @@ $lang = array_merge($lang, array(
'ACP_BOARD_FEATURES_EXPLAIN' => 'Here you can enable/disable several board features.',
'ALLOW_ATTACHMENTS' => 'Allow attachments',
'ALLOW_BIRTHDAYS' => 'Allow birthdays',
'ALLOW_BIRTHDAYS_EXPLAIN' => 'Allow birthdays to be entered and age being displayed in profiles. Please note the birthday list within the board index is controlled by a separate load setting.',
'ALLOW_BOOKMARKS' => 'Allow bookmarking topics',
'ALLOW_BOOKMARKS_EXPLAIN' => 'User is able to store personal bookmarks.',
'ALLOW_BBCODE' => 'Allow BBCode',
@@ -271,6 +273,7 @@ $lang = array_merge($lang, array(
'YES_ANON_READ_MARKING' => 'Enable topic marking for guests',
'YES_ANON_READ_MARKING_EXPLAIN' => 'Stores read/unread status information for guests. If disabled posts are always read for guests.',
'YES_BIRTHDAYS' => 'Enable birthday listing',
'YES_BIRTHDAYS_EXPLAIN' => 'If disabled the birthday listing is no longer displayed. To let this setting take effect the birthday feature need to be enabled too.',
'YES_JUMPBOX' => 'Enable display of jumpbox',
'YES_MODERATORS' => 'Enable display of moderators',
'YES_ONLINE' => 'Enable online user listings',
@@ -389,7 +392,7 @@ $lang = array_merge($lang, array(
'EMAIL_FUNCTION_NAME' => 'E-mail function name',
'EMAIL_FUNCTION_NAME_EXPLAIN' => 'The e-mail function used to send mails through PHP.',
'EMAIL_PACKAGE_SIZE' => 'E-mail package size',
'EMAIL_PACKAGE_SIZE_EXPLAIN' => 'This is the number of e-mails sent in one package.',
'EMAIL_PACKAGE_SIZE_EXPLAIN' => 'This is the number of maximum e-mails sent out in one package. This setting is applied to the internal message queue; set this value to 0 if you have problems with non-delivered notification emails.',
'EMAIL_SIG' => 'E-mail signature',
'EMAIL_SIG_EXPLAIN' => 'This text will be attached to all e-mails the board sends.',
'ENABLE_EMAIL' => 'Enable board-wide e-mails',

8
phpBB/language/en/acp/permissions_phpbb.php
View File

@@ -78,11 +78,15 @@ $lang = array_merge($lang, array(
'user_group' => 'Users & Groups',
),
// With defining 'global' here we are able to specify what is printed out if the permission is within the global scope.
'permission_type' => array(
'u_' => 'User permissions',
'a_' => 'Admin permissions',
'm_' => 'Moderator permissions',
'f_' => 'Forum permissions',
'global' => array(
'm_' => 'Global moderator permissions',
),
),
));
@@ -175,8 +179,8 @@ $lang = array_merge($lang, array(
'acl_m_merge' => array('lang' => 'Can merge topics', 'cat' => 'topic_actions'),
'acl_m_info' => array('lang' => 'Can view post details', 'cat' => 'misc'),
'acl_m_warn' => array('lang' => 'Can issue warnings', 'cat' => 'misc'), // This moderator setting is only global (and not local)
'acl_m_ban' => array('lang' => 'Can manage bans', 'cat' => 'misc'), // This moderator setting is only global (and not local)
'acl_m_warn' => array('lang' => 'Can issue warnings<br /><em>This setting is only assigned globally. It is not forum based.</em>', 'cat' => 'misc'), // This moderator setting is only global (and not local)
'acl_m_ban' => array('lang' => 'Can manage bans<br /><em>This setting is only assigned globally. It is not forum based.</em>', 'cat' => 'misc'), // This moderator setting is only global (and not local)
));
// Admin Permissions

8
phpBB/language/en/acp/posting.php
View File

@@ -56,12 +56,12 @@ $lang = array_merge($lang, array(
'EXAMPLES' => 'Examples:',
'HTML_REPLACEMENT' => 'HTML replacement',
'HTML_REPLACEMENT_EXAMPLE' => '&lt;span style="background-color:{COLOR};"&gt;{TEXT}&lt;/span&gt;<br /><br />&lt;span style="font-family:{TEXT1};"&gt;{TEXT2}&lt;/span&gt;',
'HTML_REPLACEMENT_EXAMPLE' => '&lt;span style="background-color: {COLOR};"&gt;{TEXT}&lt;/span&gt;<br /><br />&lt;span style="font-family: {TEXT1};"&gt;{TEXT2}&lt;/span&gt;',
'HTML_REPLACEMENT_EXPLAIN' => 'Here you define the default HTML replacement. Do not forget to put back tokens you used above!',
'TOKEN' => 'Token',
'TOKENS' => 'Tokens',
'TOKENS_EXPLAIN' => 'Tokens are placeholders for user input. The input will be validated only if it matches the corresponding definition. If needed, you can number them by adding a number as the last character between the braces, e.g. {USERNAME1}, {USERNAME2}.<br /><br />In addition to these tokens you can use any language string present in your language/ directory like this: {L_<em>&lt;STRINGNAME&gt;</em>} where <em>&lt;STRINGNAME&gt;</em> is the name of the translated string you want to add. For example, {L_WROTE} will be displayed as &quot;wrote&quot; or its translation according to user’s locale.',
'TOKENS_EXPLAIN' => 'Tokens are placeholders for user input. The input will be validated only if it matches the corresponding definition. If needed, you can number them by adding a number as the last character between the braces, e.g. {TEXT1}, {TEXT2}.<br /><br />Within the HTML replacement you can also use any language string present in your language/ directory like this: {L_<em>&lt;STRINGNAME&gt;</em>} where <em>&lt;STRINGNAME&gt;</em> is the name of the translated string you want to add. For example, {L_WROTE} will be displayed as &quot;wrote&quot; or its translation according to user’s locale.<br /><br /><strong>Please note that only tokens listed below are able to be used within custom BBCodes.</strong>',
'TOKEN_DEFINITION' => 'What can it be?',
'TOO_MANY_BBCODES' => 'You cannot create any more BBCodes. Please remove one or more BBCodes then try again.',
@@ -69,7 +69,7 @@ $lang = array_merge($lang, array(
'TEXT' => 'Any text, including foreign characters, numbers, etc…',
'NUMBER' => 'Any series of digits',
'EMAIL' => 'A valid e-mail address',
'URL' => 'A valid URL using any protocol (http, ftp, etc… cannot be used for javascript exploits). If none is given, "http://" is prefixed to the string.',
'URL' => 'A valid URL using any protocol (http, ftp, etc… cannot be used for javascript exploits). If none is given, &quot;http://&quot; is prefixed to the string.',
'LOCAL_URL' => 'A local URL. The URL must be relative to the topic page and cannot contain a server name or protocol.',
'COLOR' => 'A HTML colour, can be either in the numeric form <samp>#FF1234</samp> or a <a href="http://www.w3.org/TR/CSS21/syndata.html#value-def-color">CSS colour keyword</a> such as <samp>fuchsia</samp> or <samp>InactiveBorder</samp>'
)
@@ -162,7 +162,7 @@ $lang = array_merge($lang, array(
// Word censors
$lang = array_merge($lang, array(
'ACP_WORDS_EXPLAIN' => 'From this control panel you can add, edit, and remove words that will be automatically censored on your forums. In addition people will not be allowed to register with usernames containing these words. Wildcards (*) are accepted in the word field, eg. *test* will match detestable, test* would match testing, *test would match detest.',
'ACP_WORDS_EXPLAIN' => 'From this control panel you can add, edit, and remove words that will be automatically censored on your forums. In addition people will not be allowed to register with usernames containing these words. Wildcards (*) are accepted in the word field, e.g. *test* will match detestable, test* would match testing, *test would match detest.',
'ADD_WORD' => 'Add new word',
'EDIT_WORD' => 'Edit word censor',