aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en/acp
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2005-12-12 23:17:30 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2005-12-12 23:17:30 +0000
commite4defede57bcde636ee7afb59e0e9a385f7f4a13 (patch)
tree0ca637e6d650147cd257f35062ea3c47c7be2326 /phpBB/language/en/acp
parentc12fd5d434c9a3cda6bedb2d450243b278cd5dcb (diff)
downloadforums-e4defede57bcde636ee7afb59e0e9a385f7f4a13.tar
forums-e4defede57bcde636ee7afb59e0e9a385f7f4a13.tar.gz
forums-e4defede57bcde636ee7afb59e0e9a385f7f4a13.tar.bz2
forums-e4defede57bcde636ee7afb59e0e9a385f7f4a13.tar.xz
forums-e4defede57bcde636ee7afb59e0e9a385f7f4a13.zip
- forum administration (now working and modified for easier handling the different forum types [UI])
- Changed += for arrays into array_merge. We do not want to append, we want to merge. ;) git-svn-id: file:///svn/phpbb/trunk@5330 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language/en/acp')
-rw-r--r--phpBB/language/en/acp/attachments.php5
-rw-r--r--phpBB/language/en/acp/ban.php4
-rw-r--r--phpBB/language/en/acp/board.php44
-rw-r--r--phpBB/language/en/acp/bots.php4
-rw-r--r--phpBB/language/en/acp/common.php37
-rw-r--r--phpBB/language/en/acp/email.php4
-rw-r--r--phpBB/language/en/acp/forums.php150
-rw-r--r--phpBB/language/en/acp/groups.php6
-rw-r--r--phpBB/language/en/acp/language.php4
-rw-r--r--phpBB/language/en/acp/modules.php4
-rw-r--r--phpBB/language/en/acp/posting.php20
-rw-r--r--phpBB/language/en/acp/profile.php4
-rw-r--r--phpBB/language/en/acp/prune.php8
13 files changed, 228 insertions, 66 deletions
diff --git a/phpBB/language/en/acp/attachments.php b/phpBB/language/en/acp/attachments.php
index a96588172d..6f8521a7e6 100644
--- a/phpBB/language/en/acp/attachments.php
+++ b/phpBB/language/en/acp/attachments.php
@@ -28,7 +28,7 @@ if (empty($lang) || !is_array($lang))
// equally where a string contains only two placeholders which are used to wrap text
// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
-$lang += array(
+$lang = array_merge($lang, array(
'ACP_ATTACHMENT_SETTINGS_EXPLAIN' => 'Here you can configure the Main Settings for Attachments and the associated Special Categories.',
'ACP_EXTENSION_GROUPS_EXPLAIN' => 'Here you can add, delete and modify your Extension Groups, you can disable Extension Groups, assign a special Category to them, change the download mechanism and you can define an Upload Icon which will be displayed in front of an Attachment belonging to the Group.',
'ACP_MANAGE_EXTENSIONS_EXPLAIN' => 'Here you can manage your allowed extensions. To activate your Extensions, please refer to the extension groups management panel. We strongly recommend not to allow scripting extensions (such as php, php3, php4, phtml, pl, cgi, asp, aspx...)',
@@ -139,7 +139,6 @@ $lang += array(
'UPLOAD_DIR_EXPLAIN' => 'Storage Path for Attachments.',
'UPLOAD_ICON' => 'Upload Icon',
'UPLOAD_NOT_DIR' => 'The upload location you specified does not appear to be a directory.',
-
-);
+));
?> \ No newline at end of file
diff --git a/phpBB/language/en/acp/ban.php b/phpBB/language/en/acp/ban.php
index 63cd0b6d41..0e7a4cd3e1 100644
--- a/phpBB/language/en/acp/ban.php
+++ b/phpBB/language/en/acp/ban.php
@@ -29,7 +29,7 @@ if (empty($lang) || !is_array($lang))
// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
// Banning
-$lang += array(
+$lang = array_merge($lang, array(
'1_HOUR' => '1 Hour',
'30_MINS' => '30 Minutes',
'6_HOURS' => '6 Hours',
@@ -65,6 +65,6 @@ $lang += array(
'USER_NO_BANNED' => 'No banned usernames',
'USER_UNBAN' => 'Un-ban or Un-exclude usernames',
'USER_UNBAN_EXPLAIN' => 'You can unban (or un-exclude) multiple users in one go using the appropriate combination of mouse and keyboard for your computer and browser. Excluded users have a grey background.',
-);
+));
?> \ No newline at end of file
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 2bfacd798c..6da1066375 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -29,7 +29,7 @@ if (empty($lang) || !is_array($lang))
// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
// Jabber settings
-$lang += array(
+$lang = array_merge($lang, array(
'ACP_JABBER_SETTINGS_EXPLAIN' => 'Here you can enable and control the use Jabber for instant messaging and board notices. Jabber is an opensource protocol and therefore available for use by anyone. Some Jabber servers include gateways or transports which allow you to contact users on other networks. Not all servers offer all transports and changes in protocols can prevent transports from operating. Note that it may take several seconds to update Jabber account details, do not stop the script till completed!',
'JAB_ENABLE' => 'Enable Jabber',
@@ -53,10 +53,10 @@ $lang += array(
'ERR_JAB_REGISTER' => 'An error occured trying to register this account, %s',
'ERR_JAB_PASSCHG' => 'Could not change password',
'ERR_JAB_PASSFAIL' => 'Password update failed, %s',
-);
+));
// Message Settings
-$lang += array(
+$lang = array_merge($lang, array(
'ACP_MESSAGE_SETTINGS_EXPLAIN' => 'Here you can set all default settings for private messaging',
'BOXES_MAX' => 'Max private message folders',
@@ -82,11 +82,11 @@ $lang += array(
'ALLOW_FLASH_PM' => 'Allow use of FLASH BBCode Tag',
'ALLOW_SIG_PM' => 'Allow signature in private messages',
'ALLOW_QUOTE_PM' => 'Allow quotes in private messages',
- 'ENABLE_PM_ICONS' => 'Enable use of topic icons in private messages'
-);
+ 'ENABLE_PM_ICONS' => 'Enable use of topic icons in private messages',
+));
// Cookie settings
-$lang += array(
+$lang = array_merge($lang, array(
'ACP_COOKIE_SETTINGS_EXPLAIN' => 'These details define the data used to send cookies to your users browsers. In most cases the default values for the cookie settings should be sufficient. If you do need to change any do so with care, incorrect settings can prevent users logging in.',
'COOKIE_DOMAIN' => 'Cookie domain',
@@ -94,10 +94,10 @@ $lang += array(
'COOKIE_PATH' => 'Cookie path',
'COOKIE_SECURE' => 'Cookie secure',
'COOKIE_SECURE_EXPLAIN' => 'If your server is running via SSL set this to enabled else leave as disabled',
-);
+));
// Avatar settings
-$lang += array(
+$lang = array_merge($lang, array(
'ACP_AVATAR_SETTINGS_EXPLAIN' => 'Avatars are generally small, unique images a user can associate with themselves. Depending on the style they are usually displayed below the username when viewing topics. Here you can determine how users can define their avatars. Please note that in order to upload avatars you need to have created the directory you name below and ensure it can be written to by the web server. Please also note that filesize limits are only imposed on uploaded avatars, they do not apply to remotely linked images.',
'ALLOW_LOCAL' => 'Enable gallery avatars',
'ALLOW_REMOTE' => 'Enable remote avatars',
@@ -113,10 +113,10 @@ $lang += array(
'AVATAR_STORAGE_PATH_EXPLAIN' => 'Path under your phpBB root dir, e.g. images/avatars/upload',
'AVATAR_GALLERY_PATH' => 'Avatar Gallery Path',
'AVATAR_GALLERY_PATH_EXPLAIN' => 'Path under your phpBB root dir for pre-loaded images, e.g. images/avatars/gallery',
-);
+));
// Server settings
-$lang += array(
+$lang = array_merge($lang, array(
'ACP_SERVER_SETTINGS_EXPLAIN' => 'Here you define server and domain dependant settings. Please ensure the data you enter is accurate, errors will result in emails containing incorrect information. When entering the domain name remember it does include http:// or other protocol term. Only alter the port number if you know your server uses a different value, port 80 is correct in most cases.',
'PATH_SETTINGS' => 'Path Settings',
'SERVER_NAME' => 'Domain Name',
@@ -141,10 +141,10 @@ $lang += array(
'UPLOAD_ICONS_PATH_EXPLAIN' => 'Path under your phpBB root dir, e.g. images/upload_icons',
'RANKS_PATH' => 'Rank image storage path',
'RANKS_PATH_EXPLAIN' => 'Path under your phpBB root dir, e.g. images/ranks',
-);
+));
// Load settings
-$lang += array(
+$lang = array_merge($lang, array(
'ACP_LOAD_SETTINGS_EXPLAIN' => 'Here you can enable and disable certain board functions to reduce the amount of processing required. On most servers there is no need to disable any functions. However on certain systems or in shared hosting environments it may be beneficial to disable capabilities you do not really need. You can also specify limits for system load and active sessions beyond which the board will go offline.',
'LIMIT_LOAD' => 'Limit system load',
'LIMIT_LOAD_EXPLAIN' => 'If the 1 minute system load exceeds this value the board will go offline, 1.0 equals ~100% utilisation of one processor. This only functions on UNIX based servers.',
@@ -175,10 +175,10 @@ $lang += array(
'YES_SEARCH_PHRASE_EXPLAIN' => 'Searching for phrases requires additional processing.',
'RECOMPILE_TEMPLATES' => 'Recompile stale templates',
'RECOMPILE_TEMPLATES_EXPLAIN'=> 'Check for updated template files on filesystem and recompile.',
-);
+));
// Email settings
-$lang += array(
+$lang = array_merge($lang, array(
'ACP_EMAIL_SETTINGS_EXPLAIN' => 'This information is used when the board sends emails to your users. Please ensure the email address you specify is valid, any bounced or undeliverable messages will likely be sent to that address. If your host does not provide a native (PHP based) email service you can instead send messages directly using SMTP. This requires the address of an appropriate server (ask your provider if necessary), do not specify any old name here! If the server requires authentication (and only if it does) enter the necessary username and password. Please note only basic authentication is offered, different authentication implementations are not currently supported.',
'ENABLE_EMAIL' => 'Enable board-wide emails',
'ENABLE_EMAIL_EXPLAIN' => 'If this is set to disabled no emails will be sent by the board at all.',
@@ -214,10 +214,10 @@ $lang += array(
'SMTP_USERNAME_EXPLAIN' => 'Only enter a username if your smtp server requires it.',
'SMTP_PASSWORD' => 'SMTP Password',
'SMTP_PASSWORD_EXPLAIN' => 'Only enter a password if your smtp server requires it.',
-);
+));
// Board settings
-$lang += array(
+$lang = array_merge($lang, array(
'ACP_BOARD_SETTINGS_EXPLAIN' => 'Here you can determine the basic operation of your board, from the site name through user registration to private messaging.',
'SITE_NAME' => 'Site name',
'SITE_DESC' => 'Site description',
@@ -297,10 +297,10 @@ $lang += array(
'COPPA' => 'Coppa',
'REGISTRATION' => 'User Registration',
'POSTING' => 'Posting',
-);
+));
// Auth settings
-$lang += array(
+$lang = array_merge($lang, array(
'ACP_AUTH_SETTINGS_EXPLAIN' => 'phpBB2 supports authentication plug-ins, or modules. These allow you determine how users are authenticated when they log into the board. By default three plug-ins are provided; DB, LDAP and Apache. Not all methods require additional information so only fill out fields if they are relevant to the selected method.',
'AUTH_METHOD' => 'Select an authentication method',
'LDAP_SERVER' => 'LDAP server name',
@@ -309,10 +309,10 @@ $lang += array(
'LDAP_DN_EXPLAIN' => 'This is the Distinguished Name, locating the user information, e.g. o=My Company,c=US',
'LDAP_UID' => 'LDAP uid',
'LDAP_UID_EXPLAIN' => 'This is the key under which to search for a given login identity, e.g. uid, sn, etc.',
-);
+));
// Board defaults
-$lang += array(
+$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.',
'DEFAULT_STYLE' => 'Default Style',
'OVERRIDE_STYLE' => 'Override user style',
@@ -341,7 +341,7 @@ $lang += array(
'ALLOW_NO_CENSORS' => 'Allow Disable of Censors',
'ALLOW_NO_CENSORS_EXPLAIN' => 'User can disable word censoring.',
'ALLOW_BOOKMARKS' => 'Allow bookmarking topics',
- 'ALLOW_BOOKMARKS_EXPLAIN' => 'User is able to store personal bookmarks'
-);
+ 'ALLOW_BOOKMARKS_EXPLAIN' => 'User is able to store personal bookmarks',
+));
?> \ No newline at end of file
diff --git a/phpBB/language/en/acp/bots.php b/phpBB/language/en/acp/bots.php
index 720fda8341..a4e81645fd 100644
--- a/phpBB/language/en/acp/bots.php
+++ b/phpBB/language/en/acp/bots.php
@@ -29,7 +29,7 @@ if (empty($lang) || !is_array($lang))
// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
// Bot settings
-$lang += array(
+$lang = array_merge($lang, array(
'BOTS' => 'Manage Bots',
'BOTS_EXPLAIN' => 'Bots or crawlers are automated agents most commonly used by search engines to update their databases. Since they rarely make proper use of sessions they can distort visitor counts, increase load and sometimes fail to index sites correctly. Here you can define a special type of user to overcome these problems.',
'BOT_ACTIVATE' => 'Activate',
@@ -60,6 +60,6 @@ $lang += array(
'ERR_BOT_NO_MATCHES' => 'You must supply at least one of an agent or IP for this bot match.',
'NO_BOT' => 'Found no bot with the specified ID',
-);
+));
?> \ No newline at end of file
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index fdd3402ca0..7ab24c218d 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -29,7 +29,7 @@ if (empty($lang) || !is_array($lang))
// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
// Common
-$lang += array(
+$lang = array_merge($lang, array(
'ACP_ADMIN_LOGS' => 'Admin Log',
'ACP_ATTACHMENTS' => 'Attachments',
'ACP_ATTACHMENT_SETTINGS' => 'Attachment Settings',
@@ -65,6 +65,7 @@ $lang += array(
'ACP_EMAIL_SETTINGS' => 'Email Settings',
'ACP_EXTENSION_GROUPS' => 'Manage Extension Groups',
'ACP_FORUM_LOGS' => 'Forum Logs',
+ 'ACP_FORUM_MANAGEMENT' => 'Forum Management',
'ACP_GENERAL_CONFIGURATION' => 'General Configuration',
'ACP_GENERAL_TASKS' => 'General Tasks',
'ACP_GROUPS' => 'Groups',
@@ -80,6 +81,7 @@ $lang += array(
'ACP_LOGGING' => 'Logging',
'ACP_MAIN' => 'Admin index',
'ACP_MANAGE_EXTENSIONS' => 'Manage Extensions',
+ 'ACP_MANAGE_FORUMS' => 'Manage Forums',
'ACP_MANAGE_RANKS' => 'Manage Ranks',
'ACP_MASS_EMAIL' => 'Mass Email',
'ACP_MESSAGES' => 'Messages',
@@ -161,15 +163,15 @@ $lang += array(
'USER_CONTROL_PANEL' => 'User Control Panel',
'WARNING' => 'Warning',
-);
+));
// PHP info
-$lang += array(
+$lang = array_merge($lang, array(
'ACP_PHP_INFO_EXPLAIN' => 'This page lists information on the version of PHP installed on this server. It includes details of loaded modules, available variables and default settings. This information may be useful when diagnosing problems. Please be aware that some hosting companies will limit what information is displayed here for security reasons. You are advised to not give out any details on this page except when asked by support or other Team Member on the support forums.',
-);
+));
// Logs
-$lang += array(
+$lang = array_merge($lang, array(
'ACP_ADMIN_LOGS_EXPLAIN' => 'This lists all the actions carried out by board administrators. You can sort by username, date, IP or action. If you have appropriate permissions you can also clear individual operations or the log as a whole.',
'ACP_CRITICAL_LOGS_EXPLAIN' => 'This lists the actions carried out by the board itself. These log provides you with information you are able to use for solving specific problems, for example non-delivery of emails. You can sort by username, date, IP or action. If you have appropriate permissions you can also clear individual operations or the log as a whole.',
'ACP_MOD_LOGS_EXPLAIN' => 'This lists the actions carried out by board moderators, select a forum from the drop down list. You can sort by username, date, IP or action. If you have appropriate permissions you can also clear individual operations or the log as a whole.',
@@ -182,10 +184,10 @@ $lang += array(
'SORT_IP' => 'IP address',
'SORT_DATE' => 'Date',
'SORT_ACTION' => 'Log action',
-);
+));
// Index page
-$lang += array(
+$lang = array_merge($lang, array(
'ADMIN_INTRO' => 'Thank you for choosing phpBB as your forum solution. This screen will give you a quick overview of all the various statistics of your board. The links on the left hand side of this screen allow you to control every aspect of your forum experience. Each page will have instructions on how to use the tools.',
'ADMIN_LOG' => 'Logged administrator actions',
'ADMIN_LOG_INDEX_EXPLAIN' => 'This gives an overview of the last five actions carried out by board administrators. A full copy of the log can be viewed from the appropriate menu item to the left.',
@@ -227,10 +229,10 @@ $lang += array(
'VALUE' => 'Value',
'WELCOME_PHPBB' => 'Welcome to phpBB',
-);
+));
// Log
-$lang += array(
+$lang = array_merge($lang, array(
'LOG_ATTACH_EXT_ADD' => '<b>Added or edited attachment extension</b><br />&#187; %s',
'LOG_ATTACH_EXT_DEL' => '<b>Removed attachment extension</b><br />&#187; %s',
'LOG_ATTACH_EXT_UPDATE' => '<b>Updated attachment extension</b><br />&#187; %s',
@@ -283,6 +285,20 @@ $lang += array(
'LOG_ERROR_JABBER' => '<b>Jabber Error</b><br />&#187; %s',
'LOG_ERROR_EMAIL' => '<b>Email Error</b><br />&#187; %s',
+ 'LOG_FORUM_ADD' => '<b>Created new forum</b><br />&#187; %s',
+ 'LOG_FORUM_EDIT' => '<b>Edited forum details</b><br />&#187; %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 />&#187; %s',
+ 'LOG_FORUM_DEL_POSTS' => '<b>Deleted forum and its messages</b><br />&#187; %s',
+ 'LOG_FORUM_DEL_FORUMS' => '<b>Deleted forum and its subforums</b><br />&#187; %s',
+ 'LOG_FORUM_DEL_POSTS_MOVE_FORUMS' => '<b>Deleted forum and its messages, moved subforums</b> to %s<br />&#187; %s',
+ 'LOG_FORUM_DEL_MOVE_POSTS_FORUMS' => '<b>Deleted forum and its subforums, moved messages</b> to %s<br />&#187; %s',
+ 'LOG_FORUM_DEL_MOVE_POSTS' => '<b>Deleted forum and moved posts </b> to %s<br />&#187; %s',
+ 'LOG_FORUM_DEL_MOVE_FORUMS' => '<b>Deleted forum and moved subforums</b> to %s<br />&#187; %s',
+ 'LOG_FORUM_DEL_POSTS_FORUMS' => '<b>Deleted forum, its messages and subforums</b><br />&#187; %s',
+ 'LOG_FORUM_DEL_MOVE_POSTS_MOVE_FORUMS' => '<b>Deleted forum, moved posts</b> to %s <b>and subforums</b> to %s<br />&#187; %s',
+
'LOG_GROUP_CREATED' => '<b>New usergroup created</b><br />&#187; %s',
'LOG_GROUP_DEFAULTS' => '<b>Group made default for members</b><br />&#187; %s',
'LOG_GROUP_DELETE' => '<b>Usergroup deleted</b><br />&#187; %s',
@@ -336,7 +352,6 @@ $lang += array(
'LOG_WORD_ADD' => '<b>Added word censor</b><br />&#187; %s',
'LOG_WORD_DELETE' => '<b>Deleted word censor</b><br />&#187; %s',
'LOG_WORD_EDIT' => '<b>Edited word censor</b><br />&#187; %s',
-
-);
+));
?> \ No newline at end of file
diff --git a/phpBB/language/en/acp/email.php b/phpBB/language/en/acp/email.php
index 5c734140b1..709d51b7e9 100644
--- a/phpBB/language/en/acp/email.php
+++ b/phpBB/language/en/acp/email.php
@@ -29,7 +29,7 @@ if (empty($lang) || !is_array($lang))
// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
// Bot settings
-$lang += array(
+$lang = array_merge($lang, array(
'ACP_MASS_EMAIL_EXPLAIN' => 'Here you can email a message to either all of your users, or all users of a specific group. To do this, an email will be sent out to the administrative email address supplied, with a blind carbon copy sent to all recipients. If you are emailing a large group of people please be patient after submitting and do not stop the page halfway through. It is normal for a mass emailing to take a long time, you will be notified when the script has completed',
'ALL_USERS' => 'All Users',
@@ -54,6 +54,6 @@ $lang += array(
'NO_EMAIL_MESSAGE' => 'You must enter a message.',
'NO_EMAIL_SUBJECT' => 'You must specify a subject for your message.',
-);
+));
?> \ No newline at end of file
diff --git a/phpBB/language/en/acp/forums.php b/phpBB/language/en/acp/forums.php
new file mode 100644
index 0000000000..c9b619ebce
--- /dev/null
+++ b/phpBB/language/en/acp/forums.php
@@ -0,0 +1,150 @@
+<?php
+/**
+*
+* acp_forums [English]
+*
+* @package language
+* @version $Id$
+* @copyright (c) 2005 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+/**
+* DO NOT CHANGE
+*/
+if (empty($lang) || !is_array($lang))
+{
+ $lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+
+// Forum Admin
+$lang = array_merge($lang, array(
+ 'AUTO_PRUNE_DAYS' => 'Auto-prune Post Age',
+ 'AUTO_PRUNE_DAYS_EXPLAIN' => 'Number of days since last post after which topic is removed.',
+ 'AUTO_PRUNE_FREQ' => 'Auto-prune Frequency',
+ 'AUTO_PRUNE_FREQ_EXPLAIN' => 'Time in days between pruning events.',
+ 'AUTO_PRUNE_VIEWED' => 'Auto-prune Post Viewed Age',
+ 'AUTO_PRUNE_VIEWED_EXPLAIN' => 'Number of days since topic was viewed after which topic is removed.',
+
+ 'CREATE_FORUM' => 'Create new forum',
+
+ 'DECIDE_MOVE_DELETE_CONTENT' => 'Delete content or move to forum',
+ 'DEFAULT_STYLE' => 'Default Style',
+ 'DELETE_ALL_POSTS' => 'Delete posts',
+ 'DELETE_SUBFORUMS' => 'Delete subforums and posts',
+ 'DISPLAY_ACTIVE_TOPICS' => 'Enable active topics',
+ 'DISPLAY_ACTIVE_TOPICS_EXPLAIN' => 'If set to yes active topics in selected subforums will be displayed under this category.',
+
+ 'EDIT_FORUM' => 'Edit forum',
+ 'ENABLE_INDEXING' => 'Enable search indexing',
+ 'ENABLE_INDEXING_EXPLAIN' => 'If set to yes posts made to this forum will be indexed for searching.',
+ 'ENABLE_RECENT' => 'Display active topics',
+ 'ENABLE_RECENT_EXPLAIN' => 'If set to yes topics made to this forum will be shown in the active topics list.',
+ 'ENABLE_TOPIC_ICONS' => 'Enable Topic Icons',
+
+ 'FOLDER' => 'Folder',
+ 'FORUM_ADMIN' => 'Forum Administration',
+ 'FORUM_ADMIN_EXPLAIN' => 'In phpBB3 there are no categories, everything is forum based. Each forum can have an unlimited number of sub-forums and you can determine whether each may be posted to or not (i.e. whether it acts like an old category). Here you can add, edit, delete, lock, unlock individual forums as well as set certain additional controls. If your posts and topics have got out of sync you can also resynchronise a forum.',
+ 'FORUM_AUTO_PRUNE' => 'Enable Auto-Pruning',
+ 'FORUM_AUTO_PRUNE_EXPLAIN' => 'Prunes the forum of topics, set the frequency/age parameters below.',
+ 'FORUM_CREATED' => 'Forum created successfully.',
+ 'FORUM_DATA_NEGATIVE' => 'Pruning parameters cannot be negative.',
+ 'FORUM_DELETE' => 'Delete Forum',
+ 'FORUM_DELETE_EXPLAIN' => 'The form below will allow you to delete a forum and decide where you want to put all topics (or forums) it contained.',
+ 'FORUM_DELETED' => 'Forum successfully deleted',
+ 'FORUM_DESC' => 'Description',
+ 'FORUM_DESC_EXPLAIN' => 'Any markup entered here will displayed as is.',
+ 'FORUM_EDIT_EXPLAIN' => 'The form below will allow you to customise this forum. Please note that moderation and post count controls are set via forum permissions for each user or usergroup.',
+ 'FORUM_IMAGE' => 'Forum Image',
+ 'FORUM_IMAGE_EXPLAIN' => 'Location, relative to the phpBB root directory, of an image to associate with this forum.',
+ 'FORUM_LINK' => 'Forum Link',
+ 'FORUM_LINK_EXPLAIN' => 'Full URL to location clicking this forum will take the user.',
+ 'FORUM_LINK_TRACK' => 'Track Link Redirects',
+ 'FORUM_LINK_TRACK_EXPLAIN' => 'Records the number of times a forum link was clicked.',
+ 'FORUM_NAME' => 'Forum Name',
+ 'FORUM_NAME_EMPTY' => 'You must enter a name for this forum.',
+ 'FORUM_PARENT' => 'Parent Forum',
+ 'FORUM_PASSWORD' => 'Forum Password',
+ 'FORUM_PASSWORD_CONFIRM' => 'Confirm Forum Password',
+ 'FORUM_PASSWORD_CONFIRM_EXPLAIN' => 'Only needs to be set if a forum password is entered.',
+ 'FORUM_PASSWORD_EXPLAIN' => 'Defines a password for this forum, use the permission system in preference.',
+ 'FORUM_PASSWORD_MISMATCH' => 'The passwords you entered did not match.',
+ 'FORUM_RESYNCED' => 'Forum "%s" successfully resynced',
+ 'FORUM_RULES' => 'Forum Rules',
+ 'FORUM_RULES_EXPLAIN' => 'Forum Rules are displayed at any page within the given forum.',
+ 'FORUM_RULES_LINK' => 'Link to Forum Rules',
+ 'FORUM_RULES_LINK_EXPLAIN' => 'You are able to enter the URL of the page/post containing your forum rules here. This setting will override the Forum Rules text you specified.',
+ 'FORUM_RULES_PREVIEW' => 'Forum Rules preview',
+ 'FORUM_SETTINGS' => 'Forum Settings',
+ 'FORUM_STATUS' => 'Forum Status',
+ 'FORUM_STYLE' => 'Forum Style',
+ 'FORUM_TOPICS_PAGE' => 'Topics Per Page',
+ 'FORUM_TOPICS_PAGE_EXPLAIN' => 'If non-zero this value will override the default topics per page setting.',
+ 'FORUM_TYPE' => 'Forum Type',
+ 'FORUM_UPDATED' => 'Forum informations updated successfully.',
+
+ 'GENERAL_FORUM_SETTINGS' => 'General Forum Settings',
+
+ 'LINK' => 'Link',
+ 'LIST_INDEX' => 'List Forum On Index',
+ 'LIST_INDEX_EXPLAIN' => 'Displays a link to this forum under the root parent forum on the index.',
+ 'LOCKED' => 'Locked',
+
+ 'MOVE_POSTS_TO' => 'Move posts',
+ 'MOVE_SUBFORUMS_TO' => 'Move subforums',
+
+ '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',
+ 'NO_PARENT' => 'No Parent',
+ 'NO_PERMISSION_FORUM_ADD' => 'You do not have the neccessary permissions to delete forums',
+ 'NO_PERMISSION_FORUM_DELETE' => 'You do not have the neccessary permissions to add forums',
+
+ 'PARENT_NOT_EXIST' => 'Parent does not exist',
+ 'PARSE_BBCODE' => 'Parse BBCode',
+ 'PARSE_SMILIES' => 'Parse Smilies',
+ 'PARSE_URLS' => 'Parse Links',
+ 'PRUNE_ANNOUNCEMENTS' => 'Prune Announcements',
+ 'PRUNE_STICKY' => 'Prune Stickies',
+ 'PRUNE_OLD_POLLS' => 'Prune Old Polls',
+ 'PRUNE_OLD_POLLS_EXPLAIN' => 'Removes topics with polls not voted in for post age days.',
+
+ 'REDIRECT_ACL' => 'Now you are able to %sset permissions%s for this forum.',
+ 'RESYNC' => 'Sync',
+
+ 'SUBFORUM' => 'Subforum',
+
+ 'TYPE_CAT' => 'Category',
+ 'TYPE_FORUM' => 'Forum',
+ 'TYPE_LINK' => 'Link',
+
+ 'UNLOCKED' => 'Unlocked',
+
+/*
+ 'REMOVE' => 'Remove',
+ 'EDIT' => 'Edit',
+ 'MOVE_UP' => 'Move up',
+ 'MOVE_DOWN' => 'Move down',
+ 'UPDATE' => 'Update',
+
+
+ 'ENABLE_NEWS' => 'Set as news forum',
+ 'ENABLE_NEWS_EXPLAIN' => 'If set to yes posts in this forum will be displayed as news items.',
+ 'PRUNE_FINISHED_POLLS' => 'Prune Closed Polls',
+ 'PRUNE_FINISHED_POLLS_EXPLAIN'=> 'Removes topics with polls which have ended.',
+ 'ACTIVE_TOPICS_PAGE' => 'Number of active topics',
+ 'ACTIVE_TOPICS_PAGE_EXPLAIN' => 'If non-zero this value will override the default topics per page setting.',
+*/
+));
+
+?> \ No newline at end of file
diff --git a/phpBB/language/en/acp/groups.php b/phpBB/language/en/acp/groups.php
index 1f0061f092..7035466cb8 100644
--- a/phpBB/language/en/acp/groups.php
+++ b/phpBB/language/en/acp/groups.php
@@ -28,7 +28,7 @@ if (empty($lang) || !is_array($lang))
// equally where a string contains only two placeholders which are used to wrap text
// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
-$lang += array(
+$lang = array_merge($lang, array(
'ACP_GROUPS_MANAGE_EXPLAIN' => 'From this panel you can administer all your usergroups, you can delete, create and edit existing groups. You may choose moderators, toggle open/closed group status and set the group name and description.',
'ADD_USERS' => 'Add Users',
'ADD_USERS_EXPLAIN' => 'Here you can add new users to the group. You may select whether this group becomes the new default for the selected users. Additionally you can define them as group leaders. Please enter each username on a seperate line.',
@@ -104,8 +104,6 @@ $lang += array(
'USER_GROUP_DEFAULT' => 'Set as default group',
'USER_GROUP_DEFAULT_EXPLAIN' => 'Saying yes here will set this group as the default group for the added users',
'USER_GROUP_LEADER' => 'Set as group leader',
-);
-
-// 'FORCE_COLOR' => 'Force update',
+));
?> \ No newline at end of file
diff --git a/phpBB/language/en/acp/language.php b/phpBB/language/en/acp/language.php
index 927aaf5afb..26e1e86e5c 100644
--- a/phpBB/language/en/acp/language.php
+++ b/phpBB/language/en/acp/language.php
@@ -28,7 +28,7 @@ if (empty($lang) || !is_array($lang))
// equally where a string contains only two placeholders which are used to wrap text
// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
-$lang += array(
+$lang = array_merge($lang, array(
'ACP_FILES' => 'Admin Language Files',
'ACP_LANGUAGE_PACKS_EXPLAIN' => 'Here you are able to install/remove language packs',
@@ -81,6 +81,6 @@ $lang += array(
'UNINSTALLED_LANGUAGE_PACKS' => 'Uninstalled language packs',
'WRONG_LANGUAGE_FILE' => 'Selected language file is invalid',
-);
+));
?> \ No newline at end of file
diff --git a/phpBB/language/en/acp/modules.php b/phpBB/language/en/acp/modules.php
index c36dc4ad1d..6ece0a62d6 100644
--- a/phpBB/language/en/acp/modules.php
+++ b/phpBB/language/en/acp/modules.php
@@ -28,7 +28,7 @@ if (empty($lang) || !is_array($lang))
// equally where a string contains only two placeholders which are used to wrap text
// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
-$lang += array(
+$lang = array_merge($lang, array(
'ACP_MODULE_MANAGEMENT_EXPLAIN' => 'Here you are able to manage all kind of modules. Please note that if you place the same module under different categories, the category selected will be the first one found within the tree.',
'ADD_MODULE' => 'Add module',
'ADD_MODULE_CONFIRM' => 'Are you sure you want to add the selected module with the selected mode?',
@@ -70,6 +70,6 @@ $lang += array(
'PARENT_NO_EXIST' => 'Parent does not exist',
'SELECT_MODULE' => 'Select a module',
-);
+));
?> \ No newline at end of file
diff --git a/phpBB/language/en/acp/posting.php b/phpBB/language/en/acp/posting.php
index 4016657198..7d652df0ed 100644
--- a/phpBB/language/en/acp/posting.php
+++ b/phpBB/language/en/acp/posting.php
@@ -30,7 +30,7 @@ if (empty($lang) || !is_array($lang))
// BBCodes
// Note to translators: you can translate everything but what's between { and }
-$lang += array(
+$lang = array_merge($lang, array(
'ACP_BBCODES_EXPLAIN' => 'BBCode is a special implementation of HTML offering greater control over what and how something is displayed. Additionnally, you can save users from typing sometimes very long HTML code by providing them a single BBCode as replacement. From this page you can add, remove and edit custom BBCodes',
'ADD_BBCODE' => 'Add a new BBCode',
@@ -63,10 +63,10 @@ $lang += array(
'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 color, can be either in the numeric form #FF1234 or an english name such as "blue"'
)
-);
+));
// Smilies and topic icons
-$lang += array(
+$lang = array_merge($lang, array(
'ACP_ICONS_EXPLAIN' => 'From this page you can add, remove and edit the icons users may add to their topics or posts. These icons are generally displayed next to topic titles on the forum listing, or the post subjects in topic listings. You can also install and create new packages of icons.',
'ACP_SMILIES_EXPLAIN' => 'Smilies or emoticons are typically small, sometimes animated images used to convey an emotion or feeling. From this page you can add, remove and edit the emoticons users can use in their posts and private messages. You can also install and create new packages of smilies.',
'ADD_SMILIES' => 'Add multiple smilies',
@@ -142,10 +142,10 @@ $lang += array(
'SMILIES_WIDTH' => 'Smiley width',
'WRONG_PAK_TYPE' => 'The specified package does not contain the appropriate data.',
-);
+));
// Word censors
-$lang += array(
+$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.',
'ADD_WORD' => 'Add new word',
@@ -162,10 +162,10 @@ $lang += array(
'WORD_ADDED' => 'The word censor has been successfully added',
'WORD_REMOVED' => 'The selected word censor has been successfully removed',
'WORD_UPDATED' => 'The selected word censor has been successfully updated',
-);
+));
// Ranks
-$lang += array(
+$lang = array_merge($lang, array(
'ACP_RANKS_EXPLAIN' => 'Using this form you can add, edit, view and delete ranks. You can also create custom ranks which can be applied to a user via the user management facility.',
'ADD_RANK' => 'Add new rank',
@@ -183,10 +183,10 @@ $lang += array(
'RANK_SPECIAL' => 'Set as Special Rank',
'RANK_TITLE' => 'Rank Title',
'RANK_UPDATED' => 'The rank was successfully updated.',
-);
+));
// Disallow Usernames
-$lang += array(
+$lang = array_merge($lang, array(
'ACP_DISALLOW_EXPLAIN' => 'Here you can control usernames which will not be allowed to be used. Disallowed usernames are allowed to contain a wildcard character of *. Please note that you will not be allowed to specify any username that has already been registered, you must first delete that name then disallow it',
'ADD_DISALLOW_EXPLAIN' => 'You can disallow a username using the wildcard character * to match any character',
'ADD_DISALLOW_TITLE' => 'Add a disallowed username',
@@ -198,6 +198,6 @@ $lang += array(
'DISALLOW_SUCCESSFUL' => 'The disallowed username has been successfully added',
'NO_DISALLOWED' => 'No Disallowed Usernames',
-);
+));
?> \ No newline at end of file
diff --git a/phpBB/language/en/acp/profile.php b/phpBB/language/en/acp/profile.php
index 67b26e080f..2ca370a731 100644
--- a/phpBB/language/en/acp/profile.php
+++ b/phpBB/language/en/acp/profile.php
@@ -29,7 +29,7 @@ if (empty($lang) || !is_array($lang))
// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
// Custom profile fields
-$lang += array(
+$lang = array_merge($lang, array(
'ADDED_PROFILE_FIELD' => 'Successfully added custom profile field',
'ALPHA_ONLY' => 'Alphanumeric only',
'ALPHA_SPACERS' => 'Alphanumeric and spacers',
@@ -133,6 +133,6 @@ $lang += array(
'UPDATE_PREVIEW' => 'Update Preview',
'USER_FIELD_NAME' => 'Field Name presented to the user',
-);
+));
?> \ No newline at end of file
diff --git a/phpBB/language/en/acp/prune.php b/phpBB/language/en/acp/prune.php
index 38ad6b75c6..ca15403bec 100644
--- a/phpBB/language/en/acp/prune.php
+++ b/phpBB/language/en/acp/prune.php
@@ -29,7 +29,7 @@ if (empty($lang) || !is_array($lang))
// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
// User pruning
-$lang += array(
+$lang = array_merge($lang, array(
'ACP_PRUNE_USERS_EXPLAIN' => 'Here you can delete (or deactivate) users from you board. This can be done in a variety of ways; by post count, last activity, etc. Each of these criteria can be combined, i.e. you can prune users last active before 2002-01-01 with fewer than 10 posts. Alternatively you can enter a list of users directly into the text box, any criteria entered will be ignored. Take care with this facility! Once a user is deleted there is no way back.',
'DEACTIVATE' => 'Deactivate',
@@ -47,10 +47,10 @@ $lang += array(
'USER_DEACTIVATE_SUCCESS' => 'The selected users have been deactivated successfully',
'USER_DELETE_SUCCESS' => 'The selected users have been deleted successfully',
-);
+));
// Forum Pruning
-$lang += array(
+$lang = array_merge($lang, array(
'ACP_PRUNE_FORUMS_EXPLAIN' => 'This will delete any topic which has not been posted to within the number of days you select. If you do not enter a number then all topics will be deleted. It will not remove topics in which polls are still running nor will it remove announcements. You will need to remove these topics manually.',
'FORUM_PRUNE' => 'Forum Prune',
@@ -72,6 +72,6 @@ $lang += array(
'PRUNE_SUCCESS' => 'Pruning of forums was successful',
'TOPICS_PRUNED' => 'Topics pruned',
-);
+));
?> \ No newline at end of file