aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en/acp
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2006-05-12 23:45:27 +0000
committerNils Adermann <naderman@naderman.de>2006-05-12 23:45:27 +0000
commit215693d897a6bc0ccb247da783cd9f8abce9ca94 (patch)
tree398a607bb1bf5d26392ab7ea44e1845c7c1c9a84 /phpBB/language/en/acp
parent08e708f76b9924133dc196d736adac4b0e992707 (diff)
downloadforums-215693d897a6bc0ccb247da783cd9f8abce9ca94.tar
forums-215693d897a6bc0ccb247da783cd9f8abce9ca94.tar.gz
forums-215693d897a6bc0ccb247da783cd9f8abce9ca94.tar.bz2
forums-215693d897a6bc0ccb247da783cd9f8abce9ca94.tar.xz
forums-215693d897a6bc0ccb247da783cd9f8abce9ca94.zip
- adding a file which displays duplicate language keys
- removed a few duplicates with equal contents [Bug #1193] git-svn-id: file:///svn/phpbb/trunk@5904 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language/en/acp')
-rw-r--r--phpBB/language/en/acp/attachments.php1
-rw-r--r--phpBB/language/en/acp/common.php1
-rw-r--r--phpBB/language/en/acp/database.php1
-rw-r--r--phpBB/language/en/acp/forums.php5
-rw-r--r--phpBB/language/en/acp/groups.php5
-rw-r--r--phpBB/language/en/acp/posting.php1
-rw-r--r--phpBB/language/en/acp/prune.php1
-rw-r--r--phpBB/language/en/acp/search.php1
-rw-r--r--phpBB/language/en/acp/styles.php4
-rw-r--r--phpBB/language/en/acp/users.php1
10 files changed, 1 insertions, 20 deletions
diff --git a/phpBB/language/en/acp/attachments.php b/phpBB/language/en/acp/attachments.php
index defb89e77d..8e73c0330f 100644
--- a/phpBB/language/en/acp/attachments.php
+++ b/phpBB/language/en/acp/attachments.php
@@ -45,7 +45,6 @@ $lang = array_merge($lang, array(
'ALLOW_SELECTED_FORUMS' => 'Only Forums selected below',
'ASSIGNED_EXTENSIONS' => 'Assigned Extensions',
'ASSIGNED_GROUP' => 'Assigned Group',
- 'ATTACHMENTS' => 'Attachments',
'ATTACH_EXTENSIONS_URL' => 'Extensions',
'ATTACH_EXT_GROUPS_URL' => 'Extension Groups',
'ATTACH_MAX_FILESIZE' => 'Maximum filesize',
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 1f0aed9597..14d0ed952f 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -199,7 +199,6 @@ $lang = array_merge($lang, array(
'DEACTIVATE' => 'Deactivate',
'DIMENSIONS' => 'Dimensions',
'DISABLE' => 'Disable',
- 'DISPLAY' => 'Display',
'DOWNLOAD' => 'Download',
'DOWNLOAD_AS' => 'Download as',
'DOWNLOAD_STORE' => 'Download or Store file',
diff --git a/phpBB/language/en/acp/database.php b/phpBB/language/en/acp/database.php
index f077fb95fe..9cade406e0 100644
--- a/phpBB/language/en/acp/database.php
+++ b/phpBB/language/en/acp/database.php
@@ -47,7 +47,6 @@ $lang = array_merge($lang, array(
'BACKUP_SUCCESS' => 'The backup file has been created successfully',
'STORE_AND_DOWNLOAD' => 'Store and Download',
- 'ACP_RESTORE' => 'Restore',
'ACP_RESTORE_EXPLAIN' => 'This will perform a full restore of all phpBB tables from a saved file. You can <u>either</u> upload the backup file via this form or upload it manually to a location on the server. If your server supports it you may use a gzip or bzip2 compressed text file and it will automatically be decompressed. <b>WARNING</b> 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',
diff --git a/phpBB/language/en/acp/forums.php b/phpBB/language/en/acp/forums.php
index b339ac5fdc..a615ba839d 100644
--- a/phpBB/language/en/acp/forums.php
+++ b/phpBB/language/en/acp/forums.php
@@ -55,7 +55,6 @@ $lang = array_merge($lang, array(
'ENABLE_RECENT_EXPLAIN' => 'If set to yes topics made to this forum will be shown in the active topics list.',
'ENABLE_TOPIC_ICONS' => 'Enable Topic Icons',
- 'FOLDER' => 'Folder',
'FORUM_ADMIN' => 'Forum Administration',
'FORUM_ADMIN_EXPLAIN' => 'In phpBB3 there are no categories, everything is forum based. Each forum can have an unlimited number of sub-forums and you can determine whether each may be posted to or not (i.e. whether it acts like an old category). Here you can add, edit, delete, lock, unlock individual forums as well as set certain additional controls. If your posts and topics have got out of sync you can also resynchronise a forum.',
'FORUM_AUTO_PRUNE' => 'Enable Auto-Pruning',
@@ -70,7 +69,6 @@ $lang = array_merge($lang, array(
'FORUM_EDIT_EXPLAIN' => 'The form below will allow you to customise this forum. Please note that moderation and post count controls are set via forum permissions for each user or usergroup.',
'FORUM_IMAGE' => 'Forum Image',
'FORUM_IMAGE_EXPLAIN' => 'Location, relative to the phpBB root directory, of an image to associate with this forum.',
- 'FORUM_LINK' => 'Forum Link',
'FORUM_LINK_EXPLAIN' => 'Full URL (including the protocol, for example http://) to location clicking this forum will take the user.',
'FORUM_LINK_TRACK' => 'Track Link Redirects',
'FORUM_LINK_TRACK_EXPLAIN' => 'Records the number of times a forum link was clicked.',
@@ -83,7 +81,6 @@ $lang = array_merge($lang, array(
'FORUM_PASSWORD_EXPLAIN' => 'Defines a password for this forum, use the permission system in preference.',
'FORUM_PASSWORD_MISMATCH' => 'The passwords you entered did not match.',
'FORUM_RESYNCED' => 'Forum "%s" successfully resynced',
- 'FORUM_RULES' => 'Forum Rules',
'FORUM_RULES_EXPLAIN' => 'Forum Rules are displayed at any page within the given forum.',
'FORUM_RULES_LINK' => 'Link to Forum Rules',
'FORUM_RULES_LINK_EXPLAIN' => 'You are able to enter the URL of the page/post containing your forum rules here. This setting will override the Forum Rules text you specified.',
@@ -122,8 +119,6 @@ $lang = array_merge($lang, array(
'REDIRECT_ACL' => 'Now you are able to %sset permissions%s for this forum.',
'RESYNC' => 'Sync',
- 'SUBFORUM' => 'Subforum',
-
'TYPE_CAT' => 'Category',
'TYPE_FORUM' => 'Forum',
'TYPE_LINK' => 'Link',
diff --git a/phpBB/language/en/acp/groups.php b/phpBB/language/en/acp/groups.php
index 25a9366f3c..0ab209204a 100644
--- a/phpBB/language/en/acp/groups.php
+++ b/phpBB/language/en/acp/groups.php
@@ -56,11 +56,7 @@ $lang = array_merge($lang, array(
'GROUP_DETAILS' => 'Group details',
'GROUP_DST' => 'Group daylight savings',
'GROUP_EDIT_EXPLAIN' => 'Here you can edit an existing group. You can change its name, description and type (open, closed, etc.). You can also set certain groupwide options such as colouration, rank, etc. Changes made here override users current settings. Please note that group members can alter their avatar unless you set appropriate user permissions.',
- 'GROUP_ERR_DESC_LONG' => 'Group description too long.',
- 'GROUP_ERR_TYPE' => 'Inappropriate group type specified.',
- 'GROUP_ERR_USERNAME' => 'No group name specified.',
'GROUP_ERR_USERS_EXIST' => 'The specified users are already members of this group',
- 'GROUP_ERR_USER_LONG' => 'Group name too long.',
'GROUP_HIDDEN' => 'Hidden',
'GROUP_LANG' => 'Group language',
'GROUP_LEAD' => 'Group leaders',
@@ -95,7 +91,6 @@ $lang = array_merge($lang, array(
'NO_GROUP' => 'No group specified',
'NO_PERMISSIONS' => 'Do not copy permissions',
- 'NO_USERS' => 'The requested users do not exist',
'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.',
diff --git a/phpBB/language/en/acp/posting.php b/phpBB/language/en/acp/posting.php
index 34f1cb7cb1..7ecb16ec1f 100644
--- a/phpBB/language/en/acp/posting.php
+++ b/phpBB/language/en/acp/posting.php
@@ -78,7 +78,6 @@ $lang = array_merge($lang, array(
'CURRENT_ICONS' => 'Current icons',
'CURRENT_SMILIES' => 'Current smilies',
- 'DELETE_ALL' => 'Delete all',
'DISPLAY_ON_POSTING' => 'Display on posting',
'EDIT_ICONS' => 'Edit Icons',
diff --git a/phpBB/language/en/acp/prune.php b/phpBB/language/en/acp/prune.php
index ca15403bec..71f4169fbb 100644
--- a/phpBB/language/en/acp/prune.php
+++ b/phpBB/language/en/acp/prune.php
@@ -32,7 +32,6 @@ if (empty($lang) || !is_array($lang))
$lang = array_merge($lang, array(
'ACP_PRUNE_USERS_EXPLAIN' => 'Here you can delete (or deactivate) users from you board. This can be done in a variety of ways; by post count, last activity, etc. Each of these criteria can be combined, i.e. you can prune users last active before 2002-01-01 with fewer than 10 posts. Alternatively you can enter a list of users directly into the text box, any criteria entered will be ignored. Take care with this facility! Once a user is deleted there is no way back.',
- 'DEACTIVATE' => 'Deactivate',
'DEACTIVATE_DELETE' => 'Deactivate or delete',
'DEACTIVATE_DELETE_EXPLAIN' => 'Choose whether to deactivate users or delete them entirely, note there is no undo!',
'DELETE_USERS' => 'Delete',
diff --git a/phpBB/language/en/acp/search.php b/phpBB/language/en/acp/search.php
index 5ed8b85bc5..480e56e1ec 100644
--- a/phpBB/language/en/acp/search.php
+++ b/phpBB/language/en/acp/search.php
@@ -30,7 +30,6 @@ if (empty($lang) || !is_array($lang))
$lang = array_merge($lang, array(
'ACP_SEARCH_INDEX_EXPLAIN' => 'Here you can manage the search backend\'s indexes. Since you normally use only one backend you should delete all indexes that you do not make use of. After altering some of the search settings (e.g. the number of minimum/maximum chars) it might be worth recreating the index so it reflects those changes.',
- 'ACP_SEARCH_SETTINGS' => 'Search Settings',
'ACP_SEARCH_SETTINGS_EXPLAIN' => 'Here you can define what search backend will be used for indexing posts and performing searches. You can set various options that can influence how much processing these actions require. Some of these settings are the same for all search engine backends.',
'CONFIRM_SEARCH_BACKEND' => 'Are you sure you wish to switch to a different search backend? After changing the search backend you will have to create an index for the new search backend. If you don\'t plan on switching back to the old search backend you can also delete the old backend\'s index in order to free system resources.',
diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php
index 8e1eae331c..f25b04c108 100644
--- a/phpBB/language/en/acp/styles.php
+++ b/phpBB/language/en/acp/styles.php
@@ -77,8 +77,6 @@ $lang = array_merge($lang, array(
'EDIT_TEMPLATE_STORED_DB' => 'The template file was unwritable so the template set is now stored in the database containing the modified file.',
'EXPORT' => 'Export',
- 'FROM' => 'from', // "Create new style .... from ..."
-
'IMAGE_CONFIGURATION' => 'Image configuration',
'IMAGE_WIDTH' => 'Image width',
'IMAGE_HEIGHT' => 'Image height',
@@ -231,7 +229,7 @@ $lang = array_merge($lang, array(
'IMAGE' => 'Image',
'CURRENT_IMAGE' => 'Current Image',
'SELECTED_IMAGE' => 'Selected Image',
- 'DIMENSIONS' => 'Include dimensions',
+ 'INCLUDE_DIMENSIONS' => 'Include dimensions',
'DIMENSIONS_EXPLAIN' => 'Selecting yes here will include width/height parameters.',
'IMAGE_PARAMETER' => 'Parameter',
'IMAGE_VALUE' => 'Value',
diff --git a/phpBB/language/en/acp/users.php b/phpBB/language/en/acp/users.php
index f928a99b5f..0364497f4e 100644
--- a/phpBB/language/en/acp/users.php
+++ b/phpBB/language/en/acp/users.php
@@ -106,7 +106,6 @@ $lang = array_merge($lang, array(
'USER_SIG_UPDATED' => 'User signature successfully updated',
'USER_TOOLS' => 'Basic tools',
- 'WARNINGS' => 'Warnings',
'WARNINGS_EXPLAIN' => 'You can directly alter the warnings this users has received.',
));