mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-06 16:56:44 +02:00
Code Issues Releases Wiki Activity

- various corrections related to permissions in the mcp, including [Bug #1994] and [Bug #1924]

Browse Source 
- fixed some quickmod bugs [#1994] and [Bug #1898]
- browse reports/unapproved posts by topic id
- correctly hide approval details
- added return message to mcp_ban [Bug #1851]
- adjusted some links, including [Bug #1855]
- added some missing language variables, including [Bug #1824], [Bug #1841], [Bug #1852] and [Bug #1864]
- always show all options in mcp_topic [Bug #1938]


git-svn-id: file:///svn/phpbb/trunk@5986 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Nils Adermann
2006-05-30 12:24:07 +00:00
parent 74799e168d
commit ea04b3bcbc
20 changed files with 172 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
phpBB/language/en/common.php
View File

@@ -76,6 +76,7 @@ $lang = array_merge($lang, array(
'AVATAR_WRONG_SIZE' => 'The avatar must be at least %1$d pixels wide, %2$d pixels high and at most %3$d pixels wide and %4$d pixels high. The submitted avatar is %5$d pixels wide and %6$d pixels high.',
'BACK_TO_TOP' => 'Top',
'BACK_TO_PREV' => 'Back to previous page',
'BBCODE_GUIDE' => 'BBCode Guide',
'BCC' => 'Bcc',
'BIRTHDAYS' => 'Birthdays',
@@ -154,6 +155,19 @@ $lang = array_merge($lang, array(
'FORUM_RULES_LINK' => 'Please click to view the forum rules',
'FROM' => 'from',
'FTP_FSOCK_HOST' => 'FTP Host',
'FTP_FSOCK_HOST_EXPLAIN' => 'FTP Server used to connect your site',
'FTP_FSOCK_PASSWORD' => 'FTP Password',
'FTP_FSOCK_PASSWORD_EXPLAIN' => 'Password for your FTP Username',
'FTP_FSOCK_PORT' => 'FTP Port',
'FTP_FSOCK_PORT_EXPLAIN' => 'Port used to connect to your server',
'FTP_FSOCK_ROOT_PATH' => 'Path to phpBB',
'FTP_FSOCK_ROOT_PATH_EXPLAIN' => 'Path from the root to your phpBB board',
'FTP_FSOCK_TIMEOUT' => 'FTP Timeout',
'FTP_FSOCK_TIMEOUT_EXPLAIN' => 'The amount of time, in seconds, that the system will wait for a reply from your server',
'FTP_FSOCK_USERNAME' => 'FTP Username',
'FTP_FSOCK_USERNAME_EXPLAIN' => 'Username used to connect to your server',
'FTP_HOST' => 'FTP Host',
'FTP_HOST_EXPLAIN' => 'FTP Server used to connect your site',
'FTP_PASSWORD' => 'FTP Password',
@@ -236,6 +250,7 @@ $lang = array_merge($lang, array(
'LOGIN_FORUM' => 'To view or post in this forum you must enter a password.',
'LOGIN_INFO' => 'In order to login you must be registered. Registering takes only a few seconds but gives you increased capabilies. The board administrator may also grant additional permissions to registered users. Before you login please ensure you are familiar with our terms of use and related policies. Please ensure you read any forum rules as you navigate around the board.',
'LOGIN_VIEWFORUM' => 'The board administrator requires you to be registered and logged in to view this forum.',
'LOGIN_EXPLAIN_EDIT' => 'In order to edit posts in this forum you have to be registered and logged in.',
'LOGOUT' => 'Logout',
'LOGOUT_USER' => 'Logout [ %s ]',
'LOG_ME_IN' => 'Log me on automatically each visit',
@@ -452,6 +467,7 @@ $lang = array_merge($lang, array(
'TOTAL_POSTS' => 'Total posts',
'TOTAL_POSTS_OTHER' => 'Total posts <b>%d</b>',
'TOTAL_POSTS_ZERO' => 'Total posts <b>0</b>',
'TOPIC_REPORTED' => 'This topic has been reported',
'TOTAL_TOPICS_OTHER'=> 'Total topics <b>%d</b>',
'TOTAL_TOPICS_ZERO' => 'Total topics <b>0</b>',
'TOTAL_USERS_OTHER' => 'Total members <b>%d</b>',

3
phpBB/language/en/mcp.php
View File

@@ -200,11 +200,13 @@ $lang = array_merge($lang, array(
'NO_FEEDBACK' => 'No feedback exists for this user',
'NO_FINAL_TOPIC_SELECTED' => 'You have to select a destination topic for merging posts',
'NO_MATCHES_FOUND' => 'No matches found',
'NO_POST' => 'You have to select a post in order to warn the user for a post',
'NO_POST_REPORT' => 'This post was not reported.',
'NO_POST_SELECTED' => 'You must select at least one post to perform this action',
'NO_TOPIC_SELECTED' => 'You must select at least one topic to perform this action',
'OTHER_IPS' => 'Other IP addresses this user has posted from',
'ONLY_TOPIC' => 'Only topic "%s"',
'OTHER_USERS' => 'Users posting from this IP',
'POSTER' => 'Poster',
@@ -286,7 +288,6 @@ $lang = array_merge($lang, array(
'TOPIC_LOCKED_SUCCESS' => 'The selected topic has been locked',
'TOPIC_MOVED_SUCCESS' => 'The selected topic has been moved successfully',
'TOPIC_NOT_EXIST' => 'The topic you selected does not exist',
'TOPIC_REPORTED' => 'This topic has been reported',
'TOPIC_RESYNC_SUCCESS' => 'The selected topic has been resynchronised',
'TOPIC_SPLIT_SUCCESS' => 'The selected topic has been split successfully',
'TOPIC_TIME' => 'Topic time',