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, 46 insertions, 46 deletions

diff --git a/po/hi.po b/po/hi.po
index 38959e51..acb4e11a 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -6,7 +6,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mdkonline-hi\n"
+"Project-Id-Version: mgaonline-hi\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-06-07 16:23-0300\n"
 "PO-Revision-Date: 2005-08-21 14:31+0530\n"
@@ -33,10 +33,10 @@ msgstr "आपका तंत्र आज-तक अप-टू-डेट ह�
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
-"support@mandrivaonline.com"
+"support@mageiaonline.com"
 msgstr ""
 "सेवा संरचना समस्या । कॄपया लॉग की जाँच करें और निम्न पते पर एक विपत्र संदेश भेजें "
-"support@mandrivaonline.com"
+"support@mageiaonline.com"
 
 #: ../mdkapplet:90
 #, c-format
@@ -50,7 +50,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
@@ -157,7 +157,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
@@ -167,7 +167,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
@@ -215,7 +215,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 ""
 
@@ -226,7 +226,7 @@ msgstr ""
 
 #: ../mdkapplet:520
 #, fuzzy, c-format
-msgid "Mandriva Linux"
+msgid "Mageia Linux"
 msgstr "मैनड्रिवऑनलाइन"
 
 #: ../mdkapplet:526
@@ -289,7 +289,7 @@ msgstr ""
 
 #: ../mdkapplet:687
 #, fuzzy, c-format
-msgid "Launching MandrivaUpdate\n"
+msgid "Launching MageiaUpdate\n"
 msgstr "एमडीकेअपडेट को आरम्भ किया जा रहा है\n"
 
 #: ../mdkapplet:719
@@ -309,17 +309,17 @@ msgstr "नेटवर्क की जाँच की जा रही है
 
 #: ../mdkapplet:893
 #, fuzzy, 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
@@ -388,7 +388,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
@@ -421,7 +421,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 ""
 
@@ -454,7 +454,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
@@ -515,14 +515,14 @@ 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"
+msgid "Mageia Linux Features"
 msgstr "मैनड्रिवऑनलाइन"
 
 #: ../mdkapplet_gui.pm:213
@@ -572,33 +572,33 @@ msgstr ""
 
 #: ../mdkonline.pm:177
 #, fuzzy, c-format
-msgid "Mandriva Flash"
+msgid "Mageia Flash"
 msgstr "मैनड्रिवऑनलाइन"
 
 #: ../mdkonline.pm:178 ../mdkonline.pm:198
 #, fuzzy, c-format
-msgid "Mandriva Free"
+msgid "Mageia Free"
 msgstr "मैनड्रिवऑनलाइन"
 
 #: ../mdkonline.pm:179
 #, fuzzy, c-format
-msgid "Mandriva Mini"
+msgid "Mageia Mini"
 msgstr "मैनड्रिवऑनलाइन"
 
 #: ../mdkonline.pm:180
 #, fuzzy, c-format
-msgid "Mandriva One"
+msgid "Mageia One"
 msgstr "मैनड्रिवऑनलाइन"
 
 #: ../mdkonline.pm:181 ../mdkonline.pm:194
 #, fuzzy, c-format
-msgid "Mandriva PowerPack"
+msgid "Mageia PowerPack"
 msgstr "मैनड्रिवऑनलाइन"
 
 #: ../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 ""
 
@@ -616,7 +616,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"
@@ -636,7 +636,7 @@ msgstr "  --help\t\t- यह सहायता संदेश छापें
 
 #: ../mdkupdate:65
 #, c-format
-msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
+msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr "  --auto\t\t- एमडीकेअपडेट का स्वचालित रूप से शुरू होना ।\n"
 
 #: ../mdkupdate:66
@@ -646,7 +646,7 @@ msgstr "  --mnf\t\t\t- एमएनएफ़ विशिष्ट स्क्र�
 
 #: ../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 "  --noX\t\t\t- मैनड्रिव अपडेट का पाठ विधा संस्मरण।\n"
 
 #: ../mdkupdate:68
@@ -696,7 +696,7 @@ msgstr "एमडीकेअपडेट माध्यम से पैके
 #~ msgid "No"
 #~ msgstr "नहीं"
 
-#~ msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
+#~ msgid "Mageia Online seems to be reinstalled, reloading applet ...."
 #~ msgstr ""
 #~ "एमडीकेऑनलाइन का लगता है कि पुनः संसाधन किया गया है, एपलेट को पुनः लाया जा रहा "
 #~ "है .... "
@@ -711,7 +711,7 @@ msgstr "एमडीकेअपडेट माध्यम से पैके
 #~ msgid "Connecting to"
 #~ msgstr "से सम्बन्ध स्थापित हो रहा है"
 
-#~ msgid "Mandriva Linux Updates Applet"
+#~ msgid "Mageia Linux Updates Applet"
 #~ msgstr "मैनड्रिव अपडेटो का एपलेट"
 
 #, fuzzy
@@ -838,7 +838,7 @@ msgstr "एमडीकेअपडेट माध्यम से पैके
 #~ msgid "Unknown state"
 #~ msgstr "अज्ञात अवस्था"
 
-#~ msgid "Online services disabled. Contact Mandriva Online site\n"
+#~ msgid "Online services disabled. Contact Mageia Online site\n"
 #~ msgstr "ऑनलाइन सेवायें निष्क्रिय है । मैनड्रिवऑनलाइन स्थल से सम्पर्क करें\n"
 
 #~ msgid "Wrong Password.\n"
@@ -859,7 +859,7 @@ msgstr "एमडीकेअपडेट माध्यम से पैके
 #~ "support team"
 #~ msgstr "सर्वर से संबंध स्थापित करते समय समस्या हुई, कृपया सहायता दल से सम्पर्क करें"
 
-#~ msgid "Response from Mandriva Online server\n"
+#~ msgid "Response from Mageia Online server\n"
 #~ msgstr "मैनड्रिवऑनलाइन सर्वर से प्रतिउत्तर\n"
 
 #~ msgid "No check"
@@ -877,7 +877,7 @@ msgstr "एमडीकेअपडेट माध्यम से पैके
 #, fuzzy
 #~ msgid ""
 #~ "mdonline 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"
@@ -912,7 +912,7 @@ msgstr "एमडीकेअपडेट माध्यम से पैके
 #~ msgid "Account creation or authentication"
 #~ msgstr "खाते का निर्माण या प्रमाणीकरण"
 
-#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgid "Enter your Mageia Online login, password and machine name:"
 #~ msgstr "अपना मैनड्रिवऑनलाइन लॉग-इन, कूटशब्द और मशीन नाम बतायें:"
 
 #, fuzzy
@@ -929,14 +929,14 @@ msgstr "एमडीकेअपडेट माध्यम से पैके
 #~ msgid "Machine name must be 1 to 40 alphanumerical characters"
 #~ msgstr "आरोह बिन्दुओं के नाम में सिर्फ़ शब्द व संख्या होना चाहिए"
 
-#~ msgid "Connecting to Mandriva Online website..."
+#~ msgid "Connecting to Mageia Online website..."
 #~ msgstr "मैनड्रिवऑनलाइन वेब-स्थल से जुड़ा जा रहा है..."
 
 #~ msgid ""
-#~ "In order to benefit from Mandriva Online services,\n"
+#~ "In order to benefit from Mageia Online services,\n"
 #~ "we are about to upload your configuration.\n"
 #~ "\n"
-#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "The Wizard will now send the following information to Mageia:\n"
 #~ "\n"
 #~ "1) the list of packages you have installed on your system,\n"
 #~ "\n"
@@ -975,7 +975,7 @@ msgstr "एमडीकेअपडेट माध्यम से पैके
 #~ msgid "Problem occurs when uploading files, please try again"
 #~ msgstr "संचिकाओं को अपलोड करते समय समस्या हुई, कॄपया पुनः प्रयास करें"
 
-#~ msgid "Create a Mandriva Online Account"
+#~ msgid "Create a Mageia Online Account"
 #~ msgstr "एक मैनड्रिवऑनलाइन खाता खोलें"
 
 #, fuzzy
@@ -1007,7 +1007,7 @@ msgstr "एमडीकेअपडेट माध्यम से पैके
 #~ msgstr "एक वैध विपत्र पता नहीं!\n"
 
 #~ msgid ""
-#~ "Mandriva Online Account successfully created.\n"
+#~ "Mageia Online Account successfully created.\n"
 #~ "Please click \"Next\" to authenticate and upload your configuration\n"
 #~ msgstr ""
 #~ "मैनड्रिवऑनलाइन खाते को सफ़लता-पूर्वक निर्मित किया गया ।\n"
@@ -1018,20 +1018,20 @@ msgstr "एमडीकेअपडेट माध्यम से पैके
 
 #~ msgid ""
 #~ "From now you will receive on security and updates \n"
-#~ "announcements thanks to Mandriva Online."
+#~ "announcements thanks to Mageia Online."
 #~ msgstr ""
 #~ "अब से आप सुरक्षा व अपडेटो की घोषणाओं को प्राप्त करेगें \n"
 #~ "मैनड्रिवऑनलाइन को धन्यवाद।"
 
 #~ msgid ""
-#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "Mageia Online offers you the ability to automate the updates.\n"
 #~ "A program will run regulary in your system waiting for new updates\n"
 #~ msgstr ""
 #~ "मैनड्रिवऑनलाइन आपको अपडेटो को स्वचालित रूप से करने की क्षमता प्रदान करने को "
 #~ "प्रस्तावित करता है।\n"
 #~ "आपके तंत्र में एक कार्यक्रम लगातार नये अपडेटो की प्रतीक्षा में चलता रहेगा\n"
 
-#~ msgid "Your Mandriva Online account has been successfully configured\n"
+#~ msgid "Your Mageia Online account has been successfully configured\n"
 #~ msgstr "आपके मैनड्रिवऑनलाइन खाते को सफ़लता-पूर्वक संरचित किया गया\n"
 
 #~ msgid "Configuration uploaded successfully"
@@ -1041,13 +1041,13 @@ msgstr "एमडीकेअपडेट माध्यम से पैके
 #~ msgstr "संरचना-सूचना को अपलोड करने में समस्या"
 
 #~ msgid ""
-#~ "Cannot connect to Mandriva Online website: wrong login/password or router/"
+#~ "Cannot connect to Mageia Online website: wrong login/password or router/"
 #~ "firewall bad settings"
 #~ msgstr ""
 #~ "मैनड्रिवऑनलाइन वेब-स्थल से जुड़ा नहीं जा सका: गलत लॉग-इन/पासवर्ड या रूटर/फ़ायरवाल की "
 #~ "खराब सेटिंग्स"
 
-#~ msgid "  --applet\t\t- launch Mandriva Update.\n"
+#~ msgid "  --applet\t\t- launch Mageia Update.\n"
 #~ msgstr "  --applet\t\t- मैनड्रिवअपडेट की शुरूवात।\n"
 
 #~ msgid "Choose which packages should be installed and Press Ok"
@@ -1062,7 +1062,7 @@ msgstr "एमडीकेअपडेट माध्यम से पैके
 #~ msgid "No %s file found. Run mdkonline wizard first"
 #~ msgstr "कोई %s फ़ाइल नहीं मिली । सर्वप्रथम एमडीकेऑनलाइन विज़ार्ड को चलाएँ"
 
-#~ msgid "Mandriva Update could not contact the site, we will try again."
+#~ msgid "Mageia Update could not contact the site, we will try again."
 #~ msgstr ""
 #~ "मैनड्रिवअपडेट इस स्थल से सम्पर्क स्थापित नहीं कर सकाया, हम कुछ समय उपरान्त पुनः प्रयास "
 #~ "करेगें ।"
@@ -1079,8 +1079,8 @@ msgstr "एमडीकेअपडेट माध्यम से पैके
 #~ msgid ""
 #~ "Your login or password was wrong.\n"
 #~ " Either you'll have to type it again, or you'll need to create an account "
-#~ "on Mandriva Online.\n"
-#~ " In the latter case, go back to the first step to connect to Mandriva "
+#~ "on Mageia Online.\n"
+#~ " In the latter case, go back to the first step to connect to Mageia "
 #~ "Online.\n"
 #~ " Be aware that you must also provide a Machine name \n"
 #~ " (only alphabetical characters are admitted)"