diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-05-04 12:30:21 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-05-04 12:30:21 +0000 |
| commit | a465b06923af558429b3c7642c52309d61574029 (patch) | |
| tree | b31ac1e61d9db47aa6939b7a55cd0aae303ae459 /phpBB/language/en | |
| parent | f7b51337c55f88f19f8b9406b64e7d03150efa2c (diff) | |
| download | forums-a465b06923af558429b3c7642c52309d61574029.tar forums-a465b06923af558429b3c7642c52309d61574029.tar.gz forums-a465b06923af558429b3c7642c52309d61574029.tar.bz2 forums-a465b06923af558429b3c7642c52309d61574029.tar.xz forums-a465b06923af558429b3c7642c52309d61574029.zip | |
added class for disabled options in ACP
E_USER_ERROR now using language keys if available [related to #10445]
UCP/MCP title tags [#10441]
Check $start parameter in viewforum [#10435]
Check for postable forum for moving user posts within users ACP [#10433]
Show error if admin tries to put forums beneath linked forums [related to #10433]
Correctly catch attachments while moving posts [#10431]
language change in install.html [#10425]
Updated AUTHORS file
git-svn-id: file:///svn/phpbb/trunk@7456 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language/en')
| -rw-r--r-- | phpBB/language/en/acp/forums.php | 6 | ||||
| -rw-r--r-- | phpBB/language/en/common.php | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/phpBB/language/en/acp/forums.php b/phpBB/language/en/acp/forums.php index 566a7743d1..a28ede9a0d 100644 --- a/phpBB/language/en/acp/forums.php +++ b/phpBB/language/en/acp/forums.php @@ -109,8 +109,9 @@ $lang = array_merge($lang, array( 'LIST_INDEX_EXPLAIN' => 'Displays this forum on the index and elsewhere as a link within the legend of its parent-forum.', 'LOCKED' => 'Locked', - 'MOVE_POSTS_TO' => 'Move posts to', - 'MOVE_SUBFORUMS_TO' => 'Move subforums to', + 'MOVE_POSTS_NO_POSTABLE_FORUM' => 'The forum you selected for moving the posts to is not postable. Please select a postable forum.', + 'MOVE_POSTS_TO' => 'Move posts to', + 'MOVE_SUBFORUMS_TO' => 'Move subforums to', 'NO_DESTINATION_FORUM' => 'You have not specified a forum to move content to', 'NO_FORUM_ACTION' => 'No action defined for what happens with the forum content', @@ -119,6 +120,7 @@ $lang = array_merge($lang, array( 'NO_PERMISSION_FORUM_ADD' => 'You do not have the necessary permissions to add forums.', 'NO_PERMISSION_FORUM_DELETE' => 'You do not have the necessary permissions to delete forums.', + 'PARENT_IS_LINK_FORUM' => 'The parent you specified is a forum link. Link forums are not able to hold other forums, please specify a category or forum as the parent forum.', 'PARENT_NOT_EXIST' => 'Parent does not exist.', 'PRUNE_ANNOUNCEMENTS' => 'Prune announcements', 'PRUNE_STICKY' => 'Prune stickies', diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 1e16b8cea1..a79853affc 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -214,6 +214,7 @@ $lang = array_merge($lang, array( 'FTP_USERNAME' => 'FTP username', 'FTP_USERNAME_EXPLAIN' => 'Username used to connect to your server', + 'GENERAL_ERROR' => 'General Error', 'GO' => 'Go', 'GOTO_PAGE' => 'Go to page', 'GROUP' => 'Group', @@ -332,13 +333,15 @@ $lang = array_merge($lang, array( 'NOT_AUTHORISED' => 'You are not authorised to access this area.', 'NOT_WATCHING_FORUM' => 'You are no longer subscribed to updates on this forum.', 'NOT_WATCHING_TOPIC' => 'You are no longer subscribed to this topic.', + 'NOTIFY_ADMIN' => 'Please notify the board administrator or webmaster', + 'NOTIFY_ADMIN_EMAIL' => 'Please notify the board administrator or webmaster: <a href="mailto:%1$s">%1$s</a>', 'NO_ACCESS_ATTACHMENT' => 'You are not allowed to access this file.', 'NO_ACTION' => 'No action specified.', 'NO_ADMINISTRATORS' => 'No administrators assigned at this board.', 'NO_AUTH_ADMIN' => 'Access to the Administration Control Panel is not allowed as you do not have administrative permissions.', 'NO_AUTH_ADMIN_USER_DIFFER' => 'You are not able to re-authenticate as a different user.', 'NO_AUTH_OPERATION' => 'You do not have the necessary permissions to complete this operation.', - 'NO_CONNECT_TO_SMTP_HOST' => 'Could not connect to smtp host : %s : %s', + 'NO_CONNECT_TO_SMTP_HOST' => 'Could not connect to smtp host : %1$s : %2$s', 'NO_BIRTHDAYS' => 'No birthdays today', 'NO_EMAIL_MESSAGE' => 'E-mail message was blank', 'NO_EMAIL_RESPONSE_CODE' => 'Could not get mail server response codes', |