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

diff --git a/po/sr.po b/po/sr.po
index b915f358..533cad35 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mdkonline\n"
+"Project-Id-Version: mgaonline\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-06-07 16:23-0300\n"
 "PO-Revision-Date: 2003-02-15 09:31+0100\n"
@@ -33,7 +33,7 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
-"support@mandrivaonline.com"
+"support@mageiaonline.com"
 msgstr ""
 "Уколико имате било какав проблем пошаљите e-mail на support@mandrivaonline."
 "net\n"
@@ -54,7 +54,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
@@ -161,7 +161,7 @@ msgstr "Покрени userdrake"
 
 #: ../mdkapplet:459 ../mdkapplet:632
 #, c-format
-msgid "New version of Mandriva Linux distribution"
+msgid "New version of Mageia Linux distribution"
 msgstr ""
 
 #: ../mdkapplet:464
@@ -171,7 +171,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
@@ -219,7 +219,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 ""
 
@@ -230,8 +230,8 @@ msgstr ""
 
 #: ../mdkapplet:520
 #, fuzzy, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Online"
+msgid "Mageia Linux"
+msgstr "Mageia Online"
 
 #: ../mdkapplet:526
 #, c-format
@@ -293,7 +293,7 @@ msgstr ""
 
 #: ../mdkapplet:687
 #, c-format
-msgid "Launching MandrivaUpdate\n"
+msgid "Launching MageiaUpdate\n"
 msgstr ""
 
 #: ../mdkapplet:719
@@ -313,17 +313,17 @@ msgstr ""
 
 #: ../mdkapplet:893
 #, fuzzy, c-format
-msgid "Mandriva Online %s"
-msgstr "Mandriva Online"
+msgid "Mageia Online %s"
+msgstr "Mageia Online"
 
 #: ../mdkapplet:894
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
+msgid "Copyright (C) %s by %s"
 msgstr "Сва права (C) %s задржава Мандрива"
 
 #: ../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
@@ -392,7 +392,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
@@ -425,7 +425,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 ""
 
@@ -458,7 +458,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
@@ -519,15 +519,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
@@ -576,33 +576,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
 #, fuzzy, c-format
-msgid "Mandriva Mini"
-msgstr "Mandriva Online"
+msgid "Mageia Mini"
+msgstr "Mageia Online"
 
 #: ../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 ""
 
@@ -620,14 +620,14 @@ 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"
 "usage:\n"
 msgstr ""
 "mdkupdate верзија %s\n"
-"Сва права задржава (C) %s Mandriva.\n"
+"Сва права задржава (C) %s Mageia.\n"
 "Ово је бесплатни софтвер и може се слободно дистрибуирати под условима GNU "
 "GPL лиценце.\n"
 "\n"
@@ -640,7 +640,7 @@ msgstr "  --help\t\t- приказује ову поруку.\n"
 
 #: ../mdkupdate:65
 #, fuzzy, c-format
-msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
+msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr "  --applet\t\t- ажурира све информације.\n"
 
 #: ../mdkupdate:66
@@ -650,7 +650,7 @@ msgstr ""
 
 #: ../mdkupdate:67
 #, fuzzy, 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 "  --applet       - ажурира све информације.\n"
 
 #: ../mdkupdate:68
@@ -665,7 +665,7 @@ msgstr "Не могу да ажурирам пакете са update_source ме
 
 #, fuzzy
 #~ msgid "Mandiva Free"
-#~ msgstr "Mandriva Online"
+#~ msgstr "Mageia Online"
 
 #, fuzzy
 #~ msgid "Get Powerpack subscription!"
@@ -698,8 +698,8 @@ msgstr "Не могу да ажурирам пакете са update_source ме
 #~ msgstr "Проблем са повезивањем"
 
 #, fuzzy
-#~ msgid "Mandriva Linux Updates Applet"
-#~ msgstr "Mandriva Update"
+#~ msgid "Mageia Linux Updates Applet"
+#~ msgstr "Mageia Update"
 
 #, fuzzy
 #~ msgid "Security error"
@@ -832,8 +832,8 @@ msgstr "Не могу да ажурирам пакете са update_source ме
 #~ msgstr "Потврди лозинку:"
 
 #, fuzzy
-#~ msgid "Response from Mandriva Online server\n"
-#~ msgstr "Добродошли у Mandriva Linux"
+#~ msgid "Response from Mageia Online server\n"
+#~ msgstr "Добродошли у Mageia Linux"
 
 #, fuzzy
 #~ msgid "Checking config file: Not present\n"
@@ -847,14 +847,14 @@ msgstr "Не могу да ажурирам пакете са update_source ме
 
 #~ 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"
 #~ "usage:\n"
 #~ msgstr ""
 #~ "mdonline верзија %s\n"
-#~ "Сва права задржава (C) %s Mandriva.\n"
+#~ "Сва права задржава (C) %s Mageia.\n"
 #~ "Ово је бесплатни софтвер и може се слободно дистрибуирати под условима "
 #~ "GNU GPL лиценце.\n"
 #~ "\n"
@@ -884,15 +884,15 @@ msgstr "Не могу да ажурирам пакете са update_source ме
 #~ msgstr "Тачке монтирања треба да садрже само алфанумеричке карактере"
 
 #, fuzzy
-#~ msgid "Connecting to Mandriva Online website..."
-#~ msgstr "Добродошли у Mandriva Linux"
+#~ msgid "Connecting to Mageia Online website..."
+#~ msgstr "Добродошли у Mageia Linux"
 
 #~ msgid "Connection problem"
 #~ msgstr "Проблем са повезивањем"
 
 #, fuzzy
-#~ msgid "Create a Mandriva Online Account"
-#~ msgstr "Mandriva Club Рачун"
+#~ msgid "Create a Mageia Online Account"
+#~ msgstr "Mageia Club Рачун"
 
 #, fuzzy
 #~ msgid "Greeting:"
@@ -927,14 +927,14 @@ msgstr "Не могу да ажурирам пакете са update_source ме
 #~ msgstr "Поново уносим конфигурацију: "
 
 #, fuzzy
-#~ msgid "  --applet\t\t- launch Mandriva Update.\n"
+#~ msgid "  --applet\t\t- launch Mageia Update.\n"
 #~ msgstr "  --applet\t\t- ажурира све информације.\n"
 
 #~ msgid "Sending configuration..."
 #~ msgstr "Шаљем подешавања..."
 
-#~ msgid "Mandriva Update could not contact the site, we will try again."
-#~ msgstr "Mandriva Update не може да контактира сајт, покушаћемо поново."
+#~ msgid "Mageia Update could not contact the site, we will try again."
+#~ msgstr "Mageia Update не може да контактира сајт, покушаћемо поново."
 
 #~ msgid "Login:"
 #~ msgstr "Login:"