mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-19 23:11:45 +02:00
Code Issues Releases Wiki Activity

- added confirm box to ucp zebra (adding fried/foe)

Browse Source 
- permission fixes for conversions
- use more appropiate error message within convertor if source tables could not be found
- other tiny fixes


git-svn-id: file:///svn/phpbb/trunk@6925 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
2007-01-24 11:29:56 +00:00
parent 180a5a243d
commit 9e5c25504e
17 changed files with 233 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
phpBB/language/en/acp/common.php
View File

@@ -202,7 +202,6 @@ $lang = array_merge($lang, array(
'COLOUR_SWATCH' => 'Web-safe colour swatch',
'CONFIG_UPDATED' => 'Configuration updated successfully.',
'CONFIRM_OPERATION' => 'Are you sure you wish to carry out this operation?',
'DEACTIVATE' => 'Deactivate',
'DIMENSIONS' => 'Dimensions',

10
phpBB/language/en/acp/groups.php
View File

@@ -41,7 +41,7 @@ $lang = array_merge($lang, array(
'GROUPS_NO_MEMBERS' => 'This group has no members',
'GROUPS_NO_MODS' => 'No group leaders defined',
'GROUP_APPROVE' => 'Approve',
'GROUP_APPROVE' => 'Approve member',
'GROUP_APPROVED' => 'Approved members',
'GROUP_AVATAR' => 'Group avatar',
'GROUP_AVATAR_EXPLAIN' => 'This image will be displayed in the Group Control Panel.',
@@ -49,11 +49,11 @@ $lang = array_merge($lang, array(
'GROUP_COLOR' => 'Group colour',
'GROUP_COLOR_EXPLAIN' => 'Defines the colour members usernames will appear in, leave blank for user default.',
'GROUP_CREATED' => 'Group has been created successfully.',
'GROUP_DEFAULT' => 'Default',
'GROUP_DEFAULT' => 'Make group default for member',
'GROUP_DEFS_UPDATED' => 'Default group set for all selected members.',
'GROUP_DELETE' => 'Delete',
'GROUP_DELETE' => 'Remove member from group',
'GROUP_DELETED' => 'Group deleted and user default groups set successfully.',
'GROUP_DEMOTE' => 'Demote',
'GROUP_DEMOTE' => 'Demote group leader',
'GROUP_DESC' => 'Group description',
'GROUP_DETAILS' => 'Group details',
'GROUP_DST' => 'Group daylight savings',
@@ -78,7 +78,7 @@ $lang = array_merge($lang, array(
'GROUP_NAME' => 'Group name',
'GROUP_OPEN' => 'Open',
'GROUP_PENDING' => 'Pending members',
'GROUP_PROMOTE' => 'Promote',
'GROUP_PROMOTE' => 'Promote to group leader',
'GROUP_RANK' => 'Group rank',
'GROUP_RECEIVE_PM' => 'Group able to receive private messages',
'GROUP_REQUEST' => 'Request',

1
phpBB/language/en/acp/language.php
View File

@@ -87,6 +87,7 @@ $lang = array_merge($lang, array(
'UNABLE_TO_WRITE_FILE' => 'The file could not be written to %s.',
'UPLOAD_COMPLETED' => 'The upload was completed successfully.',
'UPLOAD_FAILED' => 'The upload failed for unkown reasons. You may need to replace the relevant file manually.',
'UPLOAD_METHOD' => 'Upload method',
'UPLOAD_SETTINGS' => 'Upload settings',

9
phpBB/language/en/acp/users.php
View File

@@ -58,10 +58,11 @@ $lang = array_merge($lang, array(
'FOUNDER' => 'Founder',
'FOUNDER_EXPLAIN' => 'Founders have all admin permissions and can never be banned, deleted or altered by non-founder members',
'GROUP_DEFAULT' => 'Default',
'GROUP_DELETE' => 'Delete',
'GROUP_DEMOTE' => 'Demote',
'GROUP_PROMOTE' => 'Promote',
'GROUP_APPROVE' => 'Approve member',
'GROUP_DEFAULT' => 'Make group default for member',
'GROUP_DELETE' => 'Remove member from group',
'GROUP_DEMOTE' => 'Demote group leader',
'GROUP_PROMOTE' => 'Promote to group leader',
'IP_WHOIS_FOR' => 'IP whois for %s',