From 18ae2e2ff93771b8b49cd1c2c392507808503e59 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Thu, 14 Dec 2006 17:54:44 +0000 Subject: [PATCH] two changes related to the convertor git-svn-id: file:///svn/phpbb/trunk@6762 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/adm/style/install_convert.html | 16 ++++++++++++++++ phpBB/language/en/install.php | 12 +++++++++--- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/phpBB/adm/style/install_convert.html b/phpBB/adm/style/install_convert.html index 0e3da86ae5..39d31cd538 100755 --- a/phpBB/adm/style/install_convert.html +++ b/phpBB/adm/style/install_convert.html @@ -39,6 +39,22 @@ + + + +
+
+ +
+
+
+ +
+
+ +
+ +
diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php index 59c39e0991..30291cf5a7 100755 --- a/phpBB/language/en/install.php +++ b/phpBB/language/en/install.php @@ -61,18 +61,22 @@ $lang = array_merge($lang, array( 'CONFIG_RETRY' => 'Retry', 'CONTACT_EMAIL_CONFIRM' => 'Confirm contact email', 'CONTINUE_CONVERT' => 'Continue conversion', + 'CONTINUE_CONVERT_BODY' => 'A previous conversion attempt has been determined. You are now able to choose between starting a new conversion or continueing the conversion.', 'CONTINUE_LAST' => 'Continue last statements', + 'CONTINUE_OLD_CONVERSION' => 'Continue previously started conversion', 'CONVERT' => 'Convert', 'CONVERT_COMPLETE' => 'Conversion completed', 'CONVERT_COMPLETE_EXPLAIN' => 'You have now successfully converted your board to phpBB 3.0. You can now login and access your forum. Remember that help on using phpBB is available online via the Userguide and the Beta support forum', 'CONVERT_INTRO' => 'Welcome to the phpBB Unified Convertor Framework', 'CONVERT_INTRO_BODY' => 'From here, you are able to import data from other (installed) forum systems. The list below shows all the conversion modules currently available. If there is no convertor shown in this list for the forum software you wish to convert from, please check our website where further conversion modules may be available for download.', + 'CONVERT_NEW_CONVERSION' => 'New conversion', 'CONVERT_NOT_EXIST' => 'The specified convertor does not exist', 'CONVERT_SETTINGS_VERIFIED' => 'The information you entered has been verified. To start the conversion progress, push the button below to begin', 'CONV_ERROR_ATTACH_FTP_DIR' => 'FTP Upload for Attachments is enabled at the old board. Please copy all Attachment files to a directory accessible, disable ftp uploading and make sure a valid upload dir is specified. If you have done this, restart the convertor.', 'CONV_ERROR_CONFIG_EMPTY' => 'There is no configuration information available for the conversion.', 'CONV_ERROR_FORUM_ACCESS' => 'Unable to get forum access information.', + 'CONV_ERROR_FORUM_MAPPING' => 'The forum mapping information is missing.', 'CONV_ERROR_GET_CATEGORIES' => 'Unable to get categories.', 'CONV_ERROR_GET_CONFIG' => 'Could not retrieve your forum configuration.', 'CONV_ERROR_COULD_NOT_READ' => 'Unable to access/read "%s".', @@ -88,13 +92,14 @@ $lang = array_merge($lang, array( 'CONV_ERROR_NO_GROUP' => 'Group "%1$s" could not be found in %2$s.', 'CONV_ERROR_NO_RANKS_PATH' => 'Note to developer: you must specify $convertor[\'ranks_path\'] to use %s.', 'CONV_ERROR_NO_SMILIES_PATH' => 'Note to developer: you must specify $convertor[\'smilies_path\'] to use %s.', - 'CONV_ERROR_NO_UPLOAD_DIR' => 'Note to developer: you must specify $convertor[\'upload_dir\'] to use %s.', + 'CONV_ERROR_NO_UPLOAD_DIR' => 'Note to developer: you must specify $convertor[\'upload_path\'] to use %s.', 'CONV_ERROR_PERM_SETTING' => 'Unable to insert/update permission setting.', 'CONV_ERROR_PM_COUNT' => 'Unable to select folder pm count.', 'CONV_ERROR_REPLACE_CATEGORY' => 'Unable to insert new forum replacing old category.', 'CONV_ERROR_REPLACE_FORUM' => 'Unable to insert new forum replacing old forum.', 'CONV_ERROR_USER_ACCESS' => 'Unable to get user authentication information.', 'CONV_ERROR_WRONG_GROUP' => 'Wrong group "%1$s" defined in %2$s.', + 'CONV_SAVED_MESSAGES' => 'Saved Messages', 'COULD_NOT_COPY' => 'Could not copy file %1$s to %2$s

Please check that the target directory exists and is writable by the webserver', 'COULD_NOT_FIND_PATH' => 'Could not find path to your former forum. Please check your settings and try again.
» Specified source path was %s', @@ -277,7 +282,7 @@ $lang = array_merge($lang, array( 'STAGE_REQUIREMENTS' => 'Requirements', 'STAGE_SETTINGS' => 'Settings', 'STARTING_CONVERT' => 'Starting Conversion Process', - 'STEP_PERCENT_COMPLETED' => 'Step %d of %d: %d%% completed', + 'STEP_PERCENT_COMPLETED' => 'Step %d of %d', 'SUB_INTRO' => 'Introduction', 'SUB_LICENSE' => 'License', 'SUB_SUPPORT' => 'Support', @@ -286,7 +291,7 @@ $lang = array_merge($lang, array( 'SUPPORT_BODY' => 'During the beta phase a minimal level of support will be given at the phpBB 3.0 Beta support forum. We will provide answers to general setup questions, configuration problems and support for determining common problems mostly related to bugs. We will not support modifications, custom code/style additions or any users using the beta packages within a live environment.

For additional assistance, please refer to our Quick Start Guide.

To ensure you stay up to date with the latest news and releases, why not subscribe to our mailing list', 'SYNC_FORUMS' => 'Starting to sync forums', 'SYNC_TOPICS' => 'Starting to sync topics', - 'SYNC_TOPIC_ID' => 'Synchronising topics from topic_id $1%s to $2%s', + 'SYNC_TOPIC_ID' => 'Synchronising topics from topic_id %1$s to %2$s', 'TABLES_MISSING' => 'Could not find these tables
» %s.', 'TABLE_PREFIX' => 'Prefix for tables in database', @@ -297,6 +302,7 @@ $lang = array_merge($lang, array( 'UNABLE_WRITE_LOCK' => 'Unable to write lock file', 'UNAVAILABLE' => 'Unavailable', 'UNWRITEABLE' => 'Unwriteable', + 'UPDATE_TOPICS_POSTED' => 'Generating topics posted informations', 'VERSION' => 'Version',