makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

consistent acp layout regarding backlinks and messages.

Browse source 
git-svn-id: file:///svn/phpbb/trunk@6428 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2006-10-02 15:11:40 +00:00
parent fc76c94ab1
commit cc4a0a2f7a
42 changed files with 325 additions and 294 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
phpBB/adm/style/acp_ban.html
View file

@ -12,19 +12,19 @@
<!-- <!--
var ban_length = new Array(); var ban_length = new Array();
ban_length[-1] = ""; ban_length[-1] = '';
<!-- BEGIN ban_length --> <!-- BEGIN ban_length -->
ban_length['{ban_length.BAN_ID}'] = "{ban_length.A_LENGTH}"; ban_length['{ban_length.BAN_ID}'] = "{ban_length.A_LENGTH}";
<!-- END ban_length --> <!-- END ban_length -->
var ban_reason = new Array(); var ban_reason = new Array();
ban_reason[-1] = ""; ban_reason[-1] = '';
<!-- BEGIN ban_reason --> <!-- BEGIN ban_reason -->
ban_reason['{ban_reason.BAN_ID}'] = "{ban_reason.A_REASON}"; ban_reason['{ban_reason.BAN_ID}'] = "{ban_reason.A_REASON}";
<!-- END ban_reason --> <!-- END ban_reason -->
var ban_give_reason = new Array(); var ban_give_reason = new Array();
ban_give_reason[-1] = ""; ban_give_reason[-1] = '';
<!-- BEGIN ban_give_reason --> <!-- BEGIN ban_give_reason -->
ban_give_reason['{ban_give_reason.BAN_ID}'] = "{ban_give_reason.A_REASON}"; ban_give_reason['{ban_give_reason.BAN_ID}'] = "{ban_give_reason.A_REASON}";
<!-- END ban_give_reason --> <!-- END ban_give_reason -->

12
phpBB/includes/acp/acp_attachments.php
View file

@ -417,12 +417,12 @@ class acp_attachments
if ($action != 'add' && $action != 'edit') if ($action != 'add' && $action != 'edit')
{ {
trigger_error('WRONG_MODE', E_USER_WARNING); trigger_error('NO_MODE', E_USER_ERROR);
} }
if (!$group_id && $action == 'edit') if (!$group_id && $action == 'edit')
{ {
trigger_error('NO_EXT_GROUP_SPECIFIED', E_USER_WARNING); trigger_error($user->lang['NO_EXT_GROUP_SPECIFIED'] . adm_back_link($this->u_action), E_USER_WARNING);
} }
if ($group_id) if ($group_id)
@ -592,7 +592,7 @@ class acp_attachments
if (!$group_id) if (!$group_id)
{ {
trigger_error($user->lang['NO_EXTENSION_GROUP'] . adm_back_link($this->u_action), E_USER_WARNING); trigger_error($user->lang['NO_EXT_GROUP_SPECIFIED'] . adm_back_link($this->u_action), E_USER_WARNING);
} }
$sql = 'SELECT * $sql = 'SELECT *
@ -784,7 +784,7 @@ class acp_attachments
if (!$group_id) if (!$group_id)
{ {
trigger_error($user->lang['NO_EXTENSION_GROUP'] . adm_back_link($this->u_action), E_USER_WARNING); trigger_error($user->lang['NO_EXT_GROUP_SPECIFIED'] . adm_back_link($this->u_action), E_USER_WARNING);
} }
$sql = 'UPDATE ' . EXTENSION_GROUPS_TABLE . ' $sql = 'UPDATE ' . EXTENSION_GROUPS_TABLE . '
@ -1362,7 +1362,7 @@ class acp_attachments
add_log('admin', $log_entry, $ip_list_log); add_log('admin', $log_entry, $ip_list_log);
} }
trigger_error($user->lang['SECURE_DOWNLOAD_UPDATE_SUCCESS']); trigger_error($user->lang['SECURE_DOWNLOAD_UPDATE_SUCCESS'] . adm_back_link($this->u_action));
} }
else if (isset($_POST['unsecuresubmit'])) else if (isset($_POST['unsecuresubmit']))
{ {
@ -1391,7 +1391,7 @@ class acp_attachments
add_log('admin', 'LOG_DOWNLOAD_REMOVE_IP', $l_unip_list); add_log('admin', 'LOG_DOWNLOAD_REMOVE_IP', $l_unip_list);
} }
trigger_error($user->lang['SECURE_DOWNLOAD_UPDATE_SUCCESS']); trigger_error($user->lang['SECURE_DOWNLOAD_UPDATE_SUCCESS'] . adm_back_link($this->u_action));
} }
} }

8
phpBB/includes/acp/acp_bbcodes.php
View file

@ -47,7 +47,7 @@ class acp_bbcodes
if (!$row) if (!$row)
{ {
trigger_error('BBCODE_NOT_EXIST', E_USER_WARNING); trigger_error($user->lang['BBCODE_NOT_EXIST'] . adm_back_link($this->u_action), E_USER_WARNING);
} }
$bbcode_match = $row['bbcode_match']; $bbcode_match = $row['bbcode_match'];
@ -66,7 +66,7 @@ class acp_bbcodes
if (!$row) if (!$row)
{ {
trigger_error('BBCODE_NOT_EXIST', E_USER_WARNING); trigger_error($user->lang['BBCODE_NOT_EXIST'] . adm_back_link($this->u_action), E_USER_WARNING);
} }
// No break here // No break here
@ -129,7 +129,7 @@ class acp_bbcodes
if ($info['test'] === '1' || in_array(strtolower($data['bbcode_tag']), $hard_coded)) if ($info['test'] === '1' || in_array(strtolower($data['bbcode_tag']), $hard_coded))
{ {
trigger_error('BBCODE_INVALID_TAG_NAME', E_USER_WARNING); trigger_error($user->lang['BBCODE_INVALID_TAG_NAME'] . adm_back_link($this->u_action), E_USER_WARNING);
} }
} }
@ -170,7 +170,7 @@ class acp_bbcodes
if ($bbcode_id > 1511) if ($bbcode_id > 1511)
{ {
trigger_error('TOO_MANY_BBCODES', E_USER_WARNING); trigger_error($user->lang['TOO_MANY_BBCODES'] . adm_back_link($this->u_action), E_USER_WARNING);
} }
$sql_ary['bbcode_id'] = (int) $bbcode_id; $sql_ary['bbcode_id'] = (int) $bbcode_id;

4
phpBB/includes/acp/acp_bots.php
View file

@ -143,7 +143,7 @@ class acp_bots
$bot_row['bot_ip'] = str_replace(' ', '', $bot_row['bot_ip']); $bot_row['bot_ip'] = str_replace(' ', '', $bot_row['bot_ip']);
// Make sure the admin is not adding a bot with an user agent similar to his one // Make sure the admin is not adding a bot with an user agent similar to his one
if ($bot_row['bot_agent'] && substr($user->data['session_browser'], 0, 149) === substr($bot_row['bot_agent'])) if ($bot_row['bot_agent'] && substr($user->data['session_browser'], 0, 149) === substr($bot_row['bot_agent'], 0, 149))
{ {
$error[] = $user->lang['ERR_BOT_AGENT_MATCHES_UA']; $error[] = $user->lang['ERR_BOT_AGENT_MATCHES_UA'];
} }
@ -165,7 +165,7 @@ class acp_bots
if (!$group_row) if (!$group_row)
{ {
trigger_error($user->lang['NO_GROUP'] . adm_back_link($this->u_action . "&amp;id=$bot_id&amp;action=$action"), E_USER_WARNING); trigger_error($user->lang['NO_BOT_GROUP'] . adm_back_link($this->u_action . "&amp;id=$bot_id&amp;action=$action"), E_USER_WARNING);
} }
$user_id = user_add(array( $user_id = user_add(array(

6
phpBB/includes/acp/acp_captcha.php
View file

@ -86,17 +86,17 @@ class acp_captcha
if (!@extension_loaded('gd')) if (!@extension_loaded('gd'))
{ {
trigger_error($user->lang['NO_GD'], E_USER_WARNING); trigger_error($user->lang['NO_GD'] . adm_back_link($this->u_action), E_USER_WARNING);
} }
if (!($policy === 'policy_entropy' || $policy === 'policy_3dbitmap') && (!function_exists('imagettfbbox') || !function_exists('imagettftext'))) if (!($policy === 'policy_entropy' || $policy === 'policy_3dbitmap') && (!function_exists('imagettfbbox') || !function_exists('imagettftext')))
{ {
trigger_error($user->lang['NO_TTF'], E_USER_WARNING); trigger_error($user->lang['NO_TTF'] . adm_back_link($this->u_action), E_USER_WARNING);
} }
if (!in_array($policy, $policy_modules)) if (!in_array($policy, $policy_modules))
{ {
trigger_error($user->lang['BAD_POLICY'], E_USER_WARNING); trigger_error($user->lang['BAD_POLICY'] . adm_back_link($this->u_action), E_USER_WARNING);
} }
$user->add_lang('ucp'); $user->add_lang('ucp');

8
phpBB/includes/acp/acp_database.php
View file

@ -1051,7 +1051,7 @@ class acp_database
unset($sql_data); unset($sql_data);
add_log('admin', 'LOG_DB_BACKUP'); add_log('admin', 'LOG_DB_BACKUP');
trigger_error($user->lang['BACKUP_SUCCESS']); trigger_error($user->lang['BACKUP_SUCCESS'] . adm_back_link($this->u_action));
break; break;
default: default:
@ -1194,13 +1194,13 @@ class acp_database
if (!(file_exists($file_name) && is_readable($file_name))) if (!(file_exists($file_name) && is_readable($file_name)))
{ {
trigger_error($user->lang['BACKUP_INVALID'], E_USER_WARNING); trigger_error($user->lang['BACKUP_INVALID'] . adm_back_link($this->u_action), E_USER_WARNING);
} }
if ($delete) if ($delete)
{ {
unlink($file_name); unlink($file_name);
trigger_error($user->lang['BACKUP_DELETE']); trigger_error($user->lang['BACKUP_DELETE'] . adm_back_link($this->u_action));
} }
$data = file_get_contents($file_name); $data = file_get_contents($file_name);
@ -1290,7 +1290,7 @@ class acp_database
} }
} }
add_log('admin', 'LOG_DB_RESTORE'); add_log('admin', 'LOG_DB_RESTORE');
trigger_error($user->lang['RESTORE_SUCCESS']); trigger_error($user->lang['RESTORE_SUCCESS'] . adm_back_link($this->u_action));
break; break;
default: default:

6
phpBB/includes/acp/acp_inactive.php
View file

@ -26,6 +26,8 @@ class acp_inactive
global $config, $db, $user, $auth, $template; global $config, $db, $user, $auth, $template;
global $phpbb_root_path, $phpbb_admin_path, $phpEx, $table_prefix; global $phpbb_root_path, $phpbb_admin_path, $phpEx, $table_prefix;
$user->add_lang('memberlist');
$action = request_var('action', ''); $action = request_var('action', '');
$mark = (isset($_REQUEST['mark'])) ? request_var('mark', array(0)) : array(); $mark = (isset($_REQUEST['mark'])) ? request_var('mark', array(0)) : array();
$start = request_var('start', 0); $start = request_var('start', 0);
@ -71,7 +73,7 @@ class acp_inactive
{ {
if (!$auth->acl_get('a_userdel')) if (!$auth->acl_get('a_userdel'))
{ {
trigger_error($user->lang['NO_ADMIN'], E_USER_WARNING); trigger_error($user->lang['NO_AUTH_OPERATION'] . adm_back_link($this->u_action), E_USER_WARNING);
} }
$sql = 'DELETE FROM ' . USER_GROUP_TABLE . ' WHERE ' . $db->sql_in_set('user_id', $mark); $sql = 'DELETE FROM ' . USER_GROUP_TABLE . ' WHERE ' . $db->sql_in_set('user_id', $mark);
@ -87,7 +89,7 @@ class acp_inactive
case 'remind': case 'remind':
if (empty($config['email_enable'])) if (empty($config['email_enable']))
{ {
trigger_error($user->lang['EMAIL_DISABLED'], E_USER_WARNING); trigger_error($user->lang['EMAIL_DISABLED'] . adm_back_link($this->u_action), E_USER_WARNING);
} }
$sql = 'SELECT user_id, username, user_email, user_lang, user_jabber, user_notify_type, user_regdate, user_actkey $sql = 'SELECT user_id, username, user_email, user_lang, user_jabber, user_notify_type, user_regdate, user_actkey

4
phpBB/includes/acp/acp_language.php
View file

@ -201,7 +201,7 @@ class acp_language
if (!$fp) if (!$fp)
{ {
trigger_error($user->lang['UNABLE_TO_WRITE_FILE'], E_USER_WARNING); trigger_error(sprintf($user->lang['UNABLE_TO_WRITE_FILE'], $filename) . adm_back_link($this->u_action), E_USER_WARNING);
} }
if ($this->language_directory == 'email') if ($this->language_directory == 'email')
@ -320,7 +320,7 @@ class acp_language
add_log('admin', 'LOG_LANGUAGE_FILE_REPLACED', $file); add_log('admin', 'LOG_LANGUAGE_FILE_REPLACED', $file);
trigger_error($user->lang['UPLOAD_COMPLETED']); trigger_error($user->lang['UPLOAD_COMPLETED'] . adm_back_link($this->u_action));
} }
$action = 'details'; $action = 'details';

8
phpBB/includes/acp/acp_main.php
View file

@ -56,7 +56,7 @@ class acp_main
case 'online': case 'online':
if (!$auth->acl_get('a_board')) if (!$auth->acl_get('a_board'))
{ {
trigger_error($user->lang['NO_ADMIN'], E_USER_WARNING); trigger_error($user->lang['NO_AUTH_OPERATION'] . adm_back_link($this->u_action), E_USER_WARNING);
} }
set_config('record_online_users', 1, true); set_config('record_online_users', 1, true);
@ -67,7 +67,7 @@ class acp_main
case 'stats': case 'stats':
if (!$auth->acl_get('a_board')) if (!$auth->acl_get('a_board'))
{ {
trigger_error($user->lang['NO_ADMIN'], E_USER_WARNING); trigger_error($user->lang['NO_AUTH_OPERATION'] . adm_back_link($this->u_action), E_USER_WARNING);
} }
$sql = 'SELECT COUNT(post_id) AS stat $sql = 'SELECT COUNT(post_id) AS stat
@ -119,7 +119,7 @@ class acp_main
case 'user': case 'user':
if (!$auth->acl_get('a_board')) if (!$auth->acl_get('a_board'))
{ {
trigger_error($user->lang['NO_ADMIN'], E_USER_WARNING); trigger_error($user->lang['NO_AUTH_OPERATION'] . adm_back_link($this->u_action), E_USER_WARNING);
} }
$sql = 'SELECT COUNT(post_id) AS num_posts, poster_id $sql = 'SELECT COUNT(post_id) AS num_posts, poster_id
@ -141,7 +141,7 @@ class acp_main
case 'date': case 'date':
if (!$auth->acl_get('a_board')) if (!$auth->acl_get('a_board'))
{ {
trigger_error($user->lang['NO_ADMIN'], E_USER_WARNING); trigger_error($user->lang['NO_AUTH_OPERATION'] . adm_back_link($this->u_action), E_USER_WARNING);
} }
set_config('board_startdate', time() - 1); set_config('board_startdate', time() - 1);

57
phpBB/includes/acp/acp_modules.php
View file

@ -24,6 +24,7 @@
class acp_modules class acp_modules
{ {
var $module_class = ''; var $module_class = '';
var $parent_id;
var $u_action; var $u_action;
function main($id, $mode) function main($id, $mode)
@ -51,7 +52,7 @@ class acp_modules
$this->page_title = strtoupper($this->module_class); $this->page_title = strtoupper($this->module_class);
$parent_id = request_var('parent_id', 0); $this->parent_id = request_var('parent_id', 0);
$module_id = request_var('m', 0); $module_id = request_var('m', 0);
$action = request_var('action', ''); $action = request_var('action', '');
$errors = array(); $errors = array();
@ -61,7 +62,7 @@ class acp_modules
case 'delete': case 'delete':
if (!$module_id) if (!$module_id)
{ {
trigger_error($user->lang['NO_MODULE_ID'] . adm_back_link($this->u_action . '&amp;parent_id=' . $parent_id), E_USER_WARNING); trigger_error($user->lang['NO_MODULE_ID'] . adm_back_link($this->u_action . '&amp;parent_id=' . $this->parent_id), E_USER_WARNING);
} }
if (confirm_box(true)) if (confirm_box(true))
@ -71,7 +72,7 @@ class acp_modules
if (!sizeof($errors)) if (!sizeof($errors))
{ {
$this->remove_cache_file(); $this->remove_cache_file();
trigger_error($user->lang['MODULE_DELETED'] . adm_back_link($this->u_action . '&amp;parent_id=' . $parent_id)); trigger_error($user->lang['MODULE_DELETED'] . adm_back_link($this->u_action . '&amp;parent_id=' . $this->parent_id));
} }
} }
else else
@ -79,7 +80,7 @@ class acp_modules
confirm_box(false, 'DELETE_MODULE', build_hidden_fields(array( confirm_box(false, 'DELETE_MODULE', build_hidden_fields(array(
'i' => $id, 'i' => $id,
'mode' => $mode, 'mode' => $mode,
'parent_id' => $parent_id, 'parent_id' => $this->parent_id,
'module_id' => $module_id, 'module_id' => $module_id,
'action' => $action, 'action' => $action,
))); )));
@ -91,7 +92,7 @@ class acp_modules
case 'disable': case 'disable':
if (!$module_id) if (!$module_id)
{ {
trigger_error($user->lang['NO_MODULE_ID'] . adm_back_link($this->u_action . '&amp;parent_id=' . $parent_id), E_USER_WARNING); trigger_error($user->lang['NO_MODULE_ID'] . adm_back_link($this->u_action . '&amp;parent_id=' . $this->parent_id), E_USER_WARNING);
} }
$sql = 'UPDATE ' . MODULES_TABLE . ' $sql = 'UPDATE ' . MODULES_TABLE . '
@ -108,7 +109,7 @@ class acp_modules
case 'move_down': case 'move_down':
if (!$module_id) if (!$module_id)
{ {
trigger_error($user->lang['NO_MODULE_ID'] . adm_back_link($this->u_action . '&amp;parent_id=' . $parent_id), E_USER_WARNING); trigger_error($user->lang['NO_MODULE_ID'] . adm_back_link($this->u_action . '&amp;parent_id=' . $this->parent_id), E_USER_WARNING);
} }
$sql = 'SELECT * $sql = 'SELECT *
@ -121,7 +122,7 @@ class acp_modules
if (!$row) if (!$row)
{ {
trigger_error($user->lang['NO_MODULE'] . adm_back_link($this->u_action . '&amp;parent_id=' . $parent_id), E_USER_WARNING); trigger_error($user->lang['NO_MODULE'] . adm_back_link($this->u_action . '&amp;parent_id=' . $this->parent_id), E_USER_WARNING);
} }
$move_module_name = $this->move_module_by($row, $action, 1); $move_module_name = $this->move_module_by($row, $action, 1);
@ -156,7 +157,7 @@ class acp_modules
'module_basename' => $module_basename, 'module_basename' => $module_basename,
'module_enabled' => 0, 'module_enabled' => 0,
'module_display' => (isset($fileinfo['modes'][$module_mode]['display'])) ? $fileinfo['modes'][$module_mode]['display'] : 1, 'module_display' => (isset($fileinfo['modes'][$module_mode]['display'])) ? $fileinfo['modes'][$module_mode]['display'] : 1,
'parent_id' => $parent_id, 'parent_id' => $this->parent_id,
'module_class' => $this->module_class, 'module_class' => $this->module_class,
'module_langname' => $fileinfo['modes'][$module_mode]['title'], 'module_langname' => $fileinfo['modes'][$module_mode]['title'],
'module_mode' => $module_mode, 'module_mode' => $module_mode,
@ -169,7 +170,7 @@ class acp_modules
{ {
$this->remove_cache_file(); $this->remove_cache_file();
trigger_error($user->lang['MODULE_ADDED'] . adm_back_link($this->u_action . '&amp;parent_id=' . $parent_id)); trigger_error($user->lang['MODULE_ADDED'] . adm_back_link($this->u_action . '&amp;parent_id=' . $this->parent_id));
} }
} }
} }
@ -178,7 +179,7 @@ class acp_modules
confirm_box(false, 'ADD_MODULE', build_hidden_fields(array( confirm_box(false, 'ADD_MODULE', build_hidden_fields(array(
'i' => $id, 'i' => $id,
'mode' => $mode, 'mode' => $mode,
'parent_id' => $parent_id, 'parent_id' => $this->parent_id,
'action' => 'quickadd', 'action' => 'quickadd',
'quick_install' => $quick_install, 'quick_install' => $quick_install,
))); )));
@ -190,7 +191,7 @@ class acp_modules
if (!$module_id) if (!$module_id)
{ {
trigger_error($user->lang['NO_MODULE_ID'] . adm_back_link($this->u_action . '&amp;parent_id=' . $parent_id), E_USER_WARNING); trigger_error($user->lang['NO_MODULE_ID'] . adm_back_link($this->u_action . '&amp;parent_id=' . $this->parent_id), E_USER_WARNING);
} }
$module_row = $this->get_module_row($module_id); $module_row = $this->get_module_row($module_id);
@ -228,7 +229,7 @@ class acp_modules
{ {
if (!$module_data['module_langname']) if (!$module_data['module_langname'])
{ {
trigger_error($user->lang['NO_MODULE_LANGNAME'] . adm_back_link($this->u_action . '&amp;parent_id=' . $parent_id), E_USER_WARNING); trigger_error($user->lang['NO_MODULE_LANGNAME'] . adm_back_link($this->u_action . '&amp;parent_id=' . $this->parent_id), E_USER_WARNING);
} }
$module_type = request_var('module_type', 'category'); $module_type = request_var('module_type', 'category');
@ -257,7 +258,7 @@ class acp_modules
{ {
$this->remove_cache_file(); $this->remove_cache_file();
trigger_error((($action == 'add') ? $user->lang['MODULE_ADDED'] : $user->lang['MODULE_EDITED']) . adm_back_link($this->u_action . '&amp;parent_id=' . $parent_id)); trigger_error((($action == 'add') ? $user->lang['MODULE_ADDED'] : $user->lang['MODULE_EDITED']) . adm_back_link($this->u_action . '&amp;parent_id=' . $this->parent_id));
} }
} }
@ -306,8 +307,8 @@ class acp_modules
'S_CAT_OPTIONS' => $s_cat_option . $this->make_module_select($module_data['parent_id'], ($action == 'edit') ? $module_row['module_id'] : false, false, false, false, true), 'S_CAT_OPTIONS' => $s_cat_option . $this->make_module_select($module_data['parent_id'], ($action == 'edit') ? $module_row['module_id'] : false, false, false, false, true),
'S_MODULE_NAMES' => $s_name_options, 'S_MODULE_NAMES' => $s_name_options,
'S_MODULE_MODES' => $s_mode_options, 'S_MODULE_MODES' => $s_mode_options,
'U_BACK' => $this->u_action . '&amp;parent_id=' . $parent_id, 'U_BACK' => $this->u_action . '&amp;parent_id=' . $this->parent_id,
'U_EDIT_ACTION' => $this->u_action . '&amp;parent_id=' . $parent_id, 'U_EDIT_ACTION' => $this->u_action . '&amp;parent_id=' . $this->parent_id,
'L_TITLE' => $user->lang[strtoupper($action) . '_MODULE'], 'L_TITLE' => $user->lang[strtoupper($action) . '_MODULE'],
@ -341,7 +342,7 @@ class acp_modules
); );
} }
if (!$parent_id) if (!$this->parent_id)
{ {
$navigation = strtoupper($this->module_class); $navigation = strtoupper($this->module_class);
} }
@ -349,12 +350,12 @@ class acp_modules
{ {
$navigation = '<a href="' . $this->u_action . '">' . strtoupper($this->module_class) . '</a>'; $navigation = '<a href="' . $this->u_action . '">' . strtoupper($this->module_class) . '</a>';
$modules_nav = $this->get_module_branch($parent_id, 'parents', 'descending'); $modules_nav = $this->get_module_branch($this->parent_id, 'parents', 'descending');
foreach ($modules_nav as $row) foreach ($modules_nav as $row)
{ {
$langname = $this->lang_name($row['module_langname']); $langname = $this->lang_name($row['module_langname']);
if ($row['module_id'] == $parent_id) if ($row['module_id'] == $this->parent_id)
{ {
$navigation .= ' -&gt; ' . $langname; $navigation .= ' -&gt; ' . $langname;
} }
@ -366,11 +367,11 @@ class acp_modules
} }
// Jumpbox // Jumpbox
$module_box = $this->make_module_select($parent_id, false, false, false, false); $module_box = $this->make_module_select($this->parent_id, false, false, false, false);
$sql = 'SELECT * $sql = 'SELECT *
FROM ' . MODULES_TABLE . " FROM ' . MODULES_TABLE . "
WHERE parent_id = $parent_id WHERE parent_id = {$this->parent_id}
AND module_class = '" . $db->sql_escape($this->module_class) . "' AND module_class = '" . $db->sql_escape($this->module_class) . "'
ORDER BY left_id"; ORDER BY left_id";
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
@ -390,7 +391,7 @@ class acp_modules
$module_image = (!$row['module_basename'] || $row['left_id'] + 1 != $row['right_id']) ? '<img src="images/icon_subfolder.gif" width="46" height="25" alt="' . $user->lang['CATEGORY'] . '" />' : '<img src="images/icon_folder.gif" width="46" height="25" alt="' . $user->lang['MODULE'] . '" />'; $module_image = (!$row['module_basename'] || $row['left_id'] + 1 != $row['right_id']) ? '<img src="images/icon_subfolder.gif" width="46" height="25" alt="' . $user->lang['CATEGORY'] . '" />' : '<img src="images/icon_folder.gif" width="46" height="25" alt="' . $user->lang['MODULE'] . '" />';
} }
$url = $this->u_action . '&amp;parent_id=' . $parent_id . '&amp;m=' . $row['module_id']; $url = $this->u_action . '&amp;parent_id=' . $this->parent_id . '&amp;m=' . $row['module_id'];
$template->assign_block_vars('modules', array( $template->assign_block_vars('modules', array(
'MODULE_IMAGE' => $module_image, 'MODULE_IMAGE' => $module_image,
@ -409,11 +410,11 @@ class acp_modules
} }
while ($row = $db->sql_fetchrow($result)); while ($row = $db->sql_fetchrow($result));
} }
else if ($parent_id) else if ($this->parent_id)
{ {
$row = $this->get_module_row($parent_id); $row = $this->get_module_row($this->parent_id);
$url = $this->u_action . '&amp;parent_id=' . $parent_id . '&amp;m=' . $row['module_id']; $url = $this->u_action . '&amp;parent_id=' . $this->parent_id . '&amp;m=' . $row['module_id'];
$template->assign_vars(array( $template->assign_vars(array(
'S_NO_MODULES' => true, 'S_NO_MODULES' => true,
@ -450,10 +451,10 @@ class acp_modules
$template->assign_vars(array( $template->assign_vars(array(
'U_SEL_ACTION' => $this->u_action, 'U_SEL_ACTION' => $this->u_action,
'U_ACTION' => $this->u_action . '&amp;parent_id=' . $parent_id, 'U_ACTION' => $this->u_action . '&amp;parent_id=' . $this->parent_id,
'NAVIGATION' => $navigation, 'NAVIGATION' => $navigation,
'MODULE_BOX' => $module_box, 'MODULE_BOX' => $module_box,
'PARENT_ID' => $parent_id, 'PARENT_ID' => $this->parent_id,
'S_INSTALL_OPTIONS' => $s_install_options, 'S_INSTALL_OPTIONS' => $s_install_options,
) )
); );
@ -476,7 +477,7 @@ class acp_modules
if (!$row) if (!$row)
{ {
trigger_error($user->lang['NO_MODULE'], E_USER_WARNING); trigger_error($user->lang['NO_MODULE'] . adm_back_link($this->u_action . '&amp;parent_id=' . $this->parent_id), E_USER_WARNING);
} }
return $row; return $row;
@ -721,7 +722,7 @@ class acp_modules
return 'PARENT_NO_EXIST'; return 'PARENT_NO_EXIST';
} }
trigger_error($user->lang['PARENT_NO_EXIST'], E_USER_WARNING); trigger_error($user->lang['PARENT_NO_EXIST'] . adm_back_link($this->u_action . '&amp;parent_id=' . $this->parent_id), E_USER_WARNING);
} }
$sql = 'UPDATE ' . MODULES_TABLE . " $sql = 'UPDATE ' . MODULES_TABLE . "

2
phpBB/includes/acp/acp_permission_roles.php
View file

@ -58,7 +58,7 @@ class acp_permission_roles
break; break;
default: default:
trigger_error('INVALID_MODE', E_USER_ERROR); trigger_error('NO_MODE', E_USER_ERROR);
break; break;
} }

8
phpBB/includes/acp/acp_permissions.php
View file

@ -190,7 +190,7 @@ class acp_permissions
break; break;
default: default:
trigger_error('INVALID_MODE', E_USER_ERROR); trigger_error('NO_MODE', E_USER_ERROR);
break; break;
} }
@ -593,7 +593,7 @@ class acp_permissions
// Check the permission setting again // Check the permission setting again
if (!$auth->acl_get('a_' . str_replace('_', '', $permission_type) . 'auth') || !$auth->acl_get('a_auth' . $ug_type . 's')) if (!$auth->acl_get('a_' . str_replace('_', '', $permission_type) . 'auth') || !$auth->acl_get('a_auth' . $ug_type . 's'))
{ {
trigger_error($user->lang['NO_ADMIN'] . adm_back_link($this->u_action), E_USER_WARNING); trigger_error($user->lang['NO_AUTH_OPERATION'] . adm_back_link($this->u_action), E_USER_WARNING);
} }
$ug_id = $forum_id = 0; $ug_id = $forum_id = 0;
@ -672,7 +672,7 @@ class acp_permissions
// Check the permission setting again // Check the permission setting again
if (!$auth->acl_get('a_' . str_replace('_', '', $permission_type) . 'auth') || !$auth->acl_get('a_auth' . $ug_type . 's')) if (!$auth->acl_get('a_' . str_replace('_', '', $permission_type) . 'auth') || !$auth->acl_get('a_auth' . $ug_type . 's'))
{ {
trigger_error($user->lang['NO_ADMIN'] . adm_back_link($this->u_action), E_USER_WARNING); trigger_error($user->lang['NO_AUTH_OPERATION'] . adm_back_link($this->u_action), E_USER_WARNING);
} }
$auth_settings = (isset($_POST['setting'])) ? $_POST['setting'] : array(); $auth_settings = (isset($_POST['setting'])) ? $_POST['setting'] : array();
@ -777,7 +777,7 @@ class acp_permissions
// Check the permission setting again // Check the permission setting again
if (!$auth->acl_get('a_' . str_replace('_', '', $permission_type) . 'auth') || !$auth->acl_get('a_auth' . $ug_type . 's')) if (!$auth->acl_get('a_' . str_replace('_', '', $permission_type) . 'auth') || !$auth->acl_get('a_auth' . $ug_type . 's'))
{ {
trigger_error($user->lang['NO_ADMIN'] . adm_back_link($this->u_action), E_USER_WARNING); trigger_error($user->lang['NO_AUTH_OPERATION'] . adm_back_link($this->u_action), E_USER_WARNING);
} }
$auth_admin->acl_delete($ug_type, (($ug_type == 'user') ? $user_id : $group_id), (sizeof($forum_id) ? $forum_id : false), $permission_type); $auth_admin->acl_delete($ug_type, (($ug_type == 'user') ? $user_id : $group_id), (sizeof($forum_id) ? $forum_id : false), $permission_type);

6
phpBB/includes/acp/acp_search.php
View file

@ -152,7 +152,7 @@ class acp_search
} }
else else
{ {
trigger_error($error, E_USER_WARNING); trigger_error($error . adm_back_link($this->u_action), E_USER_WARNING);
} }
} }
else else
@ -168,7 +168,7 @@ class acp_search
} }
else else
{ {
trigger_error($error, E_USER_WARNING); trigger_error($error . adm_back_link($this->u_action), E_USER_WARNING);
} }
} }
@ -241,7 +241,7 @@ class acp_search
$error = false; $error = false;
if ($this->init_search($this->state[0], $this->search, $error)) if ($this->init_search($this->state[0], $this->search, $error))
{ {
trigger_error($error, E_USER_WARNING); trigger_error($error . adm_back_link($this->u_action), E_USER_WARNING);
} }
$action = &$this->state[1]; $action = &$this->state[1];

40
phpBB/includes/acp/acp_styles.php
View file

@ -316,7 +316,7 @@ pagination_sep = \'{PAGINATION_SEP}\'
if (!$theme_row['theme_storedb']) if (!$theme_row['theme_storedb'])
{ {
trigger_error($user->lang['THEME_ERR_REFRESH_FS'] . adm_back_link($this->u_action)); trigger_error($user->lang['THEME_ERR_REFRESH_FS'] . adm_back_link($this->u_action), E_USER_WARNING);
} }
if (confirm_box(true)) if (confirm_box(true))
@ -602,13 +602,14 @@ pagination_sep = \'{PAGINATION_SEP}\'
FROM ' . STYLES_TEMPLATE_TABLE . " FROM ' . STYLES_TEMPLATE_TABLE . "
WHERE template_id = $template_id"; WHERE template_id = $template_id";
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
$template_info = $db->sql_fetchrow($result);
if (!($template_info = $db->sql_fetchrow($result)))
{
trigger_error($user->lang['NO_TEMPLATE'], E_USER_WARNING);
}
$db->sql_freeresult($result); $db->sql_freeresult($result);
if (!$template_info)
{
trigger_error($user->lang['NO_TEMPLATE'] . adm_back_link($this->u_action), E_USER_WARNING);
}
// save changes to the template if the user submitted any // save changes to the template if the user submitted any
if ($save_changes && $template_file) if ($save_changes && $template_file)
{ {
@ -621,7 +622,7 @@ pagination_sep = \'{PAGINATION_SEP}\'
{ {
if (!($fp = fopen($file, 'wb'))) if (!($fp = fopen($file, 'wb')))
{ {
trigger_error($user->lang['NO_TEMPLATE'], E_USER_WARNING); trigger_error($user->lang['NO_TEMPLATE'] . adm_back_link($this->u_action), E_USER_WARNING);
} }
fwrite($fp, $template_data); fwrite($fp, $template_data);
fclose($fp); fclose($fp);
@ -674,7 +675,7 @@ pagination_sep = \'{PAGINATION_SEP}\'
{ {
if (!file_exists($template_path . "/$template_file") || !($template_data = file_get_contents($template_path . "/$template_file"))) if (!file_exists($template_path . "/$template_file") || !($template_data = file_get_contents($template_path . "/$template_file")))
{ {
trigger_error($user->lang['NO_TEMPLATE'], E_USER_WARNING); trigger_error($user->lang['NO_TEMPLATE'] . adm_back_link($this->u_action), E_USER_WARNING);
} }
} }
} }
@ -801,13 +802,14 @@ pagination_sep = \'{PAGINATION_SEP}\'
FROM ' . STYLES_TEMPLATE_TABLE . " FROM ' . STYLES_TEMPLATE_TABLE . "
WHERE template_id = $template_id"; WHERE template_id = $template_id";
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
$template_row = $db->sql_fetchrow($result);
if (!($template_row = $db->sql_fetchrow($result)))
{
trigger_error($user->lang['NO_TEMPLATE'], E_USER_WARNING);
}
$db->sql_freeresult($result); $db->sql_freeresult($result);
if (!$template_row)
{
trigger_error($user->lang['NO_TEMPLATE'] . adm_back_link($this->u_action), E_USER_WARNING);
}
// User wants to delete one or more files ... // User wants to delete one or more files ...
if ($submit && $file_ary) if ($submit && $file_ary)
{ {
@ -941,7 +943,7 @@ pagination_sep = \'{PAGINATION_SEP}\'
if (!($theme_info = $db->sql_fetchrow($result))) if (!($theme_info = $db->sql_fetchrow($result)))
{ {
trigger_error($user->lang['NO_THEME'], E_USER_WARNING); trigger_error($user->lang['NO_THEME'] . adm_bacl_link($this->u_action), E_USER_WARNING);
} }
$db->sql_freeresult($result); $db->sql_freeresult($result);
@ -951,7 +953,7 @@ pagination_sep = \'{PAGINATION_SEP}\'
{ {
if (!file_exists($stylesheet_path) || !($stylesheet = file_get_contents($stylesheet_path))) if (!file_exists($stylesheet_path) || !($stylesheet = file_get_contents($stylesheet_path)))
{ {
trigger_error($user->lang['NO_THEME'], E_USER_WARNING); trigger_error($user->lang['NO_THEME'] . adm_back_link($this->u_action), E_USER_WARNING);
} }
} }
else else
@ -1030,7 +1032,7 @@ pagination_sep = \'{PAGINATION_SEP}\'
if (!isset($matches[1])) if (!isset($matches[1]))
{ {
trigger_error($user->lang['NO_CLASS'], E_USER_WARNING); trigger_error($user->lang['NO_CLASS'] . adm_back_link($this->u_action), E_USER_WARNING);
} }
$css_data = implode(";\n", array_diff(array_map('trim', explode("\n", preg_replace("#;[\n]*#s", "\n", $matches[1]))), array(''))); $css_data = implode(";\n", array_diff(array_map('trim', explode("\n", preg_replace("#;[\n]*#s", "\n", $matches[1]))), array('')));
@ -1278,7 +1280,7 @@ pagination_sep = \'{PAGINATION_SEP}\'
// write stylesheet to file // write stylesheet to file
if (!($fp = fopen($stylesheet_path, 'wb'))) if (!($fp = fopen($stylesheet_path, 'wb')))
{ {
trigger_error($user->lang['NO_THEME'], E_USER_WARNING); trigger_error($user->lang['NO_THEME'] . adm_back_link($this->u_action), E_USER_WARNING);
} }
fwrite($fp, $stylesheet); fwrite($fp, $stylesheet);
fclose($fp); fclose($fp);
@ -1355,7 +1357,7 @@ pagination_sep = \'{PAGINATION_SEP}\'
if (!extract($db->sql_fetchrow($result))) if (!extract($db->sql_fetchrow($result)))
{ {
trigger_error($user->lang['NO_IMAGESET'], E_USER_WARNING); trigger_error($user->lang['NO_IMAGESET'] . adm_back_link($this->u_action), E_USER_WARNING);
} }
$db->sql_freeresult($result); $db->sql_freeresult($result);
@ -2396,7 +2398,7 @@ pagination_sep = \'{PAGINATION_SEP}\'
if (!($dp = @opendir("{$phpbb_root_path}cache"))) if (!($dp = @opendir("{$phpbb_root_path}cache")))
{ {
trigger_error($user->lang['TEMPLATE_ERR_CACHE_READ'], E_USER_ERROR); trigger_error($user->lang['TEMPLATE_ERR_CACHE_READ'] . adm_back_link($this->u_action), E_USER_WARNING);
} }
$file_ary = array(); $file_ary = array();

2
phpBB/includes/acp/acp_users.php
View file

@ -158,7 +158,7 @@ class acp_users
{ {
if (!$auth->acl_get('a_userdel')) if (!$auth->acl_get('a_userdel'))
{ {
trigger_error($user->lang['NO_ADMIN'] . adm_back_link($this->u_action . '&amp;u=' . $user_id), E_USER_WARNING); trigger_error($user->lang['NO_AUTH_OPERATION'] . adm_back_link($this->u_action . '&amp;u=' . $user_id), E_USER_WARNING);
} }
// Check if the user wants to remove himself or the guest user account // Check if the user wants to remove himself or the guest user account

22
phpBB/includes/functions.php
View file

@ -2683,10 +2683,17 @@ function get_preg_expression($mode)
* Truncates string while retaining special characters if going over the max length * Truncates string while retaining special characters if going over the max length
* The default max length is 60 at the moment * The default max length is 60 at the moment
*/ */
function truncate_string($string, $max_length = 60) function truncate_string($string, $max_length = 60, $allow_reply = true)
{ {
$chars = array(); $chars = array();
$strip_reply = false;
if ($allow_reply && strpos($string, 'Re: ') === 0)
{
$strip_reply = true;
$string = substr($string, 4);
}
// split the multibyte characters first // split the multibyte characters first
$string_ary = preg_split('/(&#[0-9]+;)/', $string, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY); $string_ary = preg_split('/(&#[0-9]+;)/', $string, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
@ -2705,13 +2712,18 @@ function truncate_string($string, $max_length = 60)
} }
// Now check the length ;) // Now check the length ;)
if (sizeof($chars) <= $max_length) if (sizeof($chars) > $max_length)
{ {
return $string; // Cut off the last elements from the array
$string = implode('', array_slice($chars, 0, $max_length));
} }
// Cut off the last elements from the array if ($strip_reply)
return implode('', array_slice($chars, 0, $max_length)); {
$string = 'Re: ' . $string;
}
return $string;
} }

2
phpBB/includes/ucp/ucp_pm.php
View file

@ -403,7 +403,7 @@ class ucp_pm
break; break;
default: default:
trigger_error('NO_ACTION_MODE'); trigger_error('NO_ACTION_MODE', E_USER_ERROR);
break; break;
} }

2
phpBB/includes/ucp/ucp_pm_compose.php
View file

@ -149,7 +149,7 @@ function compose_pm($id, $mode, $action)
break; break;
default: default:
trigger_error('NO_ACTION_MODE'); trigger_error('NO_ACTION_MODE', E_USER_ERROR);
} }
if ($action == 'forward' && (!$config['forward_pm'] || !$auth->acl_get('u_pm_forward'))) if ($action == 'forward' && (!$config['forward_pm'] || !$auth->acl_get('u_pm_forward')))

6
phpBB/language/en/acp/attachments.php
View file

@ -85,7 +85,7 @@ $lang = array_merge($lang, array(
'EXTENSION_EXIST' => 'The extension %s already exist', 'EXTENSION_EXIST' => 'The extension %s already exist',
'EXTENSION_GROUP' => 'Extension group', 'EXTENSION_GROUP' => 'Extension group',
'EXTENSION_GROUPS' => 'Extension groups', 'EXTENSION_GROUPS' => 'Extension groups',
'EXTENSION_GROUP_DELETED' => 'Extension group successfully deleted', 'EXTENSION_GROUP_DELETED' => 'Extension group successfully deleted.',
'EXTENSION_GROUP_EXIST' => 'The extension group %s already exist', 'EXTENSION_GROUP_EXIST' => 'The extension group %s already exist',
'GO_TO_EXTENSIONS' => 'Go to extension management screen', 'GO_TO_EXTENSIONS' => 'Go to extension management screen',
@ -112,7 +112,7 @@ $lang = array_merge($lang, array(
'NOT_ASSIGNED' => 'Not assigned', 'NOT_ASSIGNED' => 'Not assigned',
'NO_EXT_GROUP' => 'None', 'NO_EXT_GROUP' => 'None',
'NO_EXT_GROUP_NAME' => 'No group name entered', 'NO_EXT_GROUP_NAME' => 'No group name entered',
'NO_EXT_GROUP_SPECIFIED' => 'No extension group specified', 'NO_EXT_GROUP_SPECIFIED' => 'No extension group specified.',
'NO_FILE_CAT' => 'None', 'NO_FILE_CAT' => 'None',
'NO_IMAGE' => 'No image', '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_THUMBNAIL_SUPPORT' => 'Thumbnail support has been disabled because there is no supported GD library available and the imagemagick executable could not be found.',
@ -131,7 +131,7 @@ $lang = array_merge($lang, array(
'SECURE_DOWNLOADS' => 'Enable secure downloads', 'SECURE_DOWNLOADS' => 'Enable secure downloads',
'SECURE_DOWNLOADS_EXPLAIN' => 'With this option enabled, downloads are limited to IP’s/hostnames you defined.', 'SECURE_DOWNLOADS_EXPLAIN' => 'With this option enabled, downloads are limited to IP’s/hostnames you defined.',
'SECURE_DOWNLOAD_NOTICE' => 'Secure Downloads are not enabled. The settings below will be applied after enabling secure downloads.', 'SECURE_DOWNLOAD_NOTICE' => 'Secure Downloads are not enabled. The settings below will be applied after enabling secure downloads.',
'SECURE_DOWNLOAD_UPDATE_SUCCESS'=> 'The IP list has been updated successfully', 'SECURE_DOWNLOAD_UPDATE_SUCCESS'=> 'The IP list has been updated successfully.',
'SECURE_EMPTY_REFERRER' => 'Allow empty referrer', 'SECURE_EMPTY_REFERRER' => 'Allow empty referrer',
'SECURE_EMPTY_REFERRER_EXPLAIN' => 'Secure downloads are based on referrers. Do you want to allow downloads for those ommitting the referrer?', 'SECURE_EMPTY_REFERRER_EXPLAIN' => 'Secure downloads are based on referrers. Do you want to allow downloads for those ommitting the referrer?',
'SETTINGS_CAT_IMAGES' => 'Image category settings', 'SETTINGS_CAT_IMAGES' => 'Image category settings',

2
phpBB/language/en/acp/ban.php
View file

@ -42,7 +42,7 @@ $lang = array_merge($lang, array(
'BAN_LENGTH' => 'Length of ban', 'BAN_LENGTH' => 'Length of ban',
'BAN_REASON' => 'Reason for ban', 'BAN_REASON' => 'Reason for ban',
'BAN_GIVE_REASON' => 'Reason shown to the banned', 'BAN_GIVE_REASON' => 'Reason shown to the banned',
'BAN_UPDATE_SUCCESSFUL' => 'The banlist has been updated successfully', 'BAN_UPDATE_SUCCESSFUL' => 'The banlist has been updated successfully.',
'EMAIL_BAN' => 'Ban one or more email addresses', 'EMAIL_BAN' => 'Ban one or more email addresses',
'EMAIL_BAN_EXCLUDE_EXPLAIN' => 'Enable this to exclude the entered email address from all current bans.', 'EMAIL_BAN_EXCLUDE_EXPLAIN' => 'Enable this to exclude the entered email address from all current bans.',

19
phpBB/language/en/acp/board.php
View file

@ -195,6 +195,7 @@ $lang = array_merge($lang, array(
'ENABLE_COPPA_EXPLAIN' => 'This requires users to declare whether they are 13 or over for compliance with the U.S. COPPA Act. If this is disabled the COPPA specific groups will no longer be displayed.', 'ENABLE_COPPA_EXPLAIN' => 'This requires users to declare whether they are 13 or over for compliance with the U.S. COPPA Act. If this is disabled the COPPA specific groups will no longer be displayed.',
'MAX_CHARS' => 'Max', 'MAX_CHARS' => 'Max',
'MIN_CHARS' => 'Min', 'MIN_CHARS' => 'Min',
'NO_AUTH_PLUGIN' => 'No suitable auth plugin found.',
'PASSWORD_LENGTH' => 'Password length', 'PASSWORD_LENGTH' => 'Password length',
'PASSWORD_LENGTH_EXPLAIN' => 'Minimum and maximum number of characters in passwords.', 'PASSWORD_LENGTH_EXPLAIN' => 'Minimum and maximum number of characters in passwords.',
'REG_LIMIT' => 'Registration attempts', 'REG_LIMIT' => 'Registration attempts',
@ -412,28 +413,28 @@ $lang = array_merge($lang, array(
$lang = array_merge($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!', '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!',
'ERR_JAB_AUTH' => 'Could not authorise on Jabber server', 'ERR_JAB_AUTH' => 'Could not authorise on Jabber server.',
'ERR_JAB_CONNECT' => 'Could not connect to Jabber server', 'ERR_JAB_CONNECT' => 'Could not connect to Jabber server.',
'ERR_JAB_PASSCHG' => 'Could not change password', 'ERR_JAB_PASSCHG' => 'Could not change password.',
'ERR_JAB_PASSFAIL' => 'Password update failed, %s', 'ERR_JAB_PASSFAIL' => 'Password update failed, %s.',
'ERR_JAB_REGISTER' => 'An error occured trying to register this account, %s', 'ERR_JAB_REGISTER' => 'An error occured trying to register this account, %s.',
'ERR_JAB_USERNAME' => 'The username specified already exists, please choose an alternative.', 'ERR_JAB_USERNAME' => 'The username specified already exists, please choose an alternative.',
'JAB_CHANGED' => 'Jabber account changed successfully', 'JAB_CHANGED' => 'Jabber account changed successfully.',
'JAB_ENABLE' => 'Enable Jabber', 'JAB_ENABLE' => 'Enable Jabber',
'JAB_ENABLE_EXPLAIN' => 'Enables use of jabber messaging and notifications', 'JAB_ENABLE_EXPLAIN' => 'Enables use of jabber messaging and notifications',
'JAB_PACKAGE_SIZE' => 'Jabber package size', 'JAB_PACKAGE_SIZE' => 'Jabber package size',
'JAB_PACKAGE_SIZE_EXPLAIN' => 'This is the number of messages sent in one package. If set to 0 the message is sent immediatly and gets not queued for later sending.', 'JAB_PACKAGE_SIZE_EXPLAIN' => 'This is the number of messages sent in one package. If set to 0 the message is sent immediatly and gets not queued for later sending.',
'JAB_PASSWORD' => 'Jabber password', 'JAB_PASSWORD' => 'Jabber password',
'JAB_PASS_CHANGED' => 'Jabber password changed successfully', 'JAB_PASS_CHANGED' => 'Jabber password changed successfully.',
'JAB_PORT' => 'Jabber port', 'JAB_PORT' => 'Jabber port',
'JAB_PORT_EXPLAIN' => 'Leave blank unless you know it is not port 5222', 'JAB_PORT_EXPLAIN' => 'Leave blank unless you know it is not port 5222',
'JAB_REGISTERED' => 'New account registered successfully', 'JAB_REGISTERED' => 'New account registered successfully.',
'JAB_RESOURCE' => 'Jabber resource', 'JAB_RESOURCE' => 'Jabber resource',
'JAB_RESOURCE_EXPLAIN' => 'The resource locates this particular connection, e.g. board, home, etc.', 'JAB_RESOURCE_EXPLAIN' => 'The resource locates this particular connection, e.g. board, home, etc.',
'JAB_SERVER' => 'Jabber server', 'JAB_SERVER' => 'Jabber server',
'JAB_SERVER_EXPLAIN' => 'See %sjabber.org%s for a list of servers', 'JAB_SERVER_EXPLAIN' => 'See %sjabber.org%s for a list of servers',
'JAB_SETTINGS_CHANGED' => 'Jabber settings changed successfully', 'JAB_SETTINGS_CHANGED' => 'Jabber settings changed successfully.',
'JAB_USERNAME' => 'Jabber username', 'JAB_USERNAME' => 'Jabber username',
'JAB_USERNAME_EXPLAIN' => 'If this user is not registered it will be created if possible.', 'JAB_USERNAME_EXPLAIN' => 'If this user is not registered it will be created if possible.',
)); ));

9
phpBB/language/en/acp/bots.php
View file

@ -35,11 +35,11 @@ $lang = array_merge($lang, array(
'BOT_ACTIVATE' => 'Activate', 'BOT_ACTIVATE' => 'Activate',
'BOT_ACTIVE' => 'Bot active', 'BOT_ACTIVE' => 'Bot active',
'BOT_ADD' => 'Add bot', 'BOT_ADD' => 'Add bot',
'BOT_ADDED' => 'New bot successfully added', 'BOT_ADDED' => 'New bot successfully added.',
'BOT_AGENT' => 'Agent match', 'BOT_AGENT' => 'Agent match',
'BOT_AGENT_EXPLAIN' => 'A string matching the bots browser agent, partial matches are allowed.', 'BOT_AGENT_EXPLAIN' => 'A string matching the bots browser agent, partial matches are allowed.',
'BOT_DEACTIVATE' => 'Deactivate', 'BOT_DEACTIVATE' => 'Deactivate',
'BOT_DELETED' => 'Bot deleted successfully', 'BOT_DELETED' => 'Bot deleted successfully.',
'BOT_EDIT' => 'Edit bots', 'BOT_EDIT' => 'Edit bots',
'BOT_EDIT_EXPLAIN' => 'Here you can add or edit an existing bot entry. You may define an agent string and/or one or more IP addresses (or range of addresses) to match. Be careful when defining matching agent strings or addresses. You may also specify a style and language that the bot will view the board using. This may allow you to reduce bandwidth use by setting a simple style for bots. Remember to set appropriate permissions for the special Bot usergroup.', 'BOT_EDIT_EXPLAIN' => 'Here you can add or edit an existing bot entry. You may define an agent string and/or one or more IP addresses (or range of addresses) to match. Be careful when defining matching agent strings or addresses. You may also specify a style and language that the bot will view the board using. This may allow you to reduce bandwidth use by setting a simple style for bots. Remember to set appropriate permissions for the special Bot usergroup.',
'BOT_LANG' => 'Bot language', 'BOT_LANG' => 'Bot language',
@ -52,7 +52,7 @@ $lang = array_merge($lang, array(
'BOT_NEVER' => 'Never', 'BOT_NEVER' => 'Never',
'BOT_STYLE' => 'Bot style', 'BOT_STYLE' => 'Bot style',
'BOT_STYLE_EXPLAIN' => 'The style used for the board by the bot.', 'BOT_STYLE_EXPLAIN' => 'The style used for the board by the bot.',
'BOT_UPDATED' => 'Existing bot updated successfully', 'BOT_UPDATED' => 'Existing bot updated successfully.',
'BOT_VIS' => 'Bot visible', 'BOT_VIS' => 'Bot visible',
'BOT_VIS_EXPLAIN' => 'Allow bot to be seen by all users in online lists.', 'BOT_VIS_EXPLAIN' => 'Allow bot to be seen by all users in online lists.',
@ -60,7 +60,8 @@ $lang = array_merge($lang, array(
'ERR_BOT_NO_IP' => 'The IP addresses you supplied were invalid or the hostname could not be resolved.', 'ERR_BOT_NO_IP' => 'The IP addresses you supplied were invalid or the hostname could not be resolved.',
'ERR_BOT_NO_MATCHES' => 'You must supply at least one of an agent or IP for this bot match.', '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_BOT' => 'Found no bot with the specified ID.',
'NO_BOT_GROUP' => 'Unable to find special bot group.',
)); ));
?> ?>

4
phpBB/language/en/acp/common.php
View file

@ -199,7 +199,7 @@ $lang = array_merge($lang, array(
'BACK' => 'Back', 'BACK' => 'Back',
'COLOUR_SWATCH' => 'Web-safe colour swatch', 'COLOUR_SWATCH' => 'Web-safe colour swatch',
'CONFIG_UPDATED' => 'Configuration updated successfully', 'CONFIG_UPDATED' => 'Configuration updated successfully.',
'CONFIRM_OPERATION' => 'Are you sure you wish to carry out this operation?', 'CONFIRM_OPERATION' => 'Are you sure you wish to carry out this operation?',
'DEACTIVATE' => 'Deactivate', 'DEACTIVATE' => 'Deactivate',
@ -250,6 +250,7 @@ $lang = array_merge($lang, array(
'PERMISSIONS_TRANSFERED' => 'Permissions transfered', 'PERMISSIONS_TRANSFERED' => 'Permissions transfered',
'PERMISSIONS_TRANSFERED_EXPLAIN' => 'You are currently having the permissions from %1$s. You are able to browse the forum with the users permissions but not access the administration control panel since admin permissions were not transfered. You are able to <a href="%2$s"><strong>revert to your permission set</strong></a> at any time.', 'PERMISSIONS_TRANSFERED_EXPLAIN' => 'You are currently having the permissions from %1$s. You are able to browse the forum with the users permissions but not access the administration control panel since admin permissions were not transfered. You are able to <a href="%2$s"><strong>revert to your permission set</strong></a> at any time.',
'PROCEED_TO_ACP' => '%sProceed to the ACP%s', 'PROCEED_TO_ACP' => '%sProceed to the ACP%s',
'REMIND' => 'Remind', 'REMIND' => 'Remind',
'REORDER' => 'Reorder', 'REORDER' => 'Reorder',
'RESYNC' => 'Resyncronise', 'RESYNC' => 'Resyncronise',
@ -352,6 +353,7 @@ $lang = array_merge($lang, array(
'SORT_REASON' => 'Reason', 'SORT_REASON' => 'Reason',
'SORT_REG_DATE' => 'Registration date', 'SORT_REG_DATE' => 'Registration date',
)); ));
// Log Entries // Log Entries
$lang = array_merge($lang, array( $lang = array_merge($lang, array(
'LOG_ACL_ADD_USER_GLOBAL_U_' => '<strong>Added or edited users user permissions</strong><br />» %s', 'LOG_ACL_ADD_USER_GLOBAL_U_' => '<strong>Added or edited users user permissions</strong><br />» %s',

47
phpBB/language/en/acp/database.php
View file

@ -28,33 +28,38 @@ if (empty($lang) || !is_array($lang))
// equally where a string contains only two placeholders which are used to wrap text // 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 // in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
// Banning // Database Backup/Restore
$lang = array_merge($lang, array( $lang = array_merge($lang, array(
'DATABASE' => 'Database utilities',
'ACP_BACKUP_EXPLAIN' => 'Here you can backup all your phpBB related data. You may store the resulting archive in your <samp>store/</samp> folder or download it directly. Depending on your server configuration you be able to compress the file in a number of formats.', 'ACP_BACKUP_EXPLAIN' => 'Here you can backup all your phpBB related data. You may store the resulting archive in your <samp>store/</samp> folder or download it directly. Depending on your server configuration you be able to compress the file in a number of formats.',
'BACKUP_OPTIONS' => 'Backup options',
'BACKUP_TYPE' => 'Backup type',
'BACKUP_INVALID' => 'The selected file to backup is invalid',
'START_BACKUP' => 'Start backup',
'FULL_BACKUP' => 'Full',
'STRUCTURE_ONLY' => 'Structure only',
'DATA_ONLY' => 'Data only',
'TABLE_SELECT' => 'Table select',
'FILE_TYPE' => 'File type',
'STORE_LOCAL' => 'Store file locally',
'SELECT_ALL' => 'Select all',
'DESELECT_ALL' => 'Deselect all',
'BACKUP_SUCCESS' => 'The backup file has been created successfully',
'BACKUP_DELETE' => 'The backup file has been deleted successfully',
'STORE_AND_DOWNLOAD' => 'Store and download',
'ACP_RESTORE_EXPLAIN' => 'This will perform a full restore of all phpBB tables from a saved file. If your server supports it you may use a gzip or bzip2 compressed text file and it will automatically be decompressed. <strong>WARNING</strong> This will overwrite any existing data. The restore may take a long time to process please do not move from this page till it is complete.', 'ACP_RESTORE_EXPLAIN' => 'This will perform a full restore of all phpBB tables from a saved file. If your server supports it you may use a gzip or bzip2 compressed text file and it will automatically be decompressed. <strong>WARNING</strong> This will overwrite any existing data. The restore may take a long time to process please do not move from this page till it is complete.',
'SELECT_FILE' => 'Select a file',
'RESTORE_OPTIONS' => 'Restore options', 'BACKUP_DELETE' => 'The backup file has been deleted successfully.',
'START_RESTORE' => 'Start restore', 'BACKUP_INVALID' => 'The selected file to backup is invalid.',
'BACKUP_OPTIONS' => 'Backup options',
'BACKUP_SUCCESS' => 'The backup file has been created successfully.',
'BACKUP_TYPE' => 'Backup type',
'DATABASE' => 'Database utilities',
'DATA_ONLY' => 'Data only',
'DELETE_BACKUP' => 'Delete backup', 'DELETE_BACKUP' => 'Delete backup',
'DESELECT_ALL' => 'Deselect all',
'DOWNLOAD_BACKUP' => 'Download backup', 'DOWNLOAD_BACKUP' => 'Download backup',
'FILE_TYPE' => 'File type',
'FULL_BACKUP' => 'Full',
'RESTORE_OPTIONS' => 'Restore options',
'RESTORE_SUCCESS' => 'The database has been successfully restored.<br /><br />Your board should be back to the state it was when the backup was made.', 'RESTORE_SUCCESS' => 'The database has been successfully restored.<br /><br />Your board should be back to the state it was when the backup was made.',
'SELECT_ALL' => 'Select all',
'SELECT_FILE' => 'Select a file',
'START_BACKUP' => 'Start backup',
'START_RESTORE' => 'Start restore',
'STORE_AND_DOWNLOAD' => 'Store and download',
'STORE_LOCAL' => 'Store file locally',
'STRUCTURE_ONLY' => 'Structure only',
'TABLE_SELECT' => 'Table select',
)); ));
?> ?>

8
phpBB/language/en/acp/forums.php
View file

@ -68,7 +68,7 @@ $lang = array_merge($lang, array(
'FORUM_DATA_NEGATIVE' => 'Pruning parameters cannot be negative.', 'FORUM_DATA_NEGATIVE' => 'Pruning parameters cannot be negative.',
'FORUM_DELETE' => 'Delete forum', '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_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_DELETED' => 'Forum successfully deleted.',
'FORUM_DESC' => 'Description', 'FORUM_DESC' => 'Description',
'FORUM_DESC_EXPLAIN' => 'Any markup entered here will displayed as is.', '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_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.',
@ -113,10 +113,10 @@ $lang = array_merge($lang, array(
'NO_FORUM_ACTION' => 'No action defined for what happens with the forum content', 'NO_FORUM_ACTION' => 'No action defined for what happens with the forum content',
'NO_PARENT' => 'No parent', 'NO_PARENT' => 'No parent',
'NO_PERMISSIONS' => 'Do not copy permissions', 'NO_PERMISSIONS' => 'Do not copy permissions',
'NO_PERMISSION_FORUM_ADD' => 'You do not have the necessary permissions to add forums', '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', 'NO_PERMISSION_FORUM_DELETE' => 'You do not have the necessary permissions to delete forums.',
'PARENT_NOT_EXIST' => 'Parent does not exist', 'PARENT_NOT_EXIST' => 'Parent does not exist.',
'PRUNE_ANNOUNCEMENTS' => 'Prune announcements', 'PRUNE_ANNOUNCEMENTS' => 'Prune announcements',
'PRUNE_STICKY' => 'Prune stickies', 'PRUNE_STICKY' => 'Prune stickies',
'PRUNE_OLD_POLLS' => 'Prune old polls', 'PRUNE_OLD_POLLS' => 'Prune old polls',

15
phpBB/language/en/acp/groups.php
View file

@ -48,11 +48,11 @@ $lang = array_merge($lang, array(
'GROUP_CLOSED' => 'Closed', 'GROUP_CLOSED' => 'Closed',
'GROUP_COLOR' => 'Group colour', 'GROUP_COLOR' => 'Group colour',
'GROUP_COLOR_EXPLAIN' => 'Defines the colour members usernames will appear in, leave blank for user default.', 'GROUP_COLOR_EXPLAIN' => 'Defines the colour members usernames will appear in, leave blank for user default.',
'GROUP_CREATED' => 'Group has been created successfully', 'GROUP_CREATED' => 'Group has been created successfully.',
'GROUP_DEFAULT' => 'Default', 'GROUP_DEFAULT' => 'Default',
'GROUP_DEFS_UPDATED' => 'Default group set for all selected members', 'GROUP_DEFS_UPDATED' => 'Default group set for all selected members.',
'GROUP_DELETE' => 'Delete', 'GROUP_DELETE' => 'Delete',
'GROUP_DELETED' => 'Group deleted and user default groups set successfully', 'GROUP_DELETED' => 'Group deleted and user default groups set successfully.',
'GROUP_DEMOTE' => 'Demote', 'GROUP_DEMOTE' => 'Demote',
'GROUP_DESC' => 'Group description', 'GROUP_DESC' => 'Group description',
'GROUP_DETAILS' => 'Group details', 'GROUP_DETAILS' => 'Group details',
@ -71,8 +71,8 @@ $lang = array_merge($lang, array(
'GROUP_MESSAGE_LIMIT' => 'Group private message limit per folder', 'GROUP_MESSAGE_LIMIT' => 'Group private message limit per folder',
'GROUP_MESSAGE_LIMIT_EXPLAIN' => 'This setting overrides the per-user folder message limit. A value of 0 means the user default limit will be used.', 'GROUP_MESSAGE_LIMIT_EXPLAIN' => 'This setting overrides the per-user folder message limit. A value of 0 means the user default limit will be used.',
'GROUP_MODS_ADDED' => 'New group moderators added successfully.', 'GROUP_MODS_ADDED' => 'New group moderators added successfully.',
'GROUP_MODS_DEMOTED' => 'Group leaders demoted successfully', 'GROUP_MODS_DEMOTED' => 'Group leaders demoted successfully.',
'GROUP_MODS_PROMOTED' => 'Group members promoted successfully', 'GROUP_MODS_PROMOTED' => 'Group members promoted successfully.',
'GROUP_NAME' => 'Group name', 'GROUP_NAME' => 'Group name',
'GROUP_OPEN' => 'Open', 'GROUP_OPEN' => 'Open',
'GROUP_PENDING' => 'Pending members', 'GROUP_PENDING' => 'Pending members',
@ -89,13 +89,14 @@ $lang = array_merge($lang, array(
'GROUP_UPDATED' => 'Group preferences updated successfully.', 'GROUP_UPDATED' => 'Group preferences updated successfully.',
'GROUP_USERS_ADDED' => 'New users added to group successfully.', 'GROUP_USERS_ADDED' => 'New users added to group successfully.',
'GROUP_USERS_EXIST' => 'The selected users are already members.', 'GROUP_USERS_EXIST' => 'The selected users are already members.',
'GROUP_USERS_REMOVE' => 'Users removed from group and new defaults set successfully', 'GROUP_USERS_REMOVE' => 'Users removed from group and new defaults set successfully.',
'MAKE_DEFAULT_FOR_ALL' => 'Make default group for every member', 'MAKE_DEFAULT_FOR_ALL' => 'Make default group for every member',
'MEMBERS' => 'Members', 'MEMBERS' => 'Members',
'NO_GROUP' => 'No group specified', 'NO_GROUP' => 'No group specified.',
'NO_PERMISSIONS' => 'Do not copy permissions', 'NO_PERMISSIONS' => 'Do not copy permissions',
'NO_USERS' => 'You haven’t entered any users.',
'SPECIAL_GROUPS' => 'Predefined groups', 'SPECIAL_GROUPS' => 'Predefined groups',
'SPECIAL_GROUPS_EXPLAIN' => 'Pre-defined groups are special groups, they cannot be deleted or directly modified. However you can still add users and alter basic settings. By clicking “Default” you can set the relevant group to the default for all its members.', 'SPECIAL_GROUPS_EXPLAIN' => 'Pre-defined groups are special groups, they cannot be deleted or directly modified. However you can still add users and alter basic settings. By clicking “Default” you can set the relevant group to the default for all its members.',

10
phpBB/language/en/acp/language.php
View file

@ -45,7 +45,7 @@ $lang = array_merge($lang, array(
'INVALID_LANGUAGE_PACK' => 'The selected language pack seems to be not valid. Please verify the language pack and upload it again if necessary.', 'INVALID_LANGUAGE_PACK' => 'The selected language pack seems to be not valid. Please verify the language pack and upload it again if necessary.',
'INVALID_UPLOAD_METHOD' => 'The selected upload method is not valid, please choose a different method.', 'INVALID_UPLOAD_METHOD' => 'The selected upload method is not valid, please choose a different method.',
'LANGUAGE_DETAILS_UPDATED' => 'Language details successfully updated', 'LANGUAGE_DETAILS_UPDATED' => 'Language details successfully updated.',
'LANGUAGE_ENTRIES' => 'Language Entries', 'LANGUAGE_ENTRIES' => 'Language Entries',
'LANGUAGE_ENTRIES_EXPLAIN' => 'Here you are able to change existing language pack entries or not already translated ones.<br /><strong>Note:</strong> Once you changed a language file, the changes will be stored within a seperate folder for you to download. The changes will not be seen by your users until you replace the original language files at your webspace (by uploading them).', 'LANGUAGE_ENTRIES_EXPLAIN' => 'Here you are able to change existing language pack entries or not already translated ones.<br /><strong>Note:</strong> Once you changed a language file, the changes will be stored within a seperate folder for you to download. The changes will not be seen by your users until you replace the original language files at your webspace (by uploading them).',
'LANGUAGE_FILES' => 'Language files', 'LANGUAGE_FILES' => 'Language files',
@ -69,7 +69,8 @@ $lang = array_merge($lang, array(
'MISSING_LANG_VARIABLES' => 'Missing language variables', 'MISSING_LANG_VARIABLES' => 'Missing language variables',
'MODS_FILES' => 'MODs language files', 'MODS_FILES' => 'MODs language files',
'NO_LANG_ID' => 'You haven’t specified a language pack', 'NO_FILE_SELECTED' => 'You haven’t specified a language file.',
'NO_LANG_ID' => 'You haven’t specified a language pack.',
'NO_REMOVE_DEFAULT_LANG' => 'You are not able to remove the default language pack.<br />If you want to remove this language pack, change your boards default language first.', 'NO_REMOVE_DEFAULT_LANG' => 'You are not able to remove the default language pack.<br />If you want to remove this language pack, change your boards default language first.',
'NO_UNINSTALLED_LANGUAGE_PACKS' => 'No uninstalled language packs', 'NO_UNINSTALLED_LANGUAGE_PACKS' => 'No uninstalled language packs',
@ -84,11 +85,12 @@ $lang = array_merge($lang, array(
'UNINSTALLED_LANGUAGE_PACKS' => 'Uninstalled language packs', 'UNINSTALLED_LANGUAGE_PACKS' => 'Uninstalled language packs',
'UPLOAD_COMPLETED' => 'The upload has completed', 'UNABLE_TO_WRITE_FILE' => 'The file could not be written to %s.',
'UPLOAD_COMPLETED' => 'The upload was completed successfully.',
'UPLOAD_METHOD' => 'Upload method', 'UPLOAD_METHOD' => 'Upload method',
'UPLOAD_SETTINGS' => 'Upload settings', 'UPLOAD_SETTINGS' => 'Upload settings',
'WRONG_LANGUAGE_FILE' => 'Selected language file is invalid', 'WRONG_LANGUAGE_FILE' => 'Selected language file is invalid.',
)); ));
?> ?>

14
phpBB/language/en/acp/modules.php
View file

@ -54,24 +54,24 @@ $lang = array_merge($lang, array(
'HIDDEN_MODULE' => 'Hidden module', 'HIDDEN_MODULE' => 'Hidden module',
'MODULE' => 'Module', 'MODULE' => 'Module',
'MODULE_ADDED' => 'Module successfully added', 'MODULE_ADDED' => 'Module successfully added.',
'MODULE_DELETED' => 'Module successfully removed', 'MODULE_DELETED' => 'Module successfully removed.',
'MODULE_DISPLAYED' => 'Module displayed', 'MODULE_DISPLAYED' => 'Module displayed',
'MODULE_DISPLAYED_EXPLAIN' => 'If you do not wish to display this module, but want to use it, set this to no.', 'MODULE_DISPLAYED_EXPLAIN' => 'If you do not wish to display this module, but want to use it, set this to no.',
'MODULE_EDITED' => 'Module successfully edited', 'MODULE_EDITED' => 'Module successfully edited.',
'MODULE_ENABLED' => 'Module enabled', 'MODULE_ENABLED' => 'Module enabled',
'MODULE_LANGNAME' => 'Module language mame', 'MODULE_LANGNAME' => 'Module language mame',
'MODULE_LANGNAME_EXPLAIN' => 'Enter the displayed module name. Use language constant if name is served from language file.', 'MODULE_LANGNAME_EXPLAIN' => 'Enter the displayed module name. Use language constant if name is served from language file.',
'MODULE_TYPE' => 'Module type', 'MODULE_TYPE' => 'Module type',
'NO_CATEGORY_TO_MODULE' => 'Unable to turn category into module. Please remove/move all childs before performing this action.', 'NO_CATEGORY_TO_MODULE' => 'Unable to turn category into module. Please remove/move all childs before performing this action.',
'NO_MODULE' => 'No module found', 'NO_MODULE' => 'No module found.',
'NO_MODULE_ID' => 'No module id specified', 'NO_MODULE_ID' => 'No module id specified.',
'NO_MODULE_LANGNAME' => 'No module language name specified', 'NO_MODULE_LANGNAME' => 'No module language name specified.',
'NO_PARENT' => 'No Parent', 'NO_PARENT' => 'No Parent',
'PARENT' => 'Parent', 'PARENT' => 'Parent',
'PARENT_NO_EXIST' => 'Parent does not exist', 'PARENT_NO_EXIST' => 'Parent does not exist.',
'SELECT_MODULE' => 'Select a module', 'SELECT_MODULE' => 'Select a module',
)); ));

10
phpBB/language/en/acp/permissions.php
View file

@ -101,7 +101,7 @@ $lang = array_merge($lang, array(
'APPLY_ALL_PERMISSIONS' => 'Apply all permissions', 'APPLY_ALL_PERMISSIONS' => 'Apply all permissions',
'APPLY_PERMISSIONS' => 'Apply permissions', 'APPLY_PERMISSIONS' => 'Apply permissions',
'APPLY_PERMISSIONS_EXPLAIN' => 'The permissions and role defined for this item will only be applied to this item and all checked items.', 'APPLY_PERMISSIONS_EXPLAIN' => 'The permissions and role defined for this item will only be applied to this item and all checked items.',
'AUTH_UPDATED' => 'Permissions have been updated', 'AUTH_UPDATED' => 'Permissions have been updated.',
'CREATE_ROLE' => 'Create role', 'CREATE_ROLE' => 'Create role',
'CREATE_ROLE_FROM' => 'Use settings from…', 'CREATE_ROLE_FROM' => 'Use settings from…',
@ -175,9 +175,9 @@ $lang = array_merge($lang, array(
'ROLE_NAME_ALREADY_EXIST' => 'A role named <strong>%s</strong> already exist for the specified permission type.', 'ROLE_NAME_ALREADY_EXIST' => 'A role named <strong>%s</strong> already exist for the specified permission type.',
'ROLE_NOT_ASSIGNED' => 'Role has not been assigned yet.', 'ROLE_NOT_ASSIGNED' => 'Role has not been assigned yet.',
'SELECTED_FORUM_NOT_EXIST' => 'The selected forum(s) do not exist', 'SELECTED_FORUM_NOT_EXIST' => 'The selected forum(s) do not exist.',
'SELECTED_GROUP_NOT_EXIST' => 'The selected group(s) do not exist', 'SELECTED_GROUP_NOT_EXIST' => 'The selected group(s) do not exist.',
'SELECTED_USER_NOT_EXIST' => 'The selected user(s) do not exist', 'SELECTED_USER_NOT_EXIST' => 'The selected user(s) do not exist.',
'SELECT_FORUM_SUBFORUM_EXPLAIN' => 'The forum you select here will include all subforums into the selection', 'SELECT_FORUM_SUBFORUM_EXPLAIN' => 'The forum you select here will include all subforums into the selection',
'SELECT_ROLE' => 'Select role…', 'SELECT_ROLE' => 'Select role…',
'SELECT_TYPE' => 'Select type', 'SELECT_TYPE' => 'Select type',
@ -221,7 +221,7 @@ $lang = array_merge($lang, array(
'VIEW_ASSIGNED_ITEMS' => 'View assigned items', 'VIEW_ASSIGNED_ITEMS' => 'View assigned items',
'VIEW_PERMISSIONS' => 'View permissions', 'VIEW_PERMISSIONS' => 'View permissions',
'WRONG_PERMISSION_TYPE' => 'Wrong permission type selected', 'WRONG_PERMISSION_TYPE' => 'Wrong permission type selected.',
)); ));
?> ?>

38
phpBB/language/en/acp/posting.php
View file

@ -36,10 +36,10 @@ $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. From this page you can add, remove and edit custom BBCodes', 'ACP_BBCODES_EXPLAIN' => 'BBCode is a special implementation of HTML offering greater control over what and how something is displayed. From this page you can add, remove and edit custom BBCodes',
'ADD_BBCODE' => 'Add a new BBCode', 'ADD_BBCODE' => 'Add a new BBCode',
'BBCODE_ADDED' => 'BBCode added successfully', 'BBCODE_ADDED' => 'BBCode added successfully.',
'BBCODE_EDITED' => 'BBCode edited successfully', 'BBCODE_EDITED' => 'BBCode edited successfully.',
'BBCODE_INVALID_TAG_NAME' => 'The BBCode tag name that you selected already exists', 'BBCODE_INVALID_TAG_NAME' => 'The BBCode tag name that you selected already exists.',
'BBCODE_NOT_EXIST' => 'The BBCode you selected does not exist', 'BBCODE_NOT_EXIST' => 'The BBCode you selected does not exist.',
'BBCODE_HELPLINE' => 'Helpline', 'BBCODE_HELPLINE' => 'Helpline',
'BBCODE_HELPLINE_EXPLAIN' => 'This field contains the mouseover text of the BBCode', 'BBCODE_HELPLINE_EXPLAIN' => 'This field contains the mouseover text of the BBCode',
'BBCODE_HELPLINE_TEXT' => 'Helpline text', 'BBCODE_HELPLINE_TEXT' => 'Helpline text',
@ -60,7 +60,7 @@ $lang = array_merge($lang, array(
'TOKENS' => 'Tokens', '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 of lang 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 "wrote" 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. {USERNAME1}, {USERNAME2}.<br /><br />In addition to these tokens you can use any of lang 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 "wrote" or its translation according to user’s locale',
'TOKEN_DEFINITION' => 'What can it be?', 'TOKEN_DEFINITION' => 'What can it be?',
'TOO_MANY_BBCODES' => 'You cannot create any more BBCodes. Please remove one or more BBCodes then try again', 'TOO_MANY_BBCODES' => 'You cannot create any more BBCodes. Please remove one or more BBCodes then try again.',
'tokens' => array( 'tokens' => array(
'TEXT' => 'Any text, including foreign characters, numbers, etc…', 'TEXT' => 'Any text, including foreign characters, numbers, etc…',
@ -108,7 +108,7 @@ $lang = array_merge($lang, array(
'ICONS_HEIGHT' => 'Icon height', 'ICONS_HEIGHT' => 'Icon height',
'ICONS_IMAGE' => 'Icon image', 'ICONS_IMAGE' => 'Icon image',
'ICONS_IMPORTED' => 'The icons pack has been installed successfully.', 'ICONS_IMPORTED' => 'The icons pack has been installed successfully.',
'ICONS_IMPORT_SUCCESS' => 'The icons pack was imported successfully', 'ICONS_IMPORT_SUCCESS' => 'The icons pack was imported successfully.',
'ICONS_LOCATION' => 'Icon location', 'ICONS_LOCATION' => 'Icon location',
'ICONS_NOT_DISPLAYED' => 'The following icons are not displayed on the posting page', 'ICONS_NOT_DISPLAYED' => 'The following icons are not displayed on the posting page',
'ICONS_ORDER' => 'Icon order', 'ICONS_ORDER' => 'Icon order',
@ -126,7 +126,7 @@ $lang = array_merge($lang, array(
'NO_SMILIES_EXPORT' => 'You have no smilies with which to create a package.', 'NO_SMILIES_EXPORT' => 'You have no smilies with which to create a package.',
'NO_SMILIES_PAK' => 'No smiley packages found.', 'NO_SMILIES_PAK' => 'No smiley packages found.',
'PAK_FILE_NOT_READABLE' => 'Could not read pak file', 'PAK_FILE_NOT_READABLE' => 'Could not read pak file.',
'REPLACE_MATCHES' => 'Replace matches', 'REPLACE_MATCHES' => 'Replace matches',
@ -142,7 +142,7 @@ $lang = array_merge($lang, array(
'SMILIES_HEIGHT' => 'Smiley height', 'SMILIES_HEIGHT' => 'Smiley height',
'SMILIES_IMAGE' => 'Smiley image', 'SMILIES_IMAGE' => 'Smiley image',
'SMILIES_IMPORTED' => 'The smilies pack has been installed successfully.', 'SMILIES_IMPORTED' => 'The smilies pack has been installed successfully.',
'SMILIES_IMPORT_SUCCESS' => 'The smilies pack was imported successfully', 'SMILIES_IMPORT_SUCCESS' => 'The smilies pack was imported successfully.',
'SMILIES_LOCATION' => 'Smiley location', 'SMILIES_LOCATION' => 'Smiley location',
'SMILIES_NOT_DISPLAYED' => 'The following smilies are not displayed on the posting page', 'SMILIES_NOT_DISPLAYED' => 'The following smilies are not displayed on the posting page',
'SMILIES_ORDER' => 'Smiley order', 'SMILIES_ORDER' => 'Smiley order',
@ -158,18 +158,18 @@ $lang = array_merge($lang, array(
'ADD_WORD' => 'Add new word', 'ADD_WORD' => 'Add new word',
'EDIT_WORD' => 'Edit word censor', 'EDIT_WORD' => 'Edit word censor',
'ENTER_WORD' => 'You must enter a word and its replacement', 'ENTER_WORD' => 'You must enter a word and its replacement.',
'NO_WORD' => 'No word selected for editing', 'NO_WORD' => 'No word selected for editing.',
'REPLACEMENT' => 'Replacement', 'REPLACEMENT' => 'Replacement',
'UPDATE_WORD' => 'Update word censor', 'UPDATE_WORD' => 'Update word censor',
'WORD' => 'Word', 'WORD' => 'Word',
'WORD_ADDED' => 'The word censor has been successfully added', 'WORD_ADDED' => 'The word censor has been successfully added.',
'WORD_REMOVED' => 'The selected word censor has been successfully removed', 'WORD_REMOVED' => 'The selected word censor has been successfully removed.',
'WORD_UPDATED' => 'The selected word censor has been successfully updated', 'WORD_UPDATED' => 'The selected word censor has been successfully updated.',
)); ));
// Ranks // Ranks
@ -202,8 +202,8 @@ $lang = array_merge($lang, array(
'DELETE_DISALLOW_EXPLAIN' => 'You can remove a disallowed username by selecting the username from this list and clicking submit', 'DELETE_DISALLOW_EXPLAIN' => 'You can remove a disallowed username by selecting the username from this list and clicking submit',
'DELETE_DISALLOW_TITLE' => 'Remove a disallowed username', 'DELETE_DISALLOW_TITLE' => 'Remove a disallowed username',
'DISALLOWED_ALREADY' => 'The name you entered could not be disallowed. It either already exists in the list, exists in the word censor list, or a matching username is present.', 'DISALLOWED_ALREADY' => 'The name you entered could not be disallowed. It either already exists in the list, exists in the word censor list, or a matching username is present.',
'DISALLOWED_DELETED' => 'The disallowed username has been successfully removed', 'DISALLOWED_DELETED' => 'The disallowed username has been successfully removed.',
'DISALLOW_SUCCESSFUL' => 'The disallowed username has been successfully added', 'DISALLOW_SUCCESSFUL' => 'The disallowed username has been successfully added.',
'NO_DISALLOWED' => 'No disallowed usernames', 'NO_DISALLOWED' => 'No disallowed usernames',
'NO_USERNAME_SPECIFIED' => 'You haven’t selected or entered a username to operate with.', 'NO_USERNAME_SPECIFIED' => 'You haven’t selected or entered a username to operate with.',
@ -218,19 +218,19 @@ $lang = array_merge($lang, array(
'IS_NOT_TRANSLATED' => 'Reason has not been localised', 'IS_NOT_TRANSLATED' => 'Reason has not been localised',
'IS_TRANSLATED' => 'Reason has been localised', 'IS_TRANSLATED' => 'Reason has been localised',
'NO_REASON' => 'Reason could not be found', 'NO_REASON' => 'Reason could not be found.',
'NO_REASON_INFO' => 'You have to specify a title and a description for this reason.', 'NO_REASON_INFO' => 'You have to specify a title and a description for this reason.',
'NO_REMOVE_DEFAULT_REASON' => 'You are not able to remove the default reason "Other".', 'NO_REMOVE_DEFAULT_REASON' => 'You are not able to remove the default reason "Other".',
'REASON_ADD' => 'Add report/denial reason', 'REASON_ADD' => 'Add report/denial reason',
'REASON_ADDED' => 'Report/denial reason successfully added', 'REASON_ADDED' => 'Report/denial reason successfully added.',
'REASON_ALREADY_EXIST' => 'A reason with this title already exist, please enter another title for this reason.', 'REASON_ALREADY_EXIST' => 'A reason with this title already exist, please enter another title for this reason.',
'REASON_DESCRIPTION' => 'Reason description', 'REASON_DESCRIPTION' => 'Reason description',
'REASON_EDIT' => 'Edit report/denial reason', 'REASON_EDIT' => 'Edit report/denial reason',
'REASON_EDIT_EXPLAIN' => 'Here you are able to add or edit a reason. If the reason is translated the localized version is used instead of the description entered here.', 'REASON_EDIT_EXPLAIN' => 'Here you are able to add or edit a reason. If the reason is translated the localized version is used instead of the description entered here.',
'REASON_REMOVED' => 'Report/denial reason successfully removed', 'REASON_REMOVED' => 'Report/denial reason successfully removed.',
'REASON_TITLE' => 'Reason Title', 'REASON_TITLE' => 'Reason Title',
'REASON_UPDATED' => 'Report/denial reason successfully updated', 'REASON_UPDATED' => 'Report/denial reason successfully updated.',
'USED_IN_REPORTS' => 'Used in reports', 'USED_IN_REPORTS' => 'Used in reports',
)); ));

15
phpBB/language/en/acp/profile.php
View file

@ -32,7 +32,7 @@ if (empty($lang) || !is_array($lang))
// Custom profile fields // Custom profile fields
$lang = array_merge($lang, array( $lang = array_merge($lang, array(
'ADDED_PROFILE_FIELD' => 'Successfully added custom profile field', 'ADDED_PROFILE_FIELD' => 'Successfully added custom profile field.',
'ALPHA_ONLY' => 'Alphanumeric only', 'ALPHA_ONLY' => 'Alphanumeric only',
'ALPHA_SPACERS' => 'Alphanumeric and spacers', 'ALPHA_SPACERS' => 'Alphanumeric and spacers',
'ALWAYS_TODAY' => 'Always the current date', 'ALWAYS_TODAY' => 'Always the current date',
@ -40,7 +40,7 @@ $lang = array_merge($lang, array(
'BOOL_ENTRIES_EXPLAIN' => 'Enter your options now', 'BOOL_ENTRIES_EXPLAIN' => 'Enter your options now',
'BOOL_TYPE_EXPLAIN' => 'Define the type, either a checkbox or radio buttons', 'BOOL_TYPE_EXPLAIN' => 'Define the type, either a checkbox or radio buttons',
'CHANGED_PROFILE_FIELD' => 'Successfully changed profile field', 'CHANGED_PROFILE_FIELD' => 'Successfully changed profile field.',
'CHARS_ANY' => 'Any character', 'CHARS_ANY' => 'Any character',
'CHECKBOX' => 'Checkbox', 'CHECKBOX' => 'Checkbox',
'CP_LANG_DEFAULT_VALUE' => 'Default value', 'CP_LANG_DEFAULT_VALUE' => 'Default value',
@ -52,6 +52,7 @@ $lang = array_merge($lang, array(
'COLUMNS' => 'Columns', 'COLUMNS' => 'Columns',
'DEFAULT_ISO_LANGUAGE' => 'Default language [%s]', 'DEFAULT_ISO_LANGUAGE' => 'Default language [%s]',
'DEFAULT_LANGUAGE_NOT_FILLED' => 'The language entries for the default language are not filled for this profile field.',
'DEFAULT_VALUE' => 'Default value', 'DEFAULT_VALUE' => 'Default value',
'DELETE_PROFILE_FIELD' => 'Remove profile field', 'DELETE_PROFILE_FIELD' => 'Remove profile field',
'DELETE_PROFILE_FIELD_CONFIRM' => 'Are you sure you want to delete this profile field?', 'DELETE_PROFILE_FIELD_CONFIRM' => 'Are you sure you want to delete this profile field?',
@ -79,7 +80,7 @@ $lang = array_merge($lang, array(
'FIELD_IDENT_EXPLAIN' => 'The field identification is a name to identify the profile field within the database and the templates.', 'FIELD_IDENT_EXPLAIN' => 'The field identification is a name to identify the profile field within the database and the templates.',
'FIELD_INT' => 'Numbers', 'FIELD_INT' => 'Numbers',
'FIELD_LENGTH' => 'Length of input box', 'FIELD_LENGTH' => 'Length of input box',
'FIELD_NOT_FOUND' => 'Profile field not found', 'FIELD_NOT_FOUND' => 'Profile field not found.',
'FIELD_STRING' => 'Single textfield', 'FIELD_STRING' => 'Single textfield',
'FIELD_TEXT' => 'Textarea', 'FIELD_TEXT' => 'Textarea',
'FIELD_TYPE' => 'Field type', 'FIELD_TYPE' => 'Field type',
@ -101,16 +102,16 @@ $lang = array_merge($lang, array(
'MIN_FIELD_NUMBER' => 'Lowest allowed number', 'MIN_FIELD_NUMBER' => 'Lowest allowed number',
'NO_FIELD_ENTRIES' => 'No entries defined', 'NO_FIELD_ENTRIES' => 'No entries defined',
'NO_FIELD_ID' => 'No field id specified', 'NO_FIELD_ID' => 'No field id specified.',
'NO_FIELD_TYPE' => 'No Field type specified', 'NO_FIELD_TYPE' => 'No Field type specified.',
'NO_VALUE_OPTION' => 'Option equal to non entered value', 'NO_VALUE_OPTION' => 'Option equal to non entered value',
'NO_VALUE_OPTION_EXPLAIN' => 'Value for a non-entry. If the field is required, the user gets an error if he choose the option selected here', 'NO_VALUE_OPTION_EXPLAIN' => 'Value for a non-entry. If the field is required, the user gets an error if he choose the option selected here',
'NUMBERS_ONLY' => 'Only numbers (0-9)', 'NUMBERS_ONLY' => 'Only numbers (0-9)',
'PREVIEW_PROFILE_FIELD' => 'Preview profile field', 'PREVIEW_PROFILE_FIELD' => 'Preview profile field',
'PROFILE_BASIC_OPTIONS' => 'Basic options', 'PROFILE_BASIC_OPTIONS' => 'Basic options',
'PROFILE_FIELD_ACTIVATED' => 'Profile field successfully activated', 'PROFILE_FIELD_ACTIVATED' => 'Profile field successfully activated.',
'PROFILE_FIELD_DEACTIVATED' => 'Profile field successfully deactivated', 'PROFILE_FIELD_DEACTIVATED' => 'Profile field successfully deactivated.',
'PROFILE_LANG_OPTIONS' => 'Language specific options', 'PROFILE_LANG_OPTIONS' => 'Language specific options',
'PROFILE_TYPE_OPTIONS' => 'Profile type specific options', 'PROFILE_TYPE_OPTIONS' => 'Profile type specific options',

4
phpBB/language/en/acp/prune.php
View file

@ -46,8 +46,8 @@ $lang = array_merge($lang, array(
'SELECT_USERS_EXPLAIN' => 'Enter specific usernames here, they will be used in preference to the criteria above.', 'SELECT_USERS_EXPLAIN' => 'Enter specific usernames here, they will be used in preference to the criteria above.',
'USER_DEACTIVATE_SUCCESS' => 'The selected users have been deactivated successfully', 'USER_DEACTIVATE_SUCCESS' => 'The selected users have been deactivated successfully.',
'USER_DELETE_SUCCESS' => 'The selected users have been deleted successfully', 'USER_DELETE_SUCCESS' => 'The selected users have been deleted successfully.',
)); ));
// Forum Pruning // Forum Pruning

4
phpBB/language/en/acp/search.php
View file

@ -72,8 +72,8 @@ $lang = array_merge($lang, array(
'SEARCH_GUEST_INTERVAL' => 'Guest search flood interval', 'SEARCH_GUEST_INTERVAL' => 'Guest search flood interval',
'SEARCH_GUEST_INTERVAL_EXPLAIN' => 'Number of seconds guests must wait between searches. If one guest searches all others have to wait until the time interval passed.', 'SEARCH_GUEST_INTERVAL_EXPLAIN' => 'Number of seconds guests must wait between searches. If one guest searches all others have to wait until the time interval passed.',
'SEARCH_INDEX_CREATED' => 'Successfully indexed all posts in the board database', 'SEARCH_INDEX_CREATED' => 'Successfully indexed all posts in the board database.',
'SEARCH_INDEX_REMOVED' => 'Successfully deleted the search index for this backend', 'SEARCH_INDEX_REMOVED' => 'Successfully deleted the search index for this backend.',
'SEARCH_INTERVAL' => 'User search flood interval', 'SEARCH_INTERVAL' => 'User search flood interval',
'SEARCH_INTERVAL_EXPLAIN' => 'Number of seconds users must wait between searches. This interval is checked independendly for each user.', 'SEARCH_INTERVAL_EXPLAIN' => 'Number of seconds users must wait between searches. This interval is checked independendly for each user.',
'SEARCH_STORE_RESULTS' => 'Search result cache length', 'SEARCH_STORE_RESULTS' => 'Search result cache length',

128
phpBB/language/en/acp/styles.php
View file

@ -120,24 +120,24 @@ $lang = array_merge($lang, array(
'IMAGE_NAME' => 'Image name', 'IMAGE_NAME' => 'Image name',
'IMAGE_PARAMETER' => 'Parameter', 'IMAGE_PARAMETER' => 'Parameter',
'IMAGE_VALUE' => 'Value', 'IMAGE_VALUE' => 'Value',
'IMAGESET_ADDED' => 'New imageset added on filesystem', 'IMAGESET_ADDED' => 'New imageset added on filesystem.',
'IMAGESET_ADDED_DB' => 'New imageset added to database', 'IMAGESET_ADDED_DB' => 'New imageset added to database.',
'IMAGESET_DELETED' => 'Imageset deleted successfully', 'IMAGESET_DELETED' => 'Imageset deleted successfully.',
'IMAGESET_DELETED_FS' => 'Imageset removed from database but some files may remain on the filesystem', 'IMAGESET_DELETED_FS' => 'Imageset removed from database but some files may remain on the filesystem.',
'IMAGESET_DETAILS_UPDATED' => 'Imageset details successfully updated', 'IMAGESET_DETAILS_UPDATED' => 'Imageset details successfully updated.',
'IMAGESET_ERR_ARCHIVE' => 'Please select an archive method', 'IMAGESET_ERR_ARCHIVE' => 'Please select an archive method.',
'IMAGESET_ERR_COPY_LONG' => 'The copyright can be no longer than 60 characters', 'IMAGESET_ERR_COPY_LONG' => 'The copyright can be no longer than 60 characters.',
'IMAGESET_ERR_NAME_CHARS' => 'The imageset name can only contain alphanumeric characters, -, +, _ and space', 'IMAGESET_ERR_NAME_CHARS' => 'The imageset name can only contain alphanumeric characters, -, +, _ and space.',
'IMAGESET_ERR_NAME_EXIST' => 'A imageset with that name already exists', 'IMAGESET_ERR_NAME_EXIST' => 'A imageset with that name already exists.',
'IMAGESET_ERR_NAME_LONG' => 'The imageset name can be no longer than 30 characters', 'IMAGESET_ERR_NAME_LONG' => 'The imageset name can be no longer than 30 characters.',
'IMAGESET_ERR_NOT_IMAGESET' => 'The archive you specified does not contain a valid imageset.', 'IMAGESET_ERR_NOT_IMAGESET' => 'The archive you specified does not contain a valid imageset.',
'IMAGESET_ERR_STYLE_NAME' => 'You must supply a name for this imageset', 'IMAGESET_ERR_STYLE_NAME' => 'You must supply a name for this imageset.',
'IMAGESET_EXPORT' => 'Export Imageset', 'IMAGESET_EXPORT' => 'Export Imageset',
'IMAGESET_EXPORT_EXPLAIN' => 'Here you can export an imageset in the form of an archive. This archive will contain all the data necessary to install the set of images on another board. You may select whether to download the file directly or to place it in your store folder for download later or via FTP.', 'IMAGESET_EXPORT_EXPLAIN' => 'Here you can export an imageset in the form of an archive. This archive will contain all the data necessary to install the set of images on another board. You may select whether to download the file directly or to place it in your store folder for download later or via FTP.',
'IMAGESET_EXPORTED' => 'Imageset exported succesfully and stored in %s', 'IMAGESET_EXPORTED' => 'Imageset exported succesfully and stored in %s.',
'IMAGESET_NAME' => 'Imageset Name', 'IMAGESET_NAME' => 'Imageset Name',
'IMAGESET_REFRESHED' => 'Imageset refreshed successfully', 'IMAGESET_REFRESHED' => 'Imageset refreshed successfully.',
'IMAGESET_UPDATED' => 'Imageset updated successfully', 'IMAGESET_UPDATED' => 'Imageset updated successfully.',
'ITALIC' => 'Italic', 'ITALIC' => 'Italic',
'IMG_CAT_BUTTONS' => 'Localised buttons', 'IMG_CAT_BUTTONS' => 'Localised buttons',
@ -282,22 +282,22 @@ $lang = array_merge($lang, array(
'EDITED_IMAGESET' => 'Edited imageset', 'EDITED_IMAGESET' => 'Edited imageset',
'NO_CLASS' => 'Cannot find class in stylesheet', 'NO_CLASS' => 'Cannot find class in stylesheet.',
'NO_IMAGESET' => 'Cannot find imageset on filesystem', 'NO_IMAGESET' => 'Cannot find imageset on filesystem.',
'NO_IMAGE' => 'No Image', 'NO_IMAGE' => 'No Image',
'NO_STYLE' => 'Cannot find style on filesystem', 'NO_STYLE' => 'Cannot find style on filesystem.',
'NO_TEMPLATE' => 'Cannot find template on filesystem', 'NO_TEMPLATE' => 'Cannot find template on filesystem.',
'NO_THEME' => 'Cannot find theme on filesystem', 'NO_THEME' => 'Cannot find theme on filesystem.',
'NO_UNINSTALLED_IMAGESET' => 'No uninstalled imagesets detected', 'NO_UNINSTALLED_IMAGESET' => 'No uninstalled imagesets detected',
'NO_UNINSTALLED_STYLE' => 'No uninstalled styles detected', 'NO_UNINSTALLED_STYLE' => 'No uninstalled styles detected',
'NO_UNINSTALLED_TEMPLATE' => 'No uninstalled templates detected', 'NO_UNINSTALLED_TEMPLATE' => 'No uninstalled templates detected',
'NO_UNINSTALLED_THEME' => 'No uninstalled themes detected', 'NO_UNINSTALLED_THEME' => 'No uninstalled themes detected',
'NO_UNIT' => 'None', 'NO_UNIT' => 'None',
'ONLY_IMAGESET' => 'This is the only remaining imageset, you cannot delete it', 'ONLY_IMAGESET' => 'This is the only remaining imageset, you cannot delete it.',
'ONLY_STYLE' => 'This is the only remaining style, you cannot delete it', 'ONLY_STYLE' => 'This is the only remaining style, you cannot delete it.',
'ONLY_TEMPLATE' => 'This is the only remaining template set, you cannot delete it', 'ONLY_TEMPLATE' => 'This is the only remaining template set, you cannot delete it.',
'ONLY_THEME' => 'This is the only remaining theme, you cannot delete it', 'ONLY_THEME' => 'This is the only remaining theme, you cannot delete it.',
'OPTIONAL_BASIS' => 'Optional basis', 'OPTIONAL_BASIS' => 'Optional basis',
'REFRESH' => 'Refresh', 'REFRESH' => 'Refresh',
@ -333,83 +333,83 @@ $lang = array_merge($lang, array(
'STORE_FILESYSTEM' => 'Filesystem', 'STORE_FILESYSTEM' => 'Filesystem',
'STYLE_ACTIVATE' => 'Activate', 'STYLE_ACTIVATE' => 'Activate',
'STYLE_ACTIVE' => 'Active', 'STYLE_ACTIVE' => 'Active',
'STYLE_ADDED' => 'Style added successfully', 'STYLE_ADDED' => 'Style added successfully.',
'STYLE_DEACTIVATE' => 'Deactivate', 'STYLE_DEACTIVATE' => 'Deactivate',
'STYLE_DEFAULT' => 'Make default style', 'STYLE_DEFAULT' => 'Make default style',
'STYLE_DELETED' => 'Style deleted successfully', 'STYLE_DELETED' => 'Style deleted successfully.',
'STYLE_DETAILS_UPDATED' => 'Style edited successfully', 'STYLE_DETAILS_UPDATED' => 'Style edited successfully.',
'STYLE_ERR_ARCHIVE' => 'Please select an archive method', 'STYLE_ERR_ARCHIVE' => 'Please select an archive method.',
'STYLE_ERR_COPY_LONG' => 'The copyright can be no longer than 60 characters', 'STYLE_ERR_COPY_LONG' => 'The copyright can be no longer than 60 characters.',
'STYLE_ERR_MORE_ELEMENTS' => 'You must select at least one style element.', 'STYLE_ERR_MORE_ELEMENTS' => 'You must select at least one style element.',
'STYLE_ERR_NAME_CHARS' => 'The style name can only contain alphanumeric characters, -, +, _ and space', 'STYLE_ERR_NAME_CHARS' => 'The style name can only contain alphanumeric characters, -, +, _ and space.',
'STYLE_ERR_NAME_EXIST' => 'A style with that name already exists', 'STYLE_ERR_NAME_EXIST' => 'A style with that name already exists.',
'STYLE_ERR_NAME_LONG' => 'The style name can be no longer than 30 characters', 'STYLE_ERR_NAME_LONG' => 'The style name can be no longer than 30 characters.',
'STYLE_ERR_NO_IDS' => 'You must select a template, theme and imageset for this style', 'STYLE_ERR_NO_IDS' => 'You must select a template, theme and imageset for this style.',
'STYLE_ERR_NOT_STYLE' => 'The imported or uploaded file did not contain a valid style archive.', 'STYLE_ERR_NOT_STYLE' => 'The imported or uploaded file did not contain a valid style archive.',
'STYLE_ERR_STYLE_NAME' => 'You must supply a name for this style', 'STYLE_ERR_STYLE_NAME' => 'You must supply a name for this style.',
'STYLE_EXPORT' => 'Export Style', 'STYLE_EXPORT' => 'Export Style',
'STYLE_EXPORT_EXPLAIN' => 'Here you can export a style in the form of an archive. A style does not need to contain all elements but it must contain at least one. For example if you have created a new theme and imageset for a commonly used template you could simply export the theme and imageset and ommit the template. You may select whether to download the file directly or to place it in your store folder for download later or via FTP.', 'STYLE_EXPORT_EXPLAIN' => 'Here you can export a style in the form of an archive. A style does not need to contain all elements but it must contain at least one. For example if you have created a new theme and imageset for a commonly used template you could simply export the theme and imageset and ommit the template. You may select whether to download the file directly or to place it in your store folder for download later or via FTP.',
'STYLE_EXPORTED' => 'Style exported succesfully and stored in %s', 'STYLE_EXPORTED' => 'Style exported succesfully and stored in %s.',
'STYLE_IMAGESET' => 'Imageset', 'STYLE_IMAGESET' => 'Imageset',
'STYLE_NAME' => 'Style name', 'STYLE_NAME' => 'Style name',
'STYLE_TEMPLATE' => 'Template', 'STYLE_TEMPLATE' => 'Template',
'STYLE_THEME' => 'Theme', 'STYLE_THEME' => 'Theme',
'STYLE_USED_BY' => 'Used by', 'STYLE_USED_BY' => 'Used by',
'TEMPLATE_ADDED' => 'Template set added and stored on filesystem', 'TEMPLATE_ADDED' => 'Template set added and stored on filesystem.',
'TEMPLATE_ADDED_DB' => 'Template set added and stored in database', 'TEMPLATE_ADDED_DB' => 'Template set added and stored in database.',
'TEMPLATE_CACHE' => 'Template cache', 'TEMPLATE_CACHE' => 'Template cache',
'TEMPLATE_CACHE_EXPLAIN' => 'By default phpBB caches the compiled version of its templates. This decreases the load on the server each time a page is viewed and thus may reduce the page generation time. Here you can view the cache status of each file and delete individual files or the entire cache.', 'TEMPLATE_CACHE_EXPLAIN' => 'By default phpBB caches the compiled version of its templates. This decreases the load on the server each time a page is viewed and thus may reduce the page generation time. Here you can view the cache status of each file and delete individual files or the entire cache.',
'TEMPLATE_CACHE_CLEARED' => 'Template cache cleared successfully', 'TEMPLATE_CACHE_CLEARED' => 'Template cache cleared successfully.',
'TEMPLATE_CACHE_EMPTY' => 'There are no cached templates.', 'TEMPLATE_CACHE_EMPTY' => 'There are no cached templates.',
'TEMPLATE_DELETED' => 'Template set deleted successfully', 'TEMPLATE_DELETED' => 'Template set deleted successfully.',
'TEMPLATE_DELETED_FS' => 'Template set removed from database but some files may remain on the filesystem', 'TEMPLATE_DELETED_FS' => 'Template set removed from database but some files may remain on the filesystem.',
'TEMPLATE_DETAILS_UPDATED' => 'Template details successfully updated', 'TEMPLATE_DETAILS_UPDATED' => 'Template details successfully updated.',
'TEMPLATE_EDITOR' => 'Raw HTML template editor', 'TEMPLATE_EDITOR' => 'Raw HTML template editor',
'TEMPLATE_EDITOR_HEIGHT' => 'Template editor height', 'TEMPLATE_EDITOR_HEIGHT' => 'Template editor height',
'TEMPLATE_ERR_ARCHIVE' => 'Please select an archive method', 'TEMPLATE_ERR_ARCHIVE' => 'Please select an archive method.',
'TEMPLATE_ERR_CACHE_READ' => 'The cache directory used to store cached versions of template files could not be opened.', 'TEMPLATE_ERR_CACHE_READ' => 'The cache directory used to store cached versions of template files could not be opened.',
'TEMPLATE_ERR_COPY_LONG' => 'The copyright can be no longer than 60 characters', 'TEMPLATE_ERR_COPY_LONG' => 'The copyright can be no longer than 60 characters.',
'TEMPLATE_ERR_NAME_CHARS' => 'The template name can only contain alphanumeric characters, -, +, _ and space', 'TEMPLATE_ERR_NAME_CHARS' => 'The template name can only contain alphanumeric characters, -, +, _ and space.',
'TEMPLATE_ERR_NAME_EXIST' => 'A template set with that name already exists', 'TEMPLATE_ERR_NAME_EXIST' => 'A template set with that name already exists.',
'TEMPLATE_ERR_NAME_LONG' => 'The template name can be no longer than 30 characters', 'TEMPLATE_ERR_NAME_LONG' => 'The template name can be no longer than 30 characters.',
'TEMPLATE_ERR_NOT_TEMPLATE' => 'The archive you specified does not contain a valid template set.', 'TEMPLATE_ERR_NOT_TEMPLATE' => 'The archive you specified does not contain a valid template set.',
'TEMPLATE_ERR_STYLE_NAME' => 'You must supply a name for this templates', 'TEMPLATE_ERR_STYLE_NAME' => 'You must supply a name for this templates.',
'TEMPLATE_EXPORT' => 'Export templates', 'TEMPLATE_EXPORT' => 'Export templates',
'TEMPLATE_EXPORT_EXPLAIN' => 'Here you can export a template set in the form of an archive. This archive will contain all the files necessary to install the templates on another board. You may select whether to download the file directly or to place it in your store folder for download later or via FTP.', 'TEMPLATE_EXPORT_EXPLAIN' => 'Here you can export a template set in the form of an archive. This archive will contain all the files necessary to install the templates on another board. You may select whether to download the file directly or to place it in your store folder for download later or via FTP.',
'TEMPLATE_EXPORTED' => 'Templates exported succesfully and stored in %s', 'TEMPLATE_EXPORTED' => 'Templates exported succesfully and stored in %s.',
'TEMPLATE_FILE' => 'Template file', 'TEMPLATE_FILE' => 'Template file',
'TEMPLATE_FILE_UPDATED' => 'Template file updated successfully', 'TEMPLATE_FILE_UPDATED' => 'Template file updated successfully.',
'TEMPLATE_LOCATION' => 'Store templates in', 'TEMPLATE_LOCATION' => 'Store templates in',
'TEMPLATE_LOCATION_EXPLAIN' => 'Images are always stored on the filesystem.', 'TEMPLATE_LOCATION_EXPLAIN' => 'Images are always stored on the filesystem.',
'TEMPLATE_NAME' => 'Template name', 'TEMPLATE_NAME' => 'Template name',
'TEMPLATE_REFRESHED' => 'Template refreshed successfully', 'TEMPLATE_REFRESHED' => 'Template refreshed successfully.',
'THEME_ADDED' => 'New theme added on filesystem', 'THEME_ADDED' => 'New theme added on filesystem.',
'THEME_ADDED_DB' => 'New theme added to database', 'THEME_ADDED_DB' => 'New theme added to database.',
'THEME_CLASS_ADDED' => 'Custom class added successfully', 'THEME_CLASS_ADDED' => 'Custom class added successfully.',
'THEME_DELETED' => 'Theme deleted successfully', 'THEME_DELETED' => 'Theme deleted successfully.',
'THEME_DELETED_FS' => 'Theme removed from database but files remain on the filesystem', 'THEME_DELETED_FS' => 'Theme removed from database but files remain on the filesystem.',
'THEME_DETAILS_UPDATED' => 'Theme details successfully updated', 'THEME_DETAILS_UPDATED' => 'Theme details successfully updated.',
'THEME_EDITOR' => 'Raw CSS theme editor', 'THEME_EDITOR' => 'Raw CSS theme editor',
'THEME_EDITOR_HEIGHT' => 'Theme editor height', 'THEME_EDITOR_HEIGHT' => 'Theme editor height',
'THEME_ERR_ARCHIVE' => 'Please select an archive method', 'THEME_ERR_ARCHIVE' => 'Please select an archive method.',
'THEME_ERR_CLASS_CHARS' => 'Only alphanumeric characters plus ., :, - and # are valid in class names.', 'THEME_ERR_CLASS_CHARS' => 'Only alphanumeric characters plus ., :, - and # are valid in class names.',
'THEME_ERR_COPY_LONG' => 'The copyright can be no longer than 60 characters', 'THEME_ERR_COPY_LONG' => 'The copyright can be no longer than 60 characters.',
'THEME_ERR_NAME_CHARS' => 'The theme name can only contain alphanumeric characters, -, +, _ and space', 'THEME_ERR_NAME_CHARS' => 'The theme name can only contain alphanumeric characters, -, +, _ and space.',
'THEME_ERR_NAME_EXIST' => 'A theme with that name already exists', 'THEME_ERR_NAME_EXIST' => 'A theme with that name already exists.',
'THEME_ERR_NAME_LONG' => 'The theme name can be no longer than 30 characters', 'THEME_ERR_NAME_LONG' => 'The theme name can be no longer than 30 characters.',
'THEME_ERR_NOT_THEME' => 'The archive you specified does not contain a valid theme.', 'THEME_ERR_NOT_THEME' => 'The archive you specified does not contain a valid theme.',
'THEME_ERR_REFRESH_FS' => 'This theme is stored on the filesystem so there is no need to refresh it.', 'THEME_ERR_REFRESH_FS' => 'This theme is stored on the filesystem so there is no need to refresh it.',
'THEME_ERR_STYLE_NAME' => 'You must supply a name for this theme', 'THEME_ERR_STYLE_NAME' => 'You must supply a name for this theme.',
'THEME_EXPORT' => 'Export Theme', 'THEME_EXPORT' => 'Export Theme',
'THEME_EXPORT_EXPLAIN' => 'Here you can export a theme in the form of an archive. This archive will contain all the data necessary to install the theme on another board. You may select whether to download the file directly or to place it in your store folder for download later or via FTP.', 'THEME_EXPORT_EXPLAIN' => 'Here you can export a theme in the form of an archive. This archive will contain all the data necessary to install the theme on another board. You may select whether to download the file directly or to place it in your store folder for download later or via FTP.',
'THEME_EXPORTED' => 'Theme exported succesfully and stored in %s', 'THEME_EXPORTED' => 'Theme exported succesfully and stored in %s.',
'THEME_LOCATION' => 'Store stylesheet in', 'THEME_LOCATION' => 'Store stylesheet in',
'THEME_LOCATION_EXPLAIN' => 'Images are always stored on the filesystem.', 'THEME_LOCATION_EXPLAIN' => 'Images are always stored on the filesystem.',
'THEME_NAME' => 'Theme Name', 'THEME_NAME' => 'Theme Name',
'THEME_REFRESHED' => 'Theme refreshed successfully', 'THEME_REFRESHED' => 'Theme refreshed successfully.',
'THEME_UPDATED' => 'Class updated successfully', 'THEME_UPDATED' => 'Class updated successfully.',
'UNDERLINE' => 'Underline', 'UNDERLINE' => 'Underline',
'UNINSTALLED_IMAGESET' => 'Uninstalled imagesets', 'UNINSTALLED_IMAGESET' => 'Uninstalled imagesets',

34
phpBB/language/en/acp/users.php
View file

@ -32,9 +32,9 @@ if (empty($lang) || !is_array($lang))
$lang = array_merge($lang, array( $lang = array_merge($lang, array(
'ADMIN_SIG_PREVIEW' => 'Signature preview', 'ADMIN_SIG_PREVIEW' => 'Signature preview',
'AT_LEAST_ONE_FOUNDER' => 'You are not able to change this founder to a normal user. There needs to be at least one founder enabled for this board. If you want to change this users founder status promote another user to be a founder first.', 'AT_LEAST_ONE_FOUNDER' => 'You are not able to change this founder to a normal user. There needs to be at least one founder enabled for this board. If you want to change this users founder status, promote another user to be a founder first.',
'BAN_SUCCESSFUL' => 'Ban entered successfully', 'BAN_SUCCESSFUL' => 'Ban entered successfully.',
'CANNOT_BAN_YOURSELF' => 'You are not allowed to ban yourself.', 'CANNOT_BAN_YOURSELF' => 'You are not allowed to ban yourself.',
'CANNOT_DEACTIVATE_YOURSELF' => 'You are not allowed to deactivate your own account.', 'CANNOT_DEACTIVATE_YOURSELF' => 'You are not allowed to deactivate your own account.',
@ -47,7 +47,7 @@ $lang = array_merge($lang, array(
'DELETE_USER' => 'Delete user', 'DELETE_USER' => 'Delete user',
'DELETE_USER_EXPLAIN' => 'Please note that deleting a user is final, they cannot be recovered', 'DELETE_USER_EXPLAIN' => 'Please note that deleting a user is final, they cannot be recovered',
'FORCE_REACTIVATION_SUCCESS' => 'Successfully forced re-activation', 'FORCE_REACTIVATION_SUCCESS' => 'Successfully forced re-activation.',
'FOUNDER' => 'Founder', 'FOUNDER' => 'Founder',
'FOUNDER_EXPLAIN' => 'Founders can never be banned, deleted or altered by non-founder members', 'FOUNDER_EXPLAIN' => 'Founders can never be banned, deleted or altered by non-founder members',
@ -77,8 +77,8 @@ $lang = array_merge($lang, array(
'USER_ADMIN' => 'User administration', 'USER_ADMIN' => 'User administration',
'USER_ADMIN' => 'User administration', 'USER_ADMIN' => 'User administration',
'USER_ADMIN_ACTIVATE' => 'Activate account', 'USER_ADMIN_ACTIVATE' => 'Activate account',
'USER_ADMIN_ACTIVATED' => 'User activated successfully', 'USER_ADMIN_ACTIVATED' => 'User activated successfully.',
'USER_ADMIN_AVATAR_REMOVED' => 'Successfully removed avatar from user account', 'USER_ADMIN_AVATAR_REMOVED' => 'Successfully removed avatar from user account.',
'USER_ADMIN_BAN_EMAIL' => 'Ban by email', 'USER_ADMIN_BAN_EMAIL' => 'Ban by email',
'USER_ADMIN_BAN_EMAIL_REASON' => 'Email address banned via user management', 'USER_ADMIN_BAN_EMAIL_REASON' => 'Email address banned via user management',
'USER_ADMIN_BAN_IP' => 'Ban by IP', 'USER_ADMIN_BAN_IP' => 'Ban by IP',
@ -86,7 +86,7 @@ $lang = array_merge($lang, array(
'USER_ADMIN_BAN_NAME_REASON' => 'Username banned via user management', 'USER_ADMIN_BAN_NAME_REASON' => 'Username banned via user management',
'USER_ADMIN_BAN_USER' => 'Ban by username', 'USER_ADMIN_BAN_USER' => 'Ban by username',
'USER_ADMIN_DEACTIVATE' => 'Deactivate account', 'USER_ADMIN_DEACTIVATE' => 'Deactivate account',
'USER_ADMIN_DEACTIVED' => 'User deactivated successfully', 'USER_ADMIN_DEACTIVED' => 'User deactivated successfully.',
'USER_ADMIN_DEL_ATTACH' => 'Delete all attachments', 'USER_ADMIN_DEL_ATTACH' => 'Delete all attachments',
'USER_ADMIN_DEL_AVATAR' => 'Delete avatar', 'USER_ADMIN_DEL_AVATAR' => 'Delete avatar',
'USER_ADMIN_DEL_POSTS' => 'Delete all posts', 'USER_ADMIN_DEL_POSTS' => 'Delete all posts',
@ -94,25 +94,25 @@ $lang = array_merge($lang, array(
'USER_ADMIN_EXPLAIN' => 'Here you can change your users information and certain specific options. To modify the users permissions please use the user and group permissions system.', 'USER_ADMIN_EXPLAIN' => 'Here you can change your users information and certain specific options. To modify the users permissions please use the user and group permissions system.',
'USER_ADMIN_FORCE' => 'Force re-activation', 'USER_ADMIN_FORCE' => 'Force re-activation',
'USER_ADMIN_MOVE_POSTS' => 'Move all posts', 'USER_ADMIN_MOVE_POSTS' => 'Move all posts',
'USER_ADMIN_SIG_REMOVED' => 'Successfully removed signature from user account', 'USER_ADMIN_SIG_REMOVED' => 'Successfully removed signature from user account.',
'USER_ATTACHMENTS_REMOVED' => 'Successfully removed all attachments made by this user', 'USER_ATTACHMENTS_REMOVED' => 'Successfully removed all attachments made by this user.',
'USER_AVATAR_UPDATED' => 'Successfully updated user avatars details', 'USER_AVATAR_UPDATED' => 'Successfully updated user avatars details.',
'USER_CUSTOM_PROFILE_FIELDS' => 'Custom profile fields', 'USER_CUSTOM_PROFILE_FIELDS' => 'Custom profile fields',
'USER_DELETED' => 'User deleted successfully', 'USER_DELETED' => 'User deleted successfully.',
'USER_GROUP_ADD' => 'Add user to group', 'USER_GROUP_ADD' => 'Add user to group',
'USER_GROUP_NORMAL' => 'Normal groups user is a member of', 'USER_GROUP_NORMAL' => 'Normal groups user is a member of',
'USER_GROUP_PENDING' => 'Groups user is in pending mode', 'USER_GROUP_PENDING' => 'Groups user is in pending mode',
'USER_GROUP_SPECIAL' => 'Special groups user is a member of', 'USER_GROUP_SPECIAL' => 'Special groups user is a member of',
'USER_IS_INACTIVE' => 'User is inactive', 'USER_IS_INACTIVE' => 'User is inactive',
'USER_OVERVIEW_UPDATED' => 'User details updated', 'USER_OVERVIEW_UPDATED' => 'User details updated.',
'USER_POSTS_DELETED' => 'Successfully removed all posts made by this user', 'USER_POSTS_DELETED' => 'Successfully removed all posts made by this user.',
'USER_POSTS_MOVED' => 'Successfully moved users posts to target forum', 'USER_POSTS_MOVED' => 'Successfully moved users posts to target forum.',
'USER_PREFS_UPDATED' => 'User preferences updated', 'USER_PREFS_UPDATED' => 'User preferences updated.',
'USER_PROFILE' => 'User Profile', 'USER_PROFILE' => 'User Profile',
'USER_PROFILE_UPDATED' => 'User profile updated', 'USER_PROFILE_UPDATED' => 'User profile updated.',
'USER_RANK' => 'User Rank', 'USER_RANK' => 'User Rank',
'USER_RANK_UPDATED' => 'User rank updated', 'USER_RANK_UPDATED' => 'User rank updated.',
'USER_SIG_UPDATED' => 'User signature successfully updated', 'USER_SIG_UPDATED' => 'User signature successfully updated.',
'USER_TOOLS' => 'Basic tools', 'USER_TOOLS' => 'Basic tools',
'WARNINGS_EXPLAIN' => 'You can directly alter the warnings this users has received.', 'WARNINGS_EXPLAIN' => 'You can directly alter the warnings this users has received.',

7
phpBB/language/en/common.php
View file

@ -313,6 +313,7 @@ $lang = array_merge($lang, array(
'NOT_WATCHING_FORUM' => 'You are no longer subscribed to updates on this forum.', 'NOT_WATCHING_FORUM' => 'You are no longer subscribed to updates on this forum.',
'NOT_WATCHING_TOPIC' => 'You are no longer subscribed to this topic.', 'NOT_WATCHING_TOPIC' => 'You are no longer subscribed to this topic.',
'NO_ACCESS_ATTACHMENT' => 'You are not allowed to access this file.', '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_ADMINISTRATORS' => 'No administrators assigned at this board.',
'NO_AUTH_ADMIN' => 'You do not have admin permissions and therefore not allowed to access the administration control panel.', 'NO_AUTH_ADMIN' => 'You do not have admin permissions and therefore not allowed to access the administration control panel.',
'NO_AUTH_ADMIN_USER_DIFFER' => 'You are not able to re-authenticate as a different user.', 'NO_AUTH_ADMIN_USER_DIFFER' => 'You are not able to re-authenticate as a different user.',
@ -322,14 +323,14 @@ $lang = array_merge($lang, array(
'NO_EMAIL_MESSAGE' => 'Email message was blank', 'NO_EMAIL_MESSAGE' => 'Email message was blank',
'NO_EMAIL_RESPONSE_CODE' => 'Could not get mail server response codes', 'NO_EMAIL_RESPONSE_CODE' => 'Could not get mail server response codes',
'NO_EMAIL_SUBJECT' => 'No email subject specified', 'NO_EMAIL_SUBJECT' => 'No email subject specified',
'NO_FORUM' => 'The forum you selected does not exist', 'NO_FORUM' => 'The forum you selected does not exist.',
'NO_FORUMS' => 'This board has no forums', 'NO_FORUMS' => 'This board has no forums',
'NO_GROUP' => 'The requested usergroup does not exist.', 'NO_GROUP' => 'The requested usergroup does not exist.',
'NO_GROUP_MEMBERS' => 'This group currently has no members', 'NO_GROUP_MEMBERS' => 'This group currently has no members',
'NO_IPS_DEFINED' => 'No IPs or Hostnames defined', 'NO_IPS_DEFINED' => 'No IPs or Hostnames defined',
'NO_MEMBERS' => 'No members found for this search criteria', 'NO_MEMBERS' => 'No members found for this search criteria',
'NO_MESSAGES' => 'No messages', 'NO_MESSAGES' => 'No messages',
'NO_MODE' => 'No mode specified', 'NO_MODE' => 'No mode specified.',
'NO_MODERATORS' => 'No moderators assigned at this board.', 'NO_MODERATORS' => 'No moderators assigned at this board.',
'NO_NEW_MESSAGES' => 'No new messages', 'NO_NEW_MESSAGES' => 'No new messages',
'NO_NEW_PM' => '<strong>0</strong> new messages', 'NO_NEW_PM' => '<strong>0</strong> new messages',
@ -345,7 +346,7 @@ $lang = array_merge($lang, array(
'NO_UNREAD_PM' => '<strong>0</strong> unread messages', 'NO_UNREAD_PM' => '<strong>0</strong> unread messages',
'NO_UPLOAD_FORM_FOUND' => 'Upload initiated but no valid file upload form found.', 'NO_UPLOAD_FORM_FOUND' => 'Upload initiated but no valid file upload form found.',
'NO_USER' => 'The requested user does not exist.', 'NO_USER' => 'The requested user does not exist.',
'NO_USERS' => 'The requested users do not exist', 'NO_USERS' => 'The requested users do not exist.',
'NO_USER_SPECIFIED' => 'No username was specified', 'NO_USER_SPECIFIED' => 'No username was specified',
'OCCUPATION' => 'Occupation', 'OCCUPATION' => 'Occupation',

4
phpBB/language/en/mcp.php
View file

@ -319,8 +319,8 @@ $lang = array_merge($lang, array(
'UNLOCK_TOPICS_CONFIRM' => 'Are you sure you want to unlock all selected topics?', 'UNLOCK_TOPICS_CONFIRM' => 'Are you sure you want to unlock all selected topics?',
'USER_CANNOT_POST' => 'You cannot post in this forum', 'USER_CANNOT_POST' => 'You cannot post in this forum',
'USER_CANNOT_REPORT' => 'You cannot report posts in this forum', 'USER_CANNOT_REPORT' => 'You cannot report posts in this forum',
'USER_FEEDBACK_ADDED' => 'User feedback added successfully', 'USER_FEEDBACK_ADDED' => 'User feedback added successfully.',
'USER_WARNING_ADDED' => 'User warned successfully', 'USER_WARNING_ADDED' => 'User warned successfully.',
'VIEW_DETAILS' => 'View details', 'VIEW_DETAILS' => 'View details',

6
phpBB/language/en/ucp.php
View file

@ -93,8 +93,8 @@ $lang = array_merge($lang, array(
'ALLOW_PM_EXPLAIN' => 'Note that admins and moderators will always be able to send you messages.', 'ALLOW_PM_EXPLAIN' => 'Note that admins and moderators will always be able to send you messages.',
'ALREADY_ACTIVATED' => 'You have already activated your account', 'ALREADY_ACTIVATED' => 'You have already activated your account',
'ATTACHMENTS_EXPLAIN' => 'This is a list of attachements you have made in posts to this forum.', 'ATTACHMENTS_EXPLAIN' => 'This is a list of attachements you have made in posts to this forum.',
'ATTACHMENTS_DELETED' => 'Attachments successfully deleted', 'ATTACHMENTS_DELETED' => 'Attachments successfully deleted.',
'ATTACHMENT_DELETED' => 'Attachment successfully deleted', 'ATTACHMENT_DELETED' => 'Attachment successfully deleted.',
'AVATAR_CATEGORY' => 'Category', 'AVATAR_CATEGORY' => 'Category',
'AVATAR_EXPLAIN' => 'Maximum dimensions; width %1$d pixels, height %2$d pixels, filesize %3$dkB.', 'AVATAR_EXPLAIN' => 'Maximum dimensions; width %1$d pixels, height %2$d pixels, filesize %3$dkB.',
'AVATAR_GALLERY' => 'Local gallery', 'AVATAR_GALLERY' => 'Local gallery',
@ -282,7 +282,7 @@ $lang = array_merge($lang, array(
'NOT_ENOUGH_SPACE_FOLDER' => 'The destination folder “%s” seems to be full. The requested action has not been taken.', 'NOT_ENOUGH_SPACE_FOLDER' => 'The destination folder “%s” seems to be full. The requested action has not been taken.',
'NOT_MOVED_MESSAGE' => 'You have 1 private message currently on hold because of full folder.', 'NOT_MOVED_MESSAGE' => 'You have 1 private message currently on hold because of full folder.',
'NOT_MOVED_MESSAGES' => 'You have %d private messages currently on hold because of full folder.', 'NOT_MOVED_MESSAGES' => 'You have %d private messages currently on hold because of full folder.',
'NO_ACTION_MODE' => 'No message action specified', 'NO_ACTION_MODE' => 'No message action specified.',
'NO_AUTHOR' => 'No author defined for this message', 'NO_AUTHOR' => 'No author defined for this message',
'NO_AVATAR_CATEGORY' => 'None', 'NO_AVATAR_CATEGORY' => 'None',

2
phpBB/posting.php
View file

@ -1030,7 +1030,7 @@ if ($mode == 'quote' && !$submit && !$preview && !$refresh)
if (($mode == 'reply' || $mode == 'quote') && !$submit && !$preview && !$refresh) if (($mode == 'reply' || $mode == 'quote') && !$submit && !$preview && !$refresh)
{ {
$post_data['post_subject'] = ((!preg_match('/^Re:/', $post_data['post_subject'])) ? 'Re: ' : '') . censor_text($post_data['post_subject']); $post_data['post_subject'] = ((strpos($post_data['post_subject'], 'Re: ') !== 0) ? 'Re: ' : '') . censor_text($post_data['post_subject']);
} }
$attachment_data = $message_parser->attachment_data; $attachment_data = $message_parser->attachment_data;

6
phpBB/styles/subSilver/template/mcp_ban.html
View file

@ -4,19 +4,19 @@
<!-- <!--
var ban_length = new Array(); var ban_length = new Array();
ban_length[-1] = ""; ban_length[-1] = '';
<!-- BEGIN ban_length --> <!-- BEGIN ban_length -->
ban_length['{ban_length.BAN_ID}'] = "{ban_length.A_LENGTH}"; ban_length['{ban_length.BAN_ID}'] = "{ban_length.A_LENGTH}";
<!-- END ban_length --> <!-- END ban_length -->
var ban_reason = new Array(); var ban_reason = new Array();
ban_reason[-1] = ""; ban_reason[-1] = '';
<!-- BEGIN ban_reason --> <!-- BEGIN ban_reason -->
ban_reason['{ban_reason.BAN_ID}'] = "{ban_reason.A_REASON}"; ban_reason['{ban_reason.BAN_ID}'] = "{ban_reason.A_REASON}";
<!-- END ban_reason --> <!-- END ban_reason -->
var ban_give_reason = new Array(); var ban_give_reason = new Array();
ban_give_reason[-1] = ""; ban_give_reason[-1] = '';
<!-- BEGIN ban_give_reason --> <!-- BEGIN ban_give_reason -->
ban_give_reason['{ban_give_reason.BAN_ID}'] = "{ban_give_reason.A_REASON}"; ban_give_reason['{ban_give_reason.BAN_ID}'] = "{ban_give_reason.A_REASON}";
<!-- END ban_give_reason --> <!-- END ban_give_reason -->

2
phpBB/styles/subSilver/template/posting_body.html
View file

@ -216,7 +216,7 @@ function checkForm()
<tr> <tr>
<td class="row1" width="22%"><b class="genmed">{L_SUBJECT}:</b></td> <td class="row1" width="22%"><b class="genmed">{L_SUBJECT}:</b></td>
<td class="row2" width="78%"><input class="post" style="width:450px" type="text" name="subject" size="45" maxlength="60" tabindex="2" value="{SUBJECT}" /></td> <td class="row2" width="78%"><input class="post" style="width:450px" type="text" name="subject" size="45" maxlength="64" tabindex="2" value="{SUBJECT}" /></td>
</tr> </tr>
<tr> <tr>
<td class="row1" valign="top"><b class="genmed">{L_MESSAGE_BODY}:</b><br /><span class="gensmall">{L_MESSAGE_BODY_EXPLAIN}&nbsp;</span><br /><br /> <td class="row1" valign="top"><b class="genmed">{L_MESSAGE_BODY}:</b><br /><span class="gensmall">{L_MESSAGE_BODY_EXPLAIN}&nbsp;</span><br /><br />

2
phpBB/styles/subSilver/template/ucp_main_drafts.html
View file

@ -55,7 +55,7 @@
<!-- ELSEIF S_EDIT_DRAFT --> <!-- ELSEIF S_EDIT_DRAFT -->
<tr> <tr>
<td class="row1" width="22%"><b class="genmed">{L_SUBJECT}:</b></td> <td class="row1" width="22%"><b class="genmed">{L_SUBJECT}:</b></td>
<td class="row2"><input class="post" style="width:450px" type="text" name="subject" size="45" maxlength="60" tabindex="2" value="{DRAFT_SUBJECT}" /></td> <td class="row2"><input class="post" style="width:450px" type="text" name="subject" size="45" maxlength="64" tabindex="2" value="{DRAFT_SUBJECT}" /></td>
</tr> </tr>
<tr> <tr>
<td class="row1" width="22%"><b class="genmed">{L_MESSAGE}: </b><br /><span class="gensmall">{L_EDIT_DRAFT_EXPLAIN}</span></td> <td class="row1" width="22%"><b class="genmed">{L_MESSAGE}: </b><br /><span class="gensmall">{L_EDIT_DRAFT_EXPLAIN}</span></td>