From fd8bbba2f02b8bccd69e67c326fd320c0827941d Mon Sep 17 00:00:00 2001 From: Mageia SVN-Git Migration Date: Sun, 6 Feb 2011 22:37:08 +0000 Subject: Synthesized commit during git-svn import combining previous Mandriva history with Mageia. This commit consitsts of the following subversion commits: ------------------------------------------------------------------------ r431 | dmorgan | 2011-02-06 01:58:02 +0000 (Sun, 06 Feb 2011) | 1 line Add drakx structure on the SVN ------------------------------------------------------------------------ r432 | dmorgan | 2011-02-06 01:59:38 +0000 (Sun, 06 Feb 2011) | 1 line Import cleaned advertising ------------------------------------------------------------------------ r446 | dmorgan | 2011-02-06 22:37:08 +0000 (Sun, 06 Feb 2011) | 1 line Import Clean perl-install ------------------------------------------------------------------------ r448 | dmorgan | 2011-02-06 23:02:36 +0000 (Sun, 06 Feb 2011) | 1 line Add cleaned files ------------------------------------------------------------------------ r449 | dmorgan | 2011-02-06 23:03:52 +0000 (Sun, 06 Feb 2011) | 1 line Import cleaned kernel ------------------------------------------------------------------------ r450 | dmorgan | 2011-02-06 23:23:30 +0000 (Sun, 06 Feb 2011) | 1 line Import cleaned tools ------------------------------------------------------------------------ r451 | dmorgan | 2011-02-07 00:01:56 +0000 (Mon, 07 Feb 2011) | 1 line Import stage1 ------------------------------------------------------------------------ r473 | dmorgan | 2011-02-07 11:20:50 +0000 (Mon, 07 Feb 2011) | 1 line Import images ------------------------------------------------------------------------ r497 | ennael | 2011-02-09 21:02:06 +0000 (Wed, 09 Feb 2011) | 2 lines readd missing file ------------------------------------------------------------------------ r502 | pterjan | 2011-02-09 23:30:32 +0000 (Wed, 09 Feb 2011) | 1 line Import rescue ------------------------------------------------------------------------ r603 | ennael | 2011-02-24 13:32:54 +0000 (Thu, 24 Feb 2011) | 2 lines import cleaned rescue for Mageia ------------------------------------------------------------------------ r2061 | tv | 2011-10-20 20:32:19 +0100 (Thu, 20 Oct 2011) | 1 line import (cleaned) doc ------------------------------------------------------------------------ --- perl-install/install/share/po/am.po | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'perl-install/install/share/po/am.po') diff --git a/perl-install/install/share/po/am.po b/perl-install/install/share/po/am.po index 60eb6d3a6..f20f74f98 100644 --- a/perl-install/install/share/po/am.po +++ b/perl-install/install/share/po/am.po @@ -21,22 +21,22 @@ msgstr "" #: ../../advertising/IM_free.pl:1 #, c-format -msgid "The 100%% open source Mandriva Linux distribution" +msgid "The 100%% open source Mageia Linux distribution" msgstr "" #: ../../advertising/IM_one.pl:1 #, c-format -msgid "Explore Linux easily with Mandriva One" +msgid "Explore Linux easily with Mageia One" msgstr "" #: ../../advertising/IM_pwp.pl:1 #, c-format -msgid "A full Mandriva Linux desktop, with support" +msgid "A full Mageia Linux desktop, with support" msgstr "" #: ../../advertising/IM_range.pl:1 #, c-format -msgid "Mandriva: distributions for everybody's needs" +msgid "Mageia: distributions for everybody's needs" msgstr "" #: any.pm:109 @@ -87,13 +87,13 @@ msgstr "" #: any.pm:182 #, c-format msgid "" -"Contacting Mandriva Linux web site to get the list of available mirrors..." +"Contacting Mageia Linux web site to get the list of available mirrors..." msgstr "" #: any.pm:187 #, c-format msgid "" -"Failed contacting Mandriva Linux web site to get the list of available " +"Failed contacting Mageia Linux web site to get the list of available " "mirrors" msgstr "" @@ -646,8 +646,8 @@ msgstr "" #: share/meta-task/compssUsers.pl:190 #, fuzzy, c-format -msgid "Mandriva Wizards" -msgstr "የMandriva Linux ባለሞያ" +msgid "Mageia Wizards" +msgstr "የMageia Linux ባለሞያ" #: share/meta-task/compssUsers.pl:191 #, fuzzy, c-format @@ -677,8 +677,8 @@ msgstr "" #: steps_curses.pm:22 #, c-format -msgid "Mandriva Linux Installation %s" -msgstr "የMandriva Linux ተከላ %s" +msgid "Mageia Linux Installation %s" +msgstr "የMageia Linux ተከላ %s" #: steps_curses.pm:32 #, c-format @@ -694,19 +694,19 @@ msgstr "" #, c-format msgid "" "Your system is low on resources. You may have some problem installing\n" -"Mandriva Linux. If that occurs, you can try a text install instead. For " +"Mageia Linux. If that occurs, you can try a text install instead. For " "this,\n" "press `F1' when booting on CDROM, then enter `text'." msgstr "" #: steps_gtk.pm:239 #, c-format -msgid "Install Mandriva KDE Desktop" +msgid "Install Mageia KDE Desktop" msgstr "" #: steps_gtk.pm:240 #, c-format -msgid "Install Mandriva GNOME Desktop" +msgid "Install Mageia GNOME Desktop" msgstr "" #: steps_gtk.pm:241 @@ -999,7 +999,7 @@ msgstr "" #: steps_interactive.pm:211 #, c-format msgid "" -"Installer has detected that your installed Mandriva Linux system could not\n" +"Installer has detected that your installed Mageia Linux system could not\n" "safely be upgraded to %s.\n" "\n" "New installation replacing your previous one is recommended.\n" -- cgit v1.2.1