diff options
Diffstat (limited to 'phpBB/language/en/acp')
| -rw-r--r-- | phpBB/language/en/acp/attachments.php | 3 | ||||
| -rw-r--r-- | phpBB/language/en/acp/ban.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/acp/board.php | 5 | ||||
| -rw-r--r-- | phpBB/language/en/acp/bots.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/acp/common.php | 18 | ||||
| -rw-r--r-- | phpBB/language/en/acp/database.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/acp/email.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/acp/forums.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/acp/groups.php | 19 | ||||
| -rw-r--r-- | phpBB/language/en/acp/language.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/acp/modules.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/acp/permissions.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/acp/permissions_phpbb.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/acp/posting.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/acp/profile.php | 4 | ||||
| -rw-r--r-- | phpBB/language/en/acp/prune.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/acp/search.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/acp/styles.php | 4 | ||||
| -rw-r--r-- | phpBB/language/en/acp/users.php | 2 | 
19 files changed, 40 insertions, 39 deletions
diff --git a/phpBB/language/en/acp/attachments.php b/phpBB/language/en/acp/attachments.php index 1821b8c867..eede2c5d50 100644 --- a/phpBB/language/en/acp/attachments.php +++ b/phpBB/language/en/acp/attachments.php @@ -62,6 +62,7 @@ $lang = array_merge($lang, array(  	'ATTACH_MAX_PM_FILESIZE_EXPLAIN'	=> 'Maximum size of each file, with 0 being unlimited, attached to a private message.',  	'ATTACH_ORPHAN_URL'					=> 'Orphan attachments',  	'ATTACH_POST_ID'					=> 'Post ID', +	'ATTACH_POST_TYPE'					=> 'Post type',  	'ATTACH_QUOTA'						=> 'Total attachment quota',  	'ATTACH_QUOTA_EXPLAIN'				=> 'Maximum drive space available for attachments for the whole board, with 0 being unlimited.',  	'ATTACH_TO_POST'					=> 'Attach file to post', @@ -170,5 +171,3 @@ $lang = array_merge($lang, array(  	'UPLOAD_ICON'					=> 'Upload icon',  	'UPLOAD_NOT_DIR'				=> 'The upload location you specified does not appear to be a directory.',  )); - -?>
\ No newline at end of file diff --git a/phpBB/language/en/acp/ban.php b/phpBB/language/en/acp/ban.php index 099834d1e4..137224ba4f 100644 --- a/phpBB/language/en/acp/ban.php +++ b/phpBB/language/en/acp/ban.php @@ -78,5 +78,3 @@ $lang = array_merge($lang, array(  	'USER_UNBAN'				=> 'Un-ban or un-exclude usernames',  	'USER_UNBAN_EXPLAIN'		=> 'You can unban (or un-exclude) multiple users in one go using the appropriate combination of mouse and keyboard for your computer and browser. Excluded users are emphasised.',  )); - -?>
\ No newline at end of file diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php index 10e4aa7b6b..9299d96823 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -353,6 +353,7 @@ $lang = array_merge($lang, array(  	'LIMIT_SESSIONS'				=> 'Limit sessions',  	'LIMIT_SESSIONS_EXPLAIN'		=> 'If the number of sessions exceeds this value within a one minute period the board will go offline. Set to 0 for unlimited sessions.',  	'LOAD_CPF_MEMBERLIST'			=> 'Allow styles to display custom profile fields in memberlist', +	'LOAD_CPF_PM'					=> 'Display custom profile fields in private messages',  	'LOAD_CPF_VIEWPROFILE'			=> 'Display custom profile fields in user profiles',  	'LOAD_CPF_VIEWTOPIC'			=> 'Display custom profile fields on topic pages',  	'LOAD_USER_ACTIVITY'			=> 'Show user’s activity', @@ -433,6 +434,8 @@ $lang = array_merge($lang, array(  	'SMILIES_PATH_EXPLAIN'		=> 'Path under your phpBB root directory, e.g. <samp>images/smilies</samp>.',  	'UPLOAD_ICONS_PATH'			=> 'Extension group icons storage path',  	'UPLOAD_ICONS_PATH_EXPLAIN'	=> 'Path under your phpBB root directory, e.g. <samp>images/upload_icons</samp>.', +	'USE_SYSTEM_CRON'		=> 'Run periodic tasks from system cron', +	'USE_SYSTEM_CRON_EXPLAIN'		=> 'When off, phpBB will arrange for periodic tasks to be run automatically. When on, phpBB will not schedule any periodic tasks by itself; a system administrator must arrange for <code>cron.php</code> to be invoked by the system cron facility at regular intervals (e.g. every 5 minutes).',  ));  // Security Settings @@ -540,5 +543,3 @@ $lang = array_merge($lang, array(  	'JAB_USERNAME'				=> 'Jabber username or JID',  	'JAB_USERNAME_EXPLAIN'		=> 'Specify a registered username or a valid JID. The username will not be checked for validity. If you only specify a username, then your JID will be the username and the server you specified above. Else, specify a valid JID, for example user@jabber.org.',  )); - -?>
\ No newline at end of file diff --git a/phpBB/language/en/acp/bots.php b/phpBB/language/en/acp/bots.php index 3b63f2ea2e..c9d0a6bad2 100644 --- a/phpBB/language/en/acp/bots.php +++ b/phpBB/language/en/acp/bots.php @@ -69,5 +69,3 @@ $lang = array_merge($lang, array(  	'NO_BOT'		=> 'Found no bot with the specified ID.',  	'NO_BOT_GROUP'	=> 'Unable to find special bot group.',  )); - -?>
\ No newline at end of file diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php index 8c71e936b3..2a8ed86175 100644 --- a/phpBB/language/en/acp/common.php +++ b/phpBB/language/en/acp/common.php @@ -100,6 +100,7 @@ $lang = array_merge($lang, array(  	'ACP_GROUPS_MANAGE'				=> 'Manage groups',  	'ACP_GROUPS_MANAGEMENT'			=> 'Group management',  	'ACP_GROUPS_PERMISSIONS'		=> 'Groups’ permissions', +	'ACP_GROUPS_POSITION'			=> 'Manage group positions',  	'ACP_ICONS'					=> 'Topic icons',  	'ACP_ICONS_SMILIES'			=> 'Topic icons/smilies', @@ -115,6 +116,10 @@ $lang = array_merge($lang, array(  	'ACP_LOGGING'				=> 'Logging',  	'ACP_MAIN'					=> 'ACP index', + +	'ACP_MANAGE_ATTACHMENTS'			=> 'Manage attachments', +	'ACP_MANAGE_ATTACHMENTS_EXPLAIN'	=> 'Here you can list and delete files attached to posts and private messages.', +  	'ACP_MANAGE_EXTENSIONS'		=> 'Manage extensions',  	'ACP_MANAGE_FORUMS'			=> 'Manage forums',  	'ACP_MANAGE_RANKS'			=> 'Manage ranks', @@ -226,12 +231,16 @@ $lang = array_merge($lang, array(  	'DOWNLOAD_AS'				=> 'Download as',  	'DOWNLOAD_STORE'			=> 'Download or store file',  	'DOWNLOAD_STORE_EXPLAIN'	=> 'You may directly download the file or save it in your <samp>store/</samp> folder.', +	'DOWNLOADS'          		=> 'Downloads',  	'EDIT'					=> 'Edit',  	'ENABLE'				=> 'Enable',  	'EXPORT_DOWNLOAD'		=> 'Download',  	'EXPORT_STORE'			=> 'Store', +	'FILES_GONE'			=> 'Some of the attachments you selected for deletion do not exist. They may have been already deleted. Attachments that did exist were deleted.', +	'FILES_STATS_WRONG'		=> 'Your files statistics are probably inaccurate and need to be resynchronised. Actual values: number of attachments = %1$d, total size of attachments = %2$s.', +  	'GENERAL_OPTIONS'		=> 'General options',  	'GENERAL_SETTINGS'		=> 'General settings',  	'GLOBAL_MASK'			=> 'Global permission mask', @@ -257,6 +266,7 @@ $lang = array_merge($lang, array(  	'NOTIFY'				=> 'Notification',  	'NO_ADMIN'				=> 'You are not authorised to administer this board.',  	'NO_EMAILS_DEFINED'		=> 'No valid e-mail addresses found.', +	'NO_FILES_TO_DELETE'	=> 'Attachments you selected for deletion do not exist.',  	'NO_PASSWORD_SUPPLIED'	=> 'You need to enter your password to access the Administration Control Panel.',  	'OFF'					=> 'Off', @@ -271,6 +281,8 @@ $lang = array_merge($lang, array(  	'REMIND'							=> 'Remind',  	'RESYNC'							=> 'Resynchronise', +	'RESYNC_FILES_STATS'				=> 'Resynchronise files statistics', +	'RESYNC_FILES_STATS_EXPLAIN'		=> 'Recalculates the total number and size of files attached to posts and private messages.',  	'RETURN_TO'							=> 'Return to…',  	'SELECT_ANONYMOUS'		=> 'Select anonymous user', @@ -283,6 +295,8 @@ $lang = array_merge($lang, array(  	'SHOW_ALL_OPERATIONS'	=> 'Show all operations', +	'TOTAL_SIZE'      		=> 'Total size', +  	'UCP'					=> 'User Control Panel',  	'USERNAMES_EXPLAIN'		=> 'Place each username on a separate line.',  	'USER_CONTROL_PANEL'	=> 'User Control Panel', @@ -355,6 +369,7 @@ $lang = array_merge($lang, array(  	'RESET_DATE_CONFIRM'			=> 'Are you sure you wish to reset the board’s start date?',  	'RESET_ONLINE'					=> 'Reset most users ever online',  	'RESET_ONLINE_CONFIRM'			=> 'Are you sure you wish to reset the most users ever online counter?', +	'RESYNC_FILES_STATS_CONFIRM'	=> 'Are you sure you wish to resynchronise files statistics?',  	'RESYNC_POSTCOUNTS'				=> 'Resynchronise post counts',  	'RESYNC_POSTCOUNTS_EXPLAIN'		=> 'Only existing posts will be taken into consideration. Pruned posts will not be counted.',  	'RESYNC_POSTCOUNTS_CONFIRM'		=> 'Are you sure you wish to resynchronise post counts?', @@ -659,6 +674,7 @@ $lang = array_merge($lang, array(  	'LOG_REFERER_INVALID'		=> '<strong>Referer validation failed</strong><br />»Referer was “<em>%1$s</em>”. The request was rejected and the session killed.',  	'LOG_RESET_DATE'			=> '<strong>Board start date reset</strong>',  	'LOG_RESET_ONLINE'			=> '<strong>Most users online reset</strong>', +	'LOG_RESYNC_FILES_STATS'	=> '<strong>Files statistics resynchronised</strong>',  	'LOG_RESYNC_POSTCOUNTS'		=> '<strong>User post counts resynchronised</strong>',  	'LOG_RESYNC_POST_MARKING'	=> '<strong>Dotted topics resynchronised</strong>',  	'LOG_RESYNC_STATS'			=> '<strong>Post, topic and user statistics resynchronised</strong>', @@ -738,5 +754,3 @@ $lang = array_merge($lang, array(  	'LOG_WORD_DELETE'		=> '<strong>Deleted word censor</strong><br />» %s',  	'LOG_WORD_EDIT'			=> '<strong>Edited word censor</strong><br />» %s',  )); - -?>
\ No newline at end of file diff --git a/phpBB/language/en/acp/database.php b/phpBB/language/en/acp/database.php index ae8f76d6b7..1854e009b4 100644 --- a/phpBB/language/en/acp/database.php +++ b/phpBB/language/en/acp/database.php @@ -72,5 +72,3 @@ $lang = array_merge($lang, array(  	'TABLE_SELECT'		=> 'Table select',  	'TABLE_SELECT_ERROR'=> 'You must select at least one table.',  )); - -?>
\ No newline at end of file diff --git a/phpBB/language/en/acp/email.php b/phpBB/language/en/acp/email.php index 38c9f19c27..6ce8ddd59b 100644 --- a/phpBB/language/en/acp/email.php +++ b/phpBB/language/en/acp/email.php @@ -65,5 +65,3 @@ $lang = array_merge($lang, array(  	'NO_EMAIL_MESSAGE'		=> 'You must enter a message.',  	'NO_EMAIL_SUBJECT'		=> 'You must specify a subject for your message.',  )); - -?>
\ No newline at end of file diff --git a/phpBB/language/en/acp/forums.php b/phpBB/language/en/acp/forums.php index eab027f295..80e958afa5 100644 --- a/phpBB/language/en/acp/forums.php +++ b/phpBB/language/en/acp/forums.php @@ -156,5 +156,3 @@ $lang = array_merge($lang, array(  	'UNLOCKED'			=> 'Unlocked',  )); - -?>
\ No newline at end of file diff --git a/phpBB/language/en/acp/groups.php b/phpBB/language/en/acp/groups.php index 3444b98303..11342bf4f2 100644 --- a/phpBB/language/en/acp/groups.php +++ b/phpBB/language/en/acp/groups.php @@ -97,6 +97,8 @@ $lang = array_merge($lang, array(  	'GROUP_SETTINGS_SAVE'			=> 'Group wide settings',  	'GROUP_SKIP_AUTH'				=> 'Exempt group leader from permissions',  	'GROUP_SKIP_AUTH_EXPLAIN'		=> 'If enabled group leader no longer inherit permissions from the group.', +	'GROUP_SPECIAL'					=> 'Pre-defined', +	'GROUP_TEAMPAGE'				=> 'Display group on teampage',  	'GROUP_TYPE'					=> 'Group type',  	'GROUP_TYPE_EXPLAIN'			=> 'This determines which users can join or view this group.',  	'GROUP_UPDATED'					=> 'Group preferences updated successfully.', @@ -105,19 +107,34 @@ $lang = array_merge($lang, array(  	'GROUP_USERS_EXIST'				=> 'The selected users are already members.',  	'GROUP_USERS_REMOVE'			=> 'Users removed from group and new defaults set successfully.', +	'LEGEND_EXPLAIN'				=> 'These are the groups which are displayed in the group legend:', +	'LEGEND_SETTINGS'				=> 'Legend settings', +	'LEGEND_SORT_GROUPNAME'			=> 'Sort legend by group name', +	'LEGEND_SORT_GROUPNAME_EXPLAIN'	=> 'The order below is ignored when this option is enabled.', + +	'MANAGE_LEGEND'			=> 'Manage group legend', +	'MANAGE_TEAMPAGE'		=> 'Manage teampage',  	'MAKE_DEFAULT_FOR_ALL'	=> 'Make default group for every member',  	'MEMBERS'				=> 'Members',  	'NO_GROUP'					=> 'No group specified.', +	'NO_GROUPS_ADDED'			=> 'No groups added yet.',  	'NO_GROUPS_CREATED'			=> 'No groups created yet.',  	'NO_PERMISSIONS'			=> 'Do not copy permissions',  	'NO_USERS'					=> 'You haven’t entered any users.',  	'NO_USERS_ADDED'			=> 'No users were added to the group.',  	'NO_VALID_USERS'			=> 'You haven’t entered any users eligible for that action.', +	'SELECT_GROUP'				=> 'Select a group',  	'SPECIAL_GROUPS'			=> 'Pre-defined 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.', +	'TEAMPAGE_EXPLAIN'			=> 'These are the groups which are displayed on the teampage:', +	'TEAMPAGE_FORUMS'			=> 'Display moderated forums', +	'TEAMPAGE_FORUMS_EXPLAIN'	=> 'If set to yes, moderators will have a list with all of the forums where they have moderator permissions displayed in their row. This can be very database intensive for big boards.', +	'TEAMPAGE_MULTIPLE'			=> 'Display users in all groups', +	'TEAMPAGE_MULTIPLE_EXPLAIN'	=> 'If set to no, the users will only be displayed in their primary group (If the primary group is not listed, the users will be displayed in their first displayed group).', +	'TEAMPAGE_SETTINGS'			=> 'Teampage settings',  	'TOTAL_MEMBERS'				=> 'Members',  	'USERS_APPROVED'				=> 'Users approved successfully.', @@ -128,5 +145,3 @@ $lang = array_merge($lang, array(  	'USER_GROUP_DEFAULT_EXPLAIN'	=> 'Saying yes here will set this group as the default group for the added users.',  	'USER_GROUP_LEADER'				=> 'Set as group leader',  )); - -?>
\ No newline at end of file diff --git a/phpBB/language/en/acp/language.php b/phpBB/language/en/acp/language.php index 4d11309ebb..8d57c2f3ce 100644 --- a/phpBB/language/en/acp/language.php +++ b/phpBB/language/en/acp/language.php @@ -98,5 +98,3 @@ $lang = array_merge($lang, array(  	'WRONG_LANGUAGE_FILE'		=> 'Selected language file is invalid.',  )); - -?>
\ No newline at end of file diff --git a/phpBB/language/en/acp/modules.php b/phpBB/language/en/acp/modules.php index 875b24a94b..7925f1644d 100644 --- a/phpBB/language/en/acp/modules.php +++ b/phpBB/language/en/acp/modules.php @@ -80,5 +80,3 @@ $lang = array_merge($lang, array(  	'SELECT_MODULE'			=> 'Select a module',  )); - -?>
\ No newline at end of file diff --git a/phpBB/language/en/acp/permissions.php b/phpBB/language/en/acp/permissions.php index cf248cffdb..806350e3c8 100644 --- a/phpBB/language/en/acp/permissions.php +++ b/phpBB/language/en/acp/permissions.php @@ -285,5 +285,3 @@ $lang = array_merge($lang, array(  	'WRONG_PERMISSION_TYPE'				=> 'Wrong permission type selected.',  	'WRONG_PERMISSION_SETTING_FORMAT'	=> 'The permission settings are in a wrong format, phpBB is not able to process them correctly.',  )); - -?>
\ No newline at end of file diff --git a/phpBB/language/en/acp/permissions_phpbb.php b/phpBB/language/en/acp/permissions_phpbb.php index 945a675861..0a3cd53b1e 100644 --- a/phpBB/language/en/acp/permissions_phpbb.php +++ b/phpBB/language/en/acp/permissions_phpbb.php @@ -237,5 +237,3 @@ $lang = array_merge($lang, array(  	'acl_a_backup'		=> array('lang' => 'Can backup/restore database', 'cat' => 'misc'),  	'acl_a_search'		=> array('lang' => 'Can manage search backends and settings', 'cat' => 'misc'),  )); - -?>
\ No newline at end of file diff --git a/phpBB/language/en/acp/posting.php b/phpBB/language/en/acp/posting.php index 9719287c2a..16e1aaca66 100644 --- a/phpBB/language/en/acp/posting.php +++ b/phpBB/language/en/acp/posting.php @@ -277,5 +277,3 @@ $lang = array_merge($lang, array(  	'USED_IN_REPORTS'		=> 'Used in reports',  )); - -?>
\ No newline at end of file diff --git a/phpBB/language/en/acp/profile.php b/phpBB/language/en/acp/profile.php index a25dcd174b..ea643157d8 100644 --- a/phpBB/language/en/acp/profile.php +++ b/phpBB/language/en/acp/profile.php @@ -66,6 +66,8 @@ $lang = array_merge($lang, array(  	'DISPLAY_AT_PROFILE_EXPLAIN'	=> 'The user is able to change this profile field within the user control panel.',  	'DISPLAY_AT_REGISTER'			=> 'Display on registration screen',  	'DISPLAY_AT_REGISTER_EXPLAIN'	=> 'If this option is enabled, the field will be displayed on registration.', +	'DISPLAY_ON_PM'					=> 'Display on view pm screen', +	'DISPLAY_ON_PM_EXPLAIN'			=> 'If this option is enabled, the field will be displayed in the mini-profile on the pm screen.',  	'DISPLAY_ON_VT'					=> 'Display on viewtopic screen',  	'DISPLAY_ON_VT_EXPLAIN'			=> 'If this option is enabled, the field will be displayed in the mini-profile on the topic screen.',  	'DISPLAY_PROFILE_FIELD'			=> 'Publicly display profile field', @@ -152,5 +154,3 @@ $lang = array_merge($lang, array(  	'VISIBILITY_OPTION'				=> 'Visibility options',  )); - -?>
\ No newline at end of file diff --git a/phpBB/language/en/acp/prune.php b/phpBB/language/en/acp/prune.php index 8a06225102..bf006d9dce 100644 --- a/phpBB/language/en/acp/prune.php +++ b/phpBB/language/en/acp/prune.php @@ -87,5 +87,3 @@ $lang = array_merge($lang, array(  	'TOPICS_PRUNED'		=> 'Topics pruned',  )); - -?>
\ No newline at end of file diff --git a/phpBB/language/en/acp/search.php b/phpBB/language/en/acp/search.php index a7d687d7c2..9f0181a7e2 100644 --- a/phpBB/language/en/acp/search.php +++ b/phpBB/language/en/acp/search.php @@ -105,5 +105,3 @@ $lang = array_merge($lang, array(  	'YES_SEARCH_UPDATE'						=> 'Enable fulltext updating',  	'YES_SEARCH_UPDATE_EXPLAIN'				=> 'Updating of fulltext indexes when posting, overridden if search is disabled.',  )); - -?>
\ No newline at end of file diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php index 8f65b3ef5f..1cdf6f7050 100644 --- a/phpBB/language/en/acp/styles.php +++ b/phpBB/language/en/acp/styles.php @@ -223,7 +223,7 @@ $lang = array_merge($lang, array(  	'IMG_ICON_CONTACT_EMAIL'	=> 'Send e-mail',  	'IMG_ICON_CONTACT_ICQ'		=> 'ICQ',  	'IMG_ICON_CONTACT_JABBER'	=> 'Jabber', -	'IMG_ICON_CONTACT_MSNM'		=> 'MSNM', +	'IMG_ICON_CONTACT_MSNM'		=> 'WLM',  	'IMG_ICON_CONTACT_PM'		=> 'Send message',  	'IMG_ICON_CONTACT_YAHOO'	=> 'YIM',  	'IMG_ICON_CONTACT_WWW'		=> 'Website', @@ -434,5 +434,3 @@ $lang = array_merge($lang, array(  	'UNSET'					=> 'Undefined',  )); - -?>
\ No newline at end of file diff --git a/phpBB/language/en/acp/users.php b/phpBB/language/en/acp/users.php index eda9659795..6ba333e507 100644 --- a/phpBB/language/en/acp/users.php +++ b/phpBB/language/en/acp/users.php @@ -138,5 +138,3 @@ $lang = array_merge($lang, array(  	'USER_WARNING_LOG_DELETED'		=> 'No information available. Possibly the log entry has been deleted.',  	'USER_TOOLS'					=> 'Basic tools',  )); - -?>
\ No newline at end of file  | 
