From 7dfa204f98efd362d629282830124c01b93646ae Mon Sep 17 00:00:00 2001 From: Romain d'Alverny Date: Thu, 2 Jun 2011 12:04:39 +0000 Subject: strings review (ahmad, CCBUG 1517) --- en/1/migrate/index.php | 2 +- en/1/migrate/locales.php | 37 +++++++++++++++++++------------------ 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/en/1/migrate/index.php b/en/1/migrate/index.php index 99f7bb3d8..8c07e460a 100644 --- a/en/1/migrate/index.php +++ b/en/1/migrate/index.php @@ -90,7 +90,7 @@ $_t = $_t[$locale];

  • $ su
    - # urpmi.addmedia --distrib <media_url>

    + # urpmi.addmedia --distrib <mirror_url>

    • diff --git a/en/1/migrate/locales.php b/en/1/migrate/locales.php index 98769cfa9..865c50a30 100644 --- a/en/1/migrate/locales.php +++ b/en/1/migrate/locales.php @@ -6,16 +6,16 @@ $_t = array( 'page_kw' => 'mageia, mandriva, upgrade, migrate', 'page_h1' => 'Migrate from Mandriva Linux', 'upgrading_general' => 'Upgrading from Mandriva Linux 2010.1 and 2010.2 is supported, and has been fine tuned over the past - months, so it should work. But as always and before:', - 'upgrading_general_array' => array('back up your data before upgrading;', - 'if you are upgrading a laptop, connect to power! + months, so it should work. But as always, before commencing with the upgrade:', + 'upgrading_general_array' => array('Back up your data before upgrading;', + 'if you are upgrading a laptop, do not leave it running on batteries, but connect it to AC power! You might be updating over 2000 packages, and this can take some time;', - 'do not start up any net-intensive applications during the upgrade + 'do not start up any any bandwidth-consuming applications during the upgrade – you need to reserve bandwidth for the upgrade.'), 'upgrading_ways' => 'There are several ways to upgrade from one of those previous Mandriva releases:', 'upgrading_ways_dvd' => 'using the Mageia 1 DVD', 'upgrading_ways_inline' => 'using the online media sources directly, - using mgaonline or urpmi.', + via mgaonline or urpmi.', 'h2_dvd' => 'Upgrade using the Mageia 1 DVD', 'dvd_clean_install' => 'You can use the Mageia 1 DVD to do a clean install but also to upgrade from previous releases.', @@ -32,28 +32,29 @@ $_t = array( 'inline_2' => 'This can be done either using the graphical mgaonline tool or the command-line urpmi. Both methods are outlined below. But first, download and install - this mgaonline package that will help you through the process:', - 'mgaonline_image_title' => 'for Mandriva Linux 2010.1 or 2010.2', - 'inline_3' => 'Note that you may get a security warning, due to invalid package signatures. - This is because a Mandriva system does not recognise Mageia signatures; - you can safely ignore these warnings. - Yes, that sucks, we know.', - 'a_or_b' => 'So, it installed the package? Good, let\'s move on and pick a) or b) below:', + this mgaonline package that is necessary for this method to work:', + 'mgaonline_image_title' => 'for Mandriva Linux 2010.1 and 2010.2', + 'inline_3' => 'Note that you may get a security warning, due to invalid RPM package key signatures. + This is because a Mandriva system would naturally not recognise the Mageia RPM signatures; + you can safely ignore these warnings.', + 'a_or_b' => 'So, the package has been installed? Good, let\'s move on, pick either a) or b) below:', 'h2_a' => 'a) Upgrading inline, using mgaonline (GUI)', 'popup_window_1' => 'a) Upgrading inline, using mgaonline (GUI)', - 'popup_window_2' => 'Just follow the wizard instructions; it will configure Mageia media sources and start the migration.', - 'as_soon_complete' => 'As soon as the migration is complete, you should restart your system; and here you are.', + 'popup_window_2' => 'Just follow the wizard instructions; it will configure the Mageia media sources and start the migration.', + 'as_soon_complete' => 'After the migration is complete, you should restart your system; and you should be presented by your upgraded system!', 'h2_b' => 'b) Upgrading inline, using urpmi (CLI)', 'cli_1' => 'You can also upgrade using urpmi from your favourite terminal emulator, - if you are confortable with it. Here are the steps:', + if you are more comfortable using the CLI. Here are the steps:', 'cli_2' => 'Remove all the existing media sources on your system:', 'cli_3' => 'Add the Mageia online sources:', - 'cli_4' => 'either directly (this will select a best matching mirror, after your location):', - 'cli_5' => 'either using a specific media mirror (you can decide from our mirrors list):', + 'cli_4' => 'Either using the MIRRORLIST (this will select the best matching mirror, + according to your geographical location); note that for this method to work, + you must have installed the mgaonline package (see above):', + 'cli_5' => 'Or using a specific media mirror (you can get the mirror_url from our mirrors list):', 'h2_thats_it' => 'That\'s it!', 'h3_question' => 'Have a question?', 'join_and_ask' => 'Do not hesitate to join our #mageia - IRC channel on Freenode or go in our forum + IRC channel on Freenode or posting in our forum to ask for assistance or details.', 'h3_feedback' => 'Want to send some feedback?', 'tweet_it' => 'Just tweet it to @mageia_org.' -- cgit v1.2.1