aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2006-05-12 20:52:58 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2006-05-12 20:52:58 +0000
commita8d99f2228cc042c8410553f5f3ec375148552f5 (patch)
tree11ccbd184cbc222775a08852d633d74ced7b2695 /phpBB/language/en
parent7dd067bf5a532e4c30908cca24449274a4863326 (diff)
downloadforums-a8d99f2228cc042c8410553f5f3ec375148552f5.tar
forums-a8d99f2228cc042c8410553f5f3ec375148552f5.tar.gz
forums-a8d99f2228cc042c8410553f5f3ec375148552f5.tar.bz2
forums-a8d99f2228cc042c8410553f5f3ec375148552f5.tar.xz
forums-a8d99f2228cc042c8410553f5f3ec375148552f5.zip
- introduce new function build_url to easily build a valid url from the user->page object as well as optionally removing certain keys
- changed attachment config to utilize the config build methods - cleaned up posting.php - the submit/delete_post functions are now usable (functions_posting.php) - adjusted header icons (transparency) - a bunch of fixes for mssql - bug fixes git-svn-id: file:///svn/phpbb/trunk@5902 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language/en')
-rw-r--r--phpBB/language/en/acp/attachments.php1
-rw-r--r--phpBB/language/en/acp/board.php1
-rw-r--r--phpBB/language/en/acp/common.php28
-rw-r--r--phpBB/language/en/mcp.php1
-rw-r--r--phpBB/language/en/posting.php1
-rw-r--r--phpBB/language/en/ucp.php1
6 files changed, 21 insertions, 12 deletions
diff --git a/phpBB/language/en/acp/attachments.php b/phpBB/language/en/acp/attachments.php
index bd56a25b83..defb89e77d 100644
--- a/phpBB/language/en/acp/attachments.php
+++ b/phpBB/language/en/acp/attachments.php
@@ -109,6 +109,7 @@ $lang = array_merge($lang, array(
'NO_EXT_GROUP_NAME' => 'No Group Name entered',
'NO_EXT_GROUP_SPECIFIED' => 'No Extension Group specified',
'NO_IMAGE' => 'No Image',
+ 'NO_THUMBNAIL_SUPPORT' => 'Thumbnail support has been disabled because there is no supported GD library available and the imagemagick executable could not be found.',
'NO_UPLOAD_DIR' => 'The upload directory you specified does not exist.',
'NO_WRITE_UPLOAD' => 'The upload directory you specified cannot be written to. Please alter the permissions to allow the webserver to write to it.',
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 99fbd0c28b..186b531dca 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -375,6 +375,7 @@ $lang = array_merge($lang, array(
'ALLOW_NO_CENSORS_EXPLAIN' => 'User can disable word censoring.',
'ALLOW_BOOKMARKS' => 'Allow bookmarking topics',
'ALLOW_BOOKMARKS_EXPLAIN' => 'User is able to store personal bookmarks',
+
));
?> \ No newline at end of file
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 83bd7ceaa2..1f0aed9597 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -384,18 +384,22 @@ $lang = array_merge($lang, array(
'LOG_CLEAR_USER' => '<b>Cleared user log</b><br />&#187; %s',
'LOG_CLEAR_USERS' => '<b>Cleared user logs</b>',
- 'LOG_CONFIG_ATTACH' => '<b>Altered attachment settings</b>',
- 'LOG_CONFIG_AUTH' => '<b>Altered authentication settings</b>',
- 'LOG_CONFIG_AVATAR' => '<b>Altered avatar settings</b>',
- 'LOG_CONFIG_COOKIE' => '<b>Altered cookie settings</b>',
- 'LOG_CONFIG_DEFAULT' => '<b>Altered board defaults</b>',
- 'LOG_CONFIG_EMAIL' => '<b>Altered email settings</b>',
- 'LOG_CONFIG_LOAD' => '<b>Altered load settings</b>',
- 'LOG_CONFIG_MESSAGE' => '<b>Altered private message settings</b>',
- 'LOG_CONFIG_SEARCH' => '<b>Altered search settings</b>',
- 'LOG_CONFIG_SERVER' => '<b>Altered server settings</b>',
- 'LOG_CONFIG_SETTINGS' => '<b>Altered board settings</b>',
- 'LOG_CONFIG_VISUAL' => '<b>Altered visual confirmation settings</b>',
+ 'LOG_CONFIG_ATTACH' => '<b>Altered attachment settings</b>',
+ 'LOG_CONFIG_AUTH' => '<b>Altered authentication settings</b>',
+ 'LOG_CONFIG_AVATAR' => '<b>Altered avatar settings</b>',
+ 'LOG_CONFIG_COOKIE' => '<b>Altered cookie settings</b>',
+ 'LOG_CONFIG_EMAIL' => '<b>Altered email settings</b>',
+ 'LOG_CONFIG_FEATURES' => '<b>Altered board features</b>',
+ 'LOG_CONFIG_LOAD' => '<b>Altered load settings</b>',
+ 'LOG_CONFIG_MESSAGE' => '<b>Altered private message settings</b>',
+ 'LOG_CONFIG_POST' => '<b>Altered post settings</b>',
+ 'LOG_CONFIG_REGISTRATION' => '<b>Altered user registration settings</b>',
+ 'LOG_CONFIG_SEARCH' => '<b>Altered search settings</b>',
+ 'LOG_CONFIG_SECURITY' => '<b>Altered security settings</b>',
+ 'LOG_CONFIG_SERVER' => '<b>Altered server settings</b>',
+ 'LOG_CONFIG_SETTINGS' => '<b>Altered board settings</b>',
+ 'LOG_CONFIG_SIGNATURE' => '<b>Altered signature settings</b>',
+ 'LOG_CONFIG_VISUAL' => '<b>Altered visual confirmation settings</b>',
'LOG_DISALLOW_ADD' => '<b>Added disallowed username</b><br />&#187; %s',
'LOG_DISALLOW_DELETE' => '<b>Deleted disallowed username</b>',
diff --git a/phpBB/language/en/mcp.php b/phpBB/language/en/mcp.php
index 5ab9bacfd5..cbaf75abe6 100644
--- a/phpBB/language/en/mcp.php
+++ b/phpBB/language/en/mcp.php
@@ -130,6 +130,7 @@ $lang = array_merge($lang, array(
'LOG_USER_LOCK' => '<b>User locked own topic</b><br />&#187; %s',
'LOG_USER_MOVE_POSTS_USER' => '<b>Moved all posts to forum "%s"</b>',
'LOG_USER_REACTIVATE_USER' => '<b>Forced user account re-activation</b>',
+ 'LOG_USER_UNLOCK' => '<b>User unlocked own topic</b><br />&#187; %s',
'LOGIN_EXPLAIN_MCP' => 'To moderate this forum you must login.',
'LOGVIEW_VIEWTOPIC' => 'View Topic',
'LOGVIEW_VIEWLOGS' => 'View Topic Log',
diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php
index 692c43a3fe..d17ffebd2a 100644
--- a/phpBB/language/en/posting.php
+++ b/phpBB/language/en/posting.php
@@ -188,6 +188,7 @@ $lang = array_merge($lang, array(
'USER_CANNOT_DELETE' => 'You cannot delete posts in this forum',
'USER_CANNOT_EDIT' => 'You cannot edit posts in this forum',
'USER_CANNOT_REPLY' => 'You cannot reply in this forum',
+ 'USER_CANNOT_FORUM_POST' => 'You are not able to do posting operations on this forum due to the forum type not supporting it.',
'USERNAME_DISALLOWED' => 'The username you entered has been banned.',
'USERNAME_TAKEN' => 'The username you entered is already in use, please select an alternative.',
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 20976a3875..085c478158 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -202,6 +202,7 @@ $lang = array_merge($lang, array(
'HIDE_ONLINE' => 'Hide my online status',
'HOLD_NEW_MESSAGES' => 'Do not accept new messages (New messages will be held back until enough space is available)',
+ 'HOLD_NEW_MESSAGES_SHORT' => 'New messages will be held back',
'IF_FOLDER_FULL' => 'If Folder Full',
'IMPORTANT_NEWS' => 'Important announcements',
generated by cgit v1.2.1 (git 2.21.0) at 2024-11-12 10:16:32 +0000