Synthesized commit during git-svn import combining previous Mandriva history with Mageia.2.77.22

This commit consitsts of the following subversion commits:

------------------------------------------------------------------------
r1310 | dmorgan | 2011-05-14 01:22:07 +0100 (Sat, 14 May 2011) | 1 line

Import cleaned mgaonline
------------------------------------------------------------------------

1 files changed, 31 insertions, 31 deletions

diff --git a/po/am.po b/po/am.po
index 65474f50..b8836ace 100644
--- a/po/am.po
+++ b/po/am.po
@@ -28,7 +28,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
-"support@mandrivaonline.com"
+"support@mageiaonline.com"
 msgstr ""
 
 #: ../mdkapplet:90
@@ -43,7 +43,7 @@ msgstr ""
 
 #: ../mdkapplet:101
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released"
+msgid "A new version of Mageia Linux distribution has been released"
 msgstr ""
 
 #: ../mdkapplet:119 ../mdkapplet:161
@@ -143,7 +143,7 @@ msgstr ""
 
 #: ../mdkapplet:459 ../mdkapplet:632
 #, c-format
-msgid "New version of Mandriva Linux distribution"
+msgid "New version of Mageia Linux distribution"
 msgstr ""
 
 #: ../mdkapplet:464
@@ -153,7 +153,7 @@ msgstr ""
 
 #: ../mdkapplet:473
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released."
+msgid "A new version of Mageia Linux distribution has been released."
 msgstr ""
 
 #: ../mdkapplet:475 ../mdkapplet:572
@@ -201,7 +201,7 @@ msgstr "ተወው"
 #: ../mdkapplet:508
 #, c-format
 msgid ""
-"Maintenance for this Mandriva Linux version has ended. No more updates will "
+"Maintenance for this Mageia Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
@@ -212,7 +212,7 @@ msgstr ""
 
 #: ../mdkapplet:520
 #, c-format
-msgid "Mandriva Linux"
+msgid "Mageia Linux"
 msgstr ""
 
 #: ../mdkapplet:526
@@ -275,7 +275,7 @@ msgstr ""
 
 #: ../mdkapplet:687
 #, c-format
-msgid "Launching MandrivaUpdate\n"
+msgid "Launching MageiaUpdate\n"
 msgstr ""
 
 #: ../mdkapplet:719
@@ -295,17 +295,17 @@ msgstr ""
 
 #: ../mdkapplet:893
 #, c-format
-msgid "Mandriva Online %s"
+msgid "Mageia Online %s"
 msgstr ""
 
 #: ../mdkapplet:894
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
+msgid "Copyright (C) %s by %s"
 msgstr ""
 
 #: ../mdkapplet:897
 #, c-format
-msgid "Mandriva Online gives access to Mandriva web services."
+msgid "Mageia Online gives access to Mageia web services."
 msgstr ""
 
 #: ../mdkapplet:899
@@ -374,7 +374,7 @@ msgstr ""
 
 #: ../mdkapplet:1061 ../mdkonline.pm:182
 #, c-format
-msgid "Mandriva Enterprise Server"
+msgid "Mageia Enterprise Server"
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
@@ -407,7 +407,7 @@ msgstr ""
 #: ../mdkapplet-add-media-helper:161
 #, c-format
 msgid ""
-"Mandriva provides 12 months of desktop updates (until %s) and 18 months of "
+"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
 "base updates (up to the %s) for distributions."
 msgstr ""
 
@@ -440,7 +440,7 @@ msgstr "ስህተት ተፈጥሯል"
 
 #: ../mdkapplet-add-media-helper:200
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
+msgid "Your Mageia account does not have %s download subscription enabled."
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:226
@@ -501,15 +501,15 @@ msgstr ""
 #: ../mdkapplet_gui.pm:87
 #, c-format
 msgid ""
-"Mandriva Powerpack brings you the best of Linux experience for desktop: "
+"Mageia Powerpack brings you the best of Linux experience for desktop: "
 "stability and efficiency of open source solutions together with exclusive "
-"softwares and Mandriva official support."
+"softwares and Mageia official support."
 msgstr ""
 
 #: ../mdkapplet_gui.pm:94
 #, fuzzy, c-format
-msgid "Mandriva Linux Features"
-msgstr "Mandriva Online"
+msgid "Mageia Linux Features"
+msgstr "Mageia Online"
 
 #: ../mdkapplet_gui.pm:213
 #, c-format
@@ -558,33 +558,33 @@ msgstr ""
 
 #: ../mdkonline.pm:177
 #, fuzzy, c-format
-msgid "Mandriva Flash"
-msgstr "Mandriva Online"
+msgid "Mageia Flash"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:178 ../mdkonline.pm:198
 #, fuzzy, c-format
-msgid "Mandriva Free"
-msgstr "Mandriva Online"
+msgid "Mageia Free"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:179
 #, c-format
-msgid "Mandriva Mini"
+msgid "Mageia Mini"
 msgstr ""
 
 #: ../mdkonline.pm:180
 #, fuzzy, c-format
-msgid "Mandriva One"
-msgstr "Mandriva Online"
+msgid "Mageia One"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:181 ../mdkonline.pm:194
 #, fuzzy, c-format
-msgid "Mandriva PowerPack"
-msgstr "Mandriva Online"
+msgid "Mageia PowerPack"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:195
 #, c-format
 msgid ""
-"The Mandriva Linux distribution with even more softwares and official "
+"The Mageia Linux distribution with even more softwares and official "
 "support."
 msgstr ""
 
@@ -602,7 +602,7 @@ msgstr ""
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
@@ -616,7 +616,7 @@ msgstr ""
 
 #: ../mdkupdate:65
 #, c-format
-msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
+msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr ""
 
 #: ../mdkupdate:66
@@ -626,7 +626,7 @@ msgstr ""
 
 #: ../mdkupdate:67
 #, c-format
-msgid "  --noX\t\t\t- text mode version of Mandriva Update.\n"
+msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr ""
 
 #: ../mdkupdate:68
@@ -641,7 +641,7 @@ msgstr ""
 
 #, fuzzy
 #~ msgid "Mandiva Free"
-#~ msgstr "Mandriva Online"
+#~ msgstr "Mageia Online"
 
 #, fuzzy
 #~ msgid "Installation failed"