Ignore:
Timestamp:
Mar 31, 2010, 6:32:40 PM (14 years ago)
Author:
george
Message:
  • Upraveno: Aktualizace fóra.
File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/forum/language/en/install.php

    r400 r702  
    55*
    66* @package language
    7 * @version $Id: install.php 9177 2008-12-05 11:36:51Z acydburn $
     7* @version $Id$
    88* @copyright (c) 2005 phpBB Group
    99* @license http://opensource.org/licenses/gpl-license.php GNU Public License
    … …  
    134134        'DB_PORT'                                       => 'Database server port',
    135135        'DB_PORT_EXPLAIN'                       => 'Leave this blank unless you know the server operates on a non-standard port.',
     136        'DB_UPDATE_NOT_SUPPORTED'       => 'We are sorry, but this script does not support updating from versions of phpBB prior to “%1$s”. The version you currently have installed is “%2$s”. Please update to a previous version before running this script. Assistance with this is available in the Support Forum on phpBB.com.',
    136137        'DB_USERNAME'                           => 'Database username',
    137138        'DB_TEST'                                       => 'Test connection',
    … …  
    167168        'FILLING_TABLE'                         => 'Filling table <strong>%s</strong>',
    168169        'FILLING_TABLES'                        => 'Filling tables',
     170
     171        'FIREBIRD_DBMS_UPDATE_REQUIRED'         => 'phpBB no longer supports Firebird/Interbase prior to Version 2.1. Please update your Firebird installation to at least 2.1.0 before proceeding with the update.',
     172
    169173        'FINAL_STEP'                            => 'Process final step',
    170174        'FORUM_ADDRESS'                         => 'Board address',
    … …  
    185189        'INSTALL_CONGRATS'                      => 'Congratulations!',
    186190        'INSTALL_CONGRATS_EXPLAIN'      => '
    187                 <p>You have now successfully installed phpBB %1$s. From here, you have two options as to what to do with your newly installed phpBB3:</p>
     191                You have successfully installed phpBB %1$s. Please proceed by choosing one of the following options:</p>
    188192                <h2>Convert an existing board to phpBB3</h2>
    189                 <p>The phpBB Unified Convertor Framework supports the conversion of phpBB 2.0.x and other board systems to phpBB3. If you have an existing board that you wish to convert, please <a href="%2$s">proceed on to the convertor</a>.</p>
     193                <p>The phpBB Unified Convertor Framework supports the conversion of phpBB 2.0.x and other board systems to phpBB3. If you have an existing board that you wish to convert, please <a href="%2$s">proceed to the convertor</a>.</p>
    190194                <h2>Go live with your phpBB3!</h2>
    191                 <p>Clicking the button below will take you to your Administration Control Panel (ACP). Take some time to examine the options available to you. Remember that help is available online via the <a href="http://www.phpbb.com/support/documentation/3.0/">Documentation</a> and the <a href="http://www.phpbb.com/community/viewforum.php?f=46">support forums</a>, see the <a href="%3$s">README</a> for further information.</p><p><strong>Please now delete, move or rename the install directory before you use your board. If this directory is still present, only the Administration Control Panel (ACP) will be accessible.</strong></p>',
     195                <p>Clicking the button below will take you to a form for submitting statistical data to phpBB in your Administration Control Panel (ACP). We would appreciate it if you could help us by sending that information. Afterwards you should take some time to examine the options available to you. Remember that help is available online via the <a href="http://www.phpbb.com/support/documentation/3.0/">Documentation</a>, <a href="%3$s">README</a> and the <a href="http://www.phpbb.com/community/viewforum.php?f=46">Support Forums</a>.</p><p><strong>Please delete, move or rename the install directory before using your board. While this directory exists, only the Administration Control Panel (ACP) will be accessible.</strong>',
    192196        'INSTALL_INTRO'                         => 'Welcome to Installation',
    193197
    … …  
    209213                <li>PostgreSQL 7.3+</li>
    210214                <li>SQLite 2.8.2+</li>
    211                 <li>Firebird 2.0+</li>
     215                <li>Firebird 2.1+</li>
    212216                <li>MS SQL Server 2000 or above (directly or via ODBC)</li>
    213217                <li>Oracle</li>
    … …  
    231235        'INST_ERR_DB_NO_SQLITE'         => 'The version of the SQLite extension you have installed is too old, it must be upgraded to at least 2.8.2.',
    232236        'INST_ERR_DB_NO_ORACLE'         => 'The version of Oracle installed on this machine requires you to set the <var>NLS_CHARACTERSET</var> parameter to <var>UTF8</var>. Either upgrade your installation to 9.2+ or change the parameter.',
    233         'INST_ERR_DB_NO_FIREBIRD'       => 'The version of Firebird installed on this machine is older than 2.0, please upgrade to a newer version.',
     237        'INST_ERR_DB_NO_FIREBIRD'       => 'The version of Firebird installed on this machine is older than 2.1, please upgrade to a newer version.',
    234238        'INST_ERR_DB_NO_FIREBIRD_PS'=> 'The database you selected for Firebird has a page size less than 8192, it must be at least 8192.',
    235239        'INST_ERR_DB_NO_POSTGRES'       => 'The database you have selected was not created in <var>UNICODE</var> or <var>UTF8</var> encoding. Try installing with a database in <var>UNICODE</var> or <var>UTF8</var> encoding.',
    … …  
    269273        'MAKE_FOLDER_WRITABLE'          => 'Please make sure that this folder exists and is writable by the webserver then try again:<br />»<strong>%s</strong>.',
    270274        'MAKE_FOLDERS_WRITABLE'         => 'Please make sure that these folders exist and are writable by the webserver then try again:<br />»<strong>%s</strong>.',
     275
     276        'MYSQL_SCHEMA_UPDATE_REQUIRED'  => 'Your MySQL database schema for phpBB is outdated. phpBB detected a schema for MySQL 3.x/4.x, but the server runs on MySQL %2$s.<br /><strong>Before you proceed the update, you need to upgrade the schema.</strong><br /><br />Please refer to the <a href="http://www.phpbb.com/kb/article/doesnt-have-a-default-value-errors/">Knowledge Base article about upgrading the MySQL schema</a>. If you encounter problems, please use <a href="http://www.phpbb.com/community/viewforum.php?f=46">our support forums</a>.',
    271277
    272278        'NAMING_CONFLICT'                       => 'Naming conflict: %s and %s are both aliases<br /><br />%s',
    … …  
    363369// Updater
    364370$lang = array_merge($lang, array(
    365         'ALL_FILES_UP_TO_DATE'          => 'All files are up to date with the latest phpBB version. You should now <a href="../ucp.php?mode=login">login to your board</a> and check if everything is working fine. Do not forget to delete, rename or move your install directory!',
     371        'ALL_FILES_UP_TO_DATE'          => 'All files are up to date with the latest phpBB version. You should now <a href="../ucp.php?mode=login&amp;redirect=adm/index.php%3Fi=send_statistics%26mode=send_statistics">login to your board</a> and check if everything is working fine. Do not forget to delete, rename or move your install directory! Please send us updated information about your server and board configurations from the <a href="../ucp.php?mode=login&amp;redirect=adm/index.php%3Fi=send_statistics%26mode=send_statistics">Send statistics</a> module in your ACP.',
    366372        'ARCHIVE_FILE'                          => 'Source file within archive',
    367373
    … …  
    382388        'CONTINUE_UPDATE_NOW'                   => 'Continue the update process now',           // Shown within the database update script at the end if called from the updater
    383389        'CONTINUE_UPDATE'                               => 'Continue update now',                                       // Shown after file upload to indicate the update process is not yet finished
    384         'CURRENT_FILE'                                  => 'Beginning of current original file',
     390        'CURRENT_FILE'                                  => 'Begin of Conflict - Original File code before update',
    385391        'CURRENT_VERSION'                               => 'Current version',
    386392
    … …  
    392398        'DIFF_INLINE'                                           => 'Inline',
    393399        'DIFF_RAW'                                                      => 'Raw unified diff',
    394         'DIFF_SEP_EXPLAIN'                                      => 'End of current original file / Beginning of new updated file',
     400        'DIFF_SEP_EXPLAIN'                                      => 'Code block used within the updated/new file',
    395401        'DIFF_SIDE_BY_SIDE'                                     => 'Side by Side',
    396402        'DIFF_UNIFIED'                                          => 'Unified diff',
    … …  
    400406        'DOWNLOAD_AS'                                           => 'Download as',
    401407        'DOWNLOAD_UPDATE_METHOD_BUTTON'         => 'Download modified files archive (recommended)',
     408        'DOWNLOAD_CONFLICTS'                            => 'Download conflicts for this file',
     409        'DOWNLOAD_CONFLICTS_EXPLAIN'            => 'Search for &lt;&lt;&lt; to spot conflicts',
    402410        'DOWNLOAD_UPDATE_METHOD'                        => 'Download modified files archive',
    403411        'DOWNLOAD_UPDATE_METHOD_EXPLAIN'        => 'Once downloaded you should unpack the archive. You will find the modified files you need to upload to your phpBB root directory within it. Please upload the files to their respective locations then. After you have uploaded all files, please check the files again with the other button below.',
    … …  
    444452        'MERGE_NO_MERGE_NEW_OPTION'     => 'Do not merge - use new file',
    445453        'MERGE_NO_MERGE_MOD_OPTION'     => 'Do not merge - use currently installed file',
    446         'MERGE_MOD_FILE_OPTION'         => 'Merge differences and use modified code within conflicting block',
    447         'MERGE_NEW_FILE_OPTION'         => 'Merge differences and use new file code within conflicting block',
     454        'MERGE_MOD_FILE_OPTION'         => 'Merge modifications (removes new phpBB code within conflicting block)',
     455        'MERGE_NEW_FILE_OPTION'         => 'Merge modifications (removes modified code within conflicting block)',
    448456        'MERGE_SELECT_ERROR'            => 'Conflicting file merge modes are not correctly selected.',
    449457        'MERGING_FILES'                         => 'Merging differences',
    450458        'MERGING_FILES_EXPLAIN'         => 'Currently collecting final file changes.<br /><br />Please wait until phpBB has completed all operations on changed files.',
    451459
    452         'NEW_FILE'                                              => 'End of new updated file',
     460        'NEW_FILE'                                              => 'End of Conflict',
    453461        'NEW_USERNAME'                                  => 'New username',
    454462        'NO_AUTH_UPDATE'                                => 'Not authorised to update',
    … …  
    463471        'NOTICE'                                                => 'Notice',
    464472        'NUM_CONFLICTS'                                 => 'Number of conflicts',
    465         'NUMBER_OF_FILES_COLLECTED'             => 'Currently differences of %1$d of %2$d files have been checked.<br />Please wait until all files are checked.',
     473        'NUMBER_OF_FILES_COLLECTED'             => 'Currently differences from %1$d of %2$d files have been checked.<br />Please wait until all files are checked.',
    466474
    467475        'OLD_UPDATE_FILES'              => 'Update files are out of date. The update files found are for updating from phpBB %1$s to phpBB %2$s but the latest version of phpBB is %3$s.',
    … …  
    556564        'USER_INACTIVE'                                 => 'Inactive user',
    557565
    558         'VERSION_CHECK'                         => 'Version check',
    559         'VERSION_CHECK_EXPLAIN'         => 'Checks to see if the version of phpBB you are currently running is up to date.',
    560         'VERSION_NOT_UP_TO_DATE'        => 'Your version of phpBB is not up to date. Please continue the update process.',
    561         'VERSION_NOT_UP_TO_DATE_ACP'=> 'Your version of phpBB is not up to date.<br />Below you will find a link to the release announcement for the latest version as well as instructions on how to perform the update.',
    562         'VERSION_UP_TO_DATE'            => 'Your installation is up to date, no updates are available for your version of phpBB. You may want to continue anyway to perform a file validity check.',
    563         'VERSION_UP_TO_DATE_ACP'        => 'Your installation is up to date, no updates are available for your version of phpBB. You do not need to update your installation.',
    564         'VIEWING_FILE_CONTENTS'         => 'Viewing file contents',
    565         'VIEWING_FILE_DIFF'                     => 'Viewing file differences',
     566        'VERSION_CHECK'                                 => 'Version check',
     567        'VERSION_CHECK_EXPLAIN'                 => 'Checks to see if your phpBB installation is up to date.',
     568        'VERSION_NOT_UP_TO_DATE'                => 'Your phpBB installation is not up to date. Please continue the update process.',
     569        'VERSION_NOT_UP_TO_DATE_ACP'    => 'Your phpBB installation is not up to date.<br />Below is a link to the release announcement, which contains more information as well as instructions on updating.',
     570        'VERSION_NOT_UP_TO_DATE_TITLE'  => 'Your phpBB installation is not up to date.',
     571        'VERSION_UP_TO_DATE'                    => 'Your phpBB installation is up to date. Although there are no updates available at this time, you may continue in order to perform a file validity check.',
     572        'VERSION_UP_TO_DATE_ACP'                => 'Your phpBB installation is up to date. There are no updates available at this time.',
     573        'VIEWING_FILE_CONTENTS'                 => 'Viewing file contents',
     574        'VIEWING_FILE_DIFF'                             => 'Viewing file differences',
    566575
    567576        'WRONG_INFO_FILE_FORMAT'        => 'Wrong info file format',
Note: See TracChangeset for help on using the changeset viewer.