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

diff --git a/po/uz.po b/po/uz.po
index 4cedce7e..cb7765e7 100644
--- a/po/uz.po
+++ b/po/uz.po
@@ -6,7 +6,7 @@
 # Nurali Abdurahmonov <mavnur@gmail.com>, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: mdkonline-uz\n"
+"Project-Id-Version: mgaonline-uz\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-06-07 16:23-0300\n"
 "PO-Revision-Date: 2009-12-20 19:03+0500\n"
@@ -33,10 +33,10 @@ msgstr "Tizim yangilashga muhtoe emas"
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
-"support@mandrivaonline.com"
+"support@mageiaonline.com"
 msgstr ""
 "Xizmatni sozlashda muammo. Iltmos log jurnallarini tekshiring va  "
-"support@mandrivaonline.com manziliga xat joʻnating"
+"support@mageiaonline.com manziliga xat joʻnating"
 
 #: ../mdkapplet:90
 #, c-format
@@ -50,8 +50,8 @@ msgstr "Tizimingiz uchun yangilanish mavjud"
 
 #: ../mdkapplet:101
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released"
-msgstr "Mandriva Linux distributivining yangi versiyasi chiqdi"
+msgid "A new version of Mageia Linux distribution has been released"
+msgstr "Mageia Linux distributivining yangi versiyasi chiqdi"
 
 #: ../mdkapplet:119 ../mdkapplet:161
 #, c-format
@@ -154,8 +154,8 @@ msgstr "drakconnect'ni ishga tushirish\n"
 
 #: ../mdkapplet:459 ../mdkapplet:632
 #, c-format
-msgid "New version of Mandriva Linux distribution"
-msgstr "Mandriva Linux distributivining yangi versiyasi"
+msgid "New version of Mageia Linux distribution"
+msgstr "Mageia Linux distributivining yangi versiyasi"
 
 #: ../mdkapplet:464
 #, c-format
@@ -164,8 +164,8 @@ msgstr "Tanlash"
 
 #: ../mdkapplet:473
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released."
-msgstr "Mandriva Linux distributivining yangi versiyasi chiqdi."
+msgid "A new version of Mageia Linux distribution has been released."
+msgstr "Mageia Linux distributivining yangi versiyasi chiqdi."
 
 #: ../mdkapplet:475 ../mdkapplet:572
 #, c-format
@@ -212,7 +212,7 @@ msgstr "Bekor qilish"
 #: ../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 ""
 
@@ -223,8 +223,8 @@ msgstr ""
 
 #: ../mdkapplet:520
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia Linux"
+msgstr "Mageia Linux"
 
 #: ../mdkapplet:526
 #, c-format
@@ -293,8 +293,8 @@ msgstr ""
 
 #: ../mdkapplet:687
 #, c-format
-msgid "Launching MandrivaUpdate\n"
-msgstr "MandrivaUpdate ishga tushirilmoqda\n"
+msgid "Launching MageiaUpdate\n"
+msgstr "MageiaUpdate ishga tushirilmoqda\n"
 
 #: ../mdkapplet:719
 #, c-format
@@ -313,19 +313,19 @@ msgstr "Tarmoq tekshirilmoqda: oʻchirilgan koʻrinadi\n"
 
 #: ../mdkapplet:893
 #, c-format
-msgid "Mandriva Online %s"
-msgstr "Mandriva Online %s"
+msgid "Mageia Online %s"
+msgstr "Mageia Online %s"
 
 #: ../mdkapplet:894
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
-msgstr "Copyright (C) %s by Mandriva"
+msgid "Copyright (C) %s by %s"
+msgstr "Copyright (C) %s by %s"
 
 #: ../mdkapplet:897
 #, c-format
-msgid "Mandriva Online gives access to Mandriva web services."
+msgid "Mageia Online gives access to Mageia web services."
 msgstr ""
-"Mandriva Online, Mandriva veb xizmatlariga ulanish imkoniyatini beradi."
+"Mageia Online, Mageia veb xizmatlariga ulanish imkoniyatini beradi."
 
 #: ../mdkapplet:899
 #, c-format
@@ -395,8 +395,8 @@ msgstr "Ushbu qoʻshimcha dasturlar repozitoriysini oʻrnatishni istaysizmi?"
 
 #: ../mdkapplet:1061 ../mdkonline.pm:182
 #, c-format
-msgid "Mandriva Enterprise Server"
-msgstr "Mandriva Enterprise Server"
+msgid "Mageia Enterprise Server"
+msgstr "Mageia Enterprise Server"
 
 #: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
 #, c-format
@@ -430,7 +430,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 ""
 
@@ -463,8 +463,8 @@ msgstr "Xato roʻy berdi"
 
 #: ../mdkapplet-add-media-helper:200
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
-msgstr "Sizning Mandriva hisobingizda %s yozib olish yoqilmagan."
+msgid "Your Mageia account does not have %s download subscription enabled."
+msgstr "Sizning Mageia hisobingizda %s yozib olish yoqilmagan."
 
 #: ../mdkapplet-add-media-helper:226
 #, c-format
@@ -524,15 +524,15 @@ msgstr "Enterprise"
 #: ../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 Linux"
+msgid "Mageia Linux Features"
+msgstr "Mageia Linux"
 
 #: ../mdkapplet_gui.pm:213
 #, c-format
@@ -581,33 +581,33 @@ msgstr ""
 
 #: ../mdkonline.pm:177
 #, c-format
-msgid "Mandriva Flash"
-msgstr "Mandriva Flash"
+msgid "Mageia Flash"
+msgstr "Mageia Flash"
 
 #: ../mdkonline.pm:178 ../mdkonline.pm:198
 #, c-format
-msgid "Mandriva Free"
-msgstr "Mandriva Free"
+msgid "Mageia Free"
+msgstr "Mageia Free"
 
 #: ../mdkonline.pm:179
 #, c-format
-msgid "Mandriva Mini"
-msgstr "Mandriva Mini"
+msgid "Mageia Mini"
+msgstr "Mageia Mini"
 
 #: ../mdkonline.pm:180
 #, c-format
-msgid "Mandriva One"
-msgstr "Mandriva One"
+msgid "Mageia One"
+msgstr "Mageia One"
 
 #: ../mdkonline.pm:181 ../mdkonline.pm:194
 #, c-format
-msgid "Mandriva PowerPack"
-msgstr "Mandriva PowerPack"
+msgid "Mageia PowerPack"
+msgstr "Mageia PowerPack"
 
 #: ../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 ""
 
@@ -625,14 +625,14 @@ msgstr "Distributivni yangilash"
 #, 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, versiya %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "Bu erkin dastur va GNU GPL shartlari asosida tarqatilishi mumkin.\n"
 "\n"
 "Foydalanish:\n"
@@ -644,8 +644,8 @@ msgstr "  --help\t\t- shu yordam xabarini koʻrsatish.\n"
 
 #: ../mdkupdate:65
 #, c-format
-msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
-msgstr "  --auto\t\t- Mandriva Update avtomatik ishga tushadi.\n"
+msgid "  --auto\t\t- Mageia Update launched automatically.\n"
+msgstr "  --auto\t\t- Mageia Update avtomatik ishga tushadi.\n"
 
 #: ../mdkupdate:66
 #, c-format
@@ -654,8 +654,8 @@ msgstr "  --mnf\t\t\t- mnf skriptini ishga tushirish.\n"
 
 #: ../mdkupdate:67
 #, c-format
-msgid "  --noX\t\t\t- text mode version of Mandriva Update.\n"
-msgstr "  --noX\t\t\t- Mandriva Update matn usuli.\n"
+msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
+msgstr "  --noX\t\t\t- Mageia Update matn usuli.\n"
 
 #: ../mdkupdate:68
 #, c-format
@@ -677,22 +677,22 @@ msgstr "update_source toʻplamidan paketlarni yangilab boʻlmadi.\n"
 
 #, fuzzy
 #~ msgid ""
-#~ "Your Mandriva account does not have Extended Maintenance subscription "
+#~ "Your Mageia account does not have Extended Maintenance subscription "
 #~ "enabled."
-#~ msgstr "Sizning Mandriva hisobingizda %s yozib olish yoqilmagan."
+#~ msgstr "Sizning Mageia hisobingizda %s yozib olish yoqilmagan."
 
 #, fuzzy
 #~ msgid "Mandiva Free"
-#~ msgstr "Mandriva Free"
+#~ msgstr "Mageia Free"
 
 #, fuzzy
 #~ msgid "Get Powerpack subscription!"
 #~ msgstr "Kompyuterning nomi:"
 
 #~ msgid ""
-#~ "Your Mandriva account does not have Powerpack download subscription "
+#~ "Your Mageia account does not have Powerpack download subscription "
 #~ "enabled."
-#~ msgstr "Sizning Mandriva hisobingizda Powerpack'ni yozib olish yoqilmagan."
+#~ msgstr "Sizning Mageia hisobingizda Powerpack'ni yozib olish yoqilmagan."
 
 #~ msgid ""
 #~ "Your system does not have enough space left in %s for upgrade (%dMB < %"
@@ -712,8 +712,8 @@ msgstr "update_source toʻplamidan paketlarni yangilab boʻlmadi.\n"
 #~ msgid "Congratulations"
 #~ msgstr "Tabriklaymiz"
 
-#~ msgid "Upgrade to Mandriva %s release was successfull."
-#~ msgstr "Mandriva %s reliziga yangilash muvaffaqiyatli amalgan oshirildi."
+#~ msgid "Upgrade to Mageia %s release was successfull."
+#~ msgstr "Mageia %s reliziga yangilash muvaffaqiyatli amalgan oshirildi."
 
 #~ msgid "You must restart your system."
 #~ msgstr "Tizimni oʻchirib-yoqishingiz kerak."
@@ -726,9 +726,9 @@ msgstr "update_source toʻplamidan paketlarni yangilab boʻlmadi.\n"
 
 #, fuzzy
 #~ msgid ""
-#~ "The version of Mandriva Linux installed on your system is no longer "
+#~ "The version of Mageia Linux installed on your system is no longer "
 #~ "supported."
-#~ msgstr "Mandriva Linux distributivining yangi versiyasi chiqdi."
+#~ msgstr "Mageia Linux distributivining yangi versiyasi chiqdi."
 
 #~ msgid "Yes"
 #~ msgstr "Ha"
@@ -859,8 +859,8 @@ msgstr "update_source toʻplamidan paketlarni yangilab boʻlmadi.\n"
 #~ msgstr "Maxfiy soʻz notoʻgʻri.\n"
 
 #, fuzzy
-#~ msgid "Response from Mandriva Online server\n"
-#~ msgstr "Mandriva Online'ga marhamat"
+#~ msgid "Response from Mageia Online server\n"
+#~ msgstr "Mageia Online'ga marhamat"
 
 #~ msgid "Logs"
 #~ msgstr "Loglar"
@@ -870,14 +870,14 @@ msgstr "update_source toʻplamidan paketlarni yangilab boʻlmadi.\n"
 
 #~ 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, versiya %s\n"
-#~ "Copyright (C) %s Mandriva.\n"
+#~ "Copyright (C) %s Mageia.\n"
 #~ "Bu erkin dastur va GNU GPL shartlari asosida tarqatilishi mumkin.\n"
 #~ "\n"
 #~ "Foydalanish:\n"
@@ -906,14 +906,14 @@ msgstr "update_source toʻplamidan paketlarni yangilab boʻlmadi.\n"
 #~ msgstr "Ulash nuqtalari faqat son yoki harflardan iborat boʻlishi mumkin"
 
 #, fuzzy
-#~ msgid "Connecting to Mandriva Online website..."
-#~ msgstr "Mandriva Online'ga marhamat"
+#~ msgid "Connecting to Mageia Online website..."
+#~ msgstr "Mageia Online'ga marhamat"
 
 #~ msgid "Connection problem"
 #~ msgstr "Aloqa oʻrnatishda muammo"
 
-#~ msgid "Create a Mandriva Online Account"
-#~ msgstr "Mandriva Online hisobini yaratish"
+#~ msgid "Create a Mageia Online Account"
+#~ msgstr "Mageia Online hisobini yaratish"
 
 #, fuzzy
 #~ msgid "Greeting:"
@@ -951,8 +951,8 @@ msgstr "update_source toʻplamidan paketlarni yangilab boʻlmadi.\n"
 #~ msgid "Problem uploading configuration"
 #~ msgstr "Moslamalar joʻnatilmoqda..."
 
-#~ msgid "  --applet\t\t- launch Mandriva Update.\n"
-#~ msgstr "  --applet\t\t- Mandriva Update xizmatini ishga tushirish.\n"
+#~ msgid "  --applet\t\t- launch Mageia Update.\n"
+#~ msgstr "  --applet\t\t- Mageia Update xizmatini ishga tushirish.\n"
 
 #~ msgid "Login:"
 #~ msgstr "Foydalanuvchi:"
@@ -994,9 +994,9 @@ msgstr "update_source toʻplamidan paketlarni yangilab boʻlmadi.\n"
 #~ msgstr "Yordamchidan chiqilmoqda\n"
 
 #~ msgid ""
-#~ "Mandriva Online could not be contacted, please try again at a later time"
+#~ "Mageia Online could not be contacted, please try again at a later time"
 #~ msgstr ""
-#~ "Mandriva Online bilan aloqa oʻrnatib boʻlmadi. Iltimos keyinroq urinib "
+#~ "Mageia Online bilan aloqa oʻrnatib boʻlmadi. Iltimos keyinroq urinib "
 #~ "koʻring"
 
 #~ msgid "  --update       - Update keys\n"