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

- 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

phpBB/language/en/acp/common.php

@@ -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',

phpBB/language/en/acp/groups.php

@@ -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',

phpBB/language/en/acp/language.php

@@ -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',
 

phpBB/language/en/acp/users.php

@@ -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',
 

phpBB/language/en/common.php

@@ -110,6 +110,7 @@ $lang = array_merge($lang, array(
 	'CONFIRM_CODE'			=> 'Confirmation code',
 	'CONFIRM_CODE_EXPLAIN'	=> 'Enter the code exactly as you see it in the image, it is case insensitive. Please note that a zero does not exist.',
 	'CONFIRM_CODE_WRONG'	=> 'The confirmation code you entered was incorrect.',
+	'CONFIRM_OPERATION'		=> 'Are you sure you wish to carry out this operation?',
 	'CONGRATULATIONS'		=> 'Congratulations to',
 	'CONNECTION_FAILED'		=> 'Connection failed',
 	'CONNECTION_SUCCESS'	=> 'Connection was successful!',

phpBB/language/en/install.php

@@ -123,7 +123,7 @@ $lang = array_merge($lang, array(
 	'DB_USERNAME'				=> 'Database username',
 	'DB_TEST'					=> 'Test connection',
 	'DEFAULT_LANG'				=> 'Default board language',
-	'DEFAULT_PREFIX_IS'			=> 'The default table prefix for %1$s is <strong>%2$s</strong>',
+	'DEFAULT_PREFIX_IS'			=> 'The convertor was not able to find tables with the specified prefix. Please make sure you have the old within the same database as your phpBB 3.0.x installation. The default table prefix for %1$s is <strong>%2$s</strong>',
 	'DEV_NO_TEST_FILE'			=> 'No value has been specified for the test_file variable in the convertor. If you are a user of this convertor, you should not be seeing this error, please report this message to the convertor author. If you are a convertor author, you must specify the name of a file which exists in the source forum to allow the path to it to be verified.',
 	'DIRECTORIES_AND_FILES'		=> 'Directory and file setup',
 	'DISABLE_KEYS'				=> 'Disabling keys',