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

diff --git a/po/bs.po b/po/bs.po
index 85e2fd84..c0fb21c0 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -37,10 +37,10 @@ msgstr "Vaš sistem je up-to-date"
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
-"support@mandrivaonline.com"
+"support@mageiaonline.com"
 msgstr ""
 "Problem kod podešavanja servisa. Provjerite logove i pošaljite mail za "
-"support@mandrivaonline.com"
+"support@mageiaonline.com"
 
 #: ../mdkapplet:90
 #, c-format
@@ -54,7 +54,7 @@ msgstr "Nove ispravke su dostupne za vaš sistem"
 
 #: ../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
@@ -160,7 +160,7 @@ msgstr "Pokrećem drakconnect\n"
 
 #: ../mdkapplet:459 ../mdkapplet:632
 #, c-format
-msgid "New version of Mandriva Linux distribution"
+msgid "New version of Mageia Linux distribution"
 msgstr ""
 
 #: ../mdkapplet:464
@@ -170,7 +170,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
@@ -218,7 +218,7 @@ msgstr "Odustani"
 #: ../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 ""
 
@@ -229,8 +229,8 @@ msgstr ""
 
 #: ../mdkapplet:520
 #, fuzzy, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Online %s"
+msgid "Mageia Linux"
+msgstr "Mageia Online %s"
 
 #: ../mdkapplet:526
 #, c-format
@@ -292,8 +292,8 @@ msgstr ""
 
 #: ../mdkapplet:687
 #, c-format
-msgid "Launching MandrivaUpdate\n"
-msgstr "Pokrećem MandrivaUpdate\n"
+msgid "Launching MageiaUpdate\n"
+msgstr "Pokrećem MageiaUpdate\n"
 
 #: ../mdkapplet:719
 #, c-format
@@ -312,18 +312,18 @@ msgstr "Provjeravam mrežu: čini se da je isključena\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 "Autorska prava (C) %s Mandriva"
+msgid "Copyright (C) %s by %s"
+msgstr "Autorska prava (C) %s %s"
 
 #: ../mdkapplet:897
 #, c-format
-msgid "Mandriva Online gives access to Mandriva web services."
-msgstr "Mandriva Online vam omogućuje pristup Mandriva web uslugama."
+msgid "Mageia Online gives access to Mageia web services."
+msgstr "Mageia Online vam omogućuje pristup Mageia web uslugama."
 
 #: ../mdkapplet:899
 #, c-format
@@ -391,7 +391,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
@@ -424,7 +424,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 ""
 
@@ -457,7 +457,7 @@ msgstr "Došlo je do greške"
 
 #: ../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
@@ -518,15 +518,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 %s"
+msgid "Mageia Linux Features"
+msgstr "Mageia Online %s"
 
 #: ../mdkapplet_gui.pm:213
 #, c-format
@@ -575,33 +575,33 @@ msgstr ""
 
 #: ../mdkonline.pm:177
 #, fuzzy, c-format
-msgid "Mandriva Flash"
-msgstr "Mandriva Online %s"
+msgid "Mageia Flash"
+msgstr "Mageia Online %s"
 
 #: ../mdkonline.pm:178 ../mdkonline.pm:198
 #, fuzzy, c-format
-msgid "Mandriva Free"
-msgstr "Mandriva Online %s"
+msgid "Mageia Free"
+msgstr "Mageia Online %s"
 
 #: ../mdkonline.pm:179
 #, fuzzy, c-format
-msgid "Mandriva Mini"
-msgstr "Mandriva Online %s"
+msgid "Mageia Mini"
+msgstr "Mageia Online %s"
 
 #: ../mdkonline.pm:180
 #, fuzzy, c-format
-msgid "Mandriva One"
-msgstr "Mandriva Online %s"
+msgid "Mageia One"
+msgstr "Mageia Online %s"
 
 #: ../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 ""
 
@@ -619,14 +619,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 verzija %s\n"
-"Autorska prava (C) %s Mandriva.\n"
+"Autorska prava (C) %s Mageia.\n"
 "Ovo je slobodan softver i možete ga distribuirati pod uslovima GNU GPL-a.\n"
 "\n"
 "upotreba:\n"
@@ -638,8 +638,8 @@ msgstr "  --help\t\t- štampa ovu poruku.\n"
 
 #: ../mdkupdate:65
 #, c-format
-msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
-msgstr "  --auto\t\t- Mandriva Update se automatski pokreće.\n"
+msgid "  --auto\t\t- Mageia Update launched automatically.\n"
+msgstr "  --auto\t\t- Mageia Update se automatski pokreće.\n"
 
 #: ../mdkupdate:66
 #, c-format
@@ -648,8 +648,8 @@ msgstr "  --mnf\t\t\t- pokreni skripte specifične za mnf.\n"
 
 #: ../mdkupdate:67
 #, c-format
-msgid "  --noX\t\t\t- text mode version of Mandriva Update.\n"
-msgstr "  --noX\t\t\t- tekstualna verzija Mandriva Update.\n"
+msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
+msgstr "  --noX\t\t\t- tekstualna verzija Mageia Update.\n"
 
 #: ../mdkupdate:68
 #, c-format
@@ -663,7 +663,7 @@ msgstr "Nisam u mogućnosti da uradim update paketa sa update_source medija.\n"
 
 #, fuzzy
 #~ msgid "Mandiva Free"
-#~ msgstr "Mandriva Online %s"
+#~ msgstr "Mageia Online %s"
 
 #, fuzzy
 #~ msgid "Get Powerpack subscription!"
@@ -700,7 +700,7 @@ msgstr "Nisam u mogućnosti da uradim update paketa sa update_source medija.\n"
 #~ msgid "No"
 #~ msgstr "Ne"
 
-#~ msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
+#~ msgid "Mageia Online seems to be reinstalled, reloading applet ...."
 #~ msgstr "Madrakeonline je izgleda ponovo instaliran, pokrećem aplet..."
 
 #~ msgid "Checking... Updates are available\n"
@@ -713,8 +713,8 @@ msgstr "Nisam u mogućnosti da uradim update paketa sa update_source medija.\n"
 #~ msgid "Connecting to"
 #~ msgstr "Vežem se na"
 
-#~ msgid "Mandriva Linux Updates Applet"
-#~ msgstr "Mandriva Linux aplet sa ispravkama"
+#~ msgid "Mageia Linux Updates Applet"
+#~ msgstr "Mageia Linux aplet sa ispravkama"
 
 #~ msgid "Security error"
 #~ msgstr "Sigurnosna greška"
@@ -771,33 +771,33 @@ msgstr "Nisam u mogućnosti da uradim update paketa sa update_source medija.\n"
 #~ msgstr "Greška u usluzi"
 
 #~ msgid ""
-#~ "Mandriva web services are currently unavailable\n"
+#~ "Mageia web services are currently unavailable\n"
 #~ "Please Try again Later"
 #~ msgstr ""
-#~ "Mandriva web servisi su trenutno nedostupni\n"
+#~ "Mageia web servisi su trenutno nedostupni\n"
 #~ "Molim probajte opet kasnije"
 
 #~ msgid "Password mismatch"
 #~ msgstr "Šifre se ne poklapaju"
 
 #~ msgid ""
-#~ "Mandriva web services are under maintenance\n"
+#~ "Mageia web services are under maintenance\n"
 #~ "Please Try again Later"
 #~ msgstr ""
-#~ "U toku je redovno održavanje Mandriva web servisa\n"
+#~ "U toku je redovno održavanje Mageia web servisa\n"
 #~ "Molim probajte opet kasnije"
 
 #~ msgid "User Forbidden"
 #~ msgstr "Korisnik zabranjen"
 
-#~ msgid "User account forbidden by Mandriva web services"
-#~ msgstr "Korisnički račun je zabranjen na Mandriva web servisima"
+#~ msgid "User account forbidden by Mageia web services"
+#~ msgstr "Korisnički račun je zabranjen na Mageia web servisima"
 
 #~ msgid "Connection error"
 #~ msgstr "Greška u konekciji"
 
-#~ msgid "Mandriva web services not reachable"
-#~ msgstr "Mandriva web servisi su nedostupni"
+#~ msgid "Mageia web services not reachable"
+#~ msgstr "Mageia web servisi su nedostupni"
 
 #~ msgid ""
 #~ "  --bundle file.bundle\t- parse and install package from .bundle metainfo "
@@ -829,12 +829,12 @@ msgstr "Nisam u mogućnosti da uradim update paketa sa update_source medija.\n"
 #~ "%s"
 
 #~ msgid ""
-#~ "The version of the Mandriva Online client is too old.\n"
+#~ "The version of the Mageia Online client is too old.\n"
 #~ "\n"
 #~ "You need to update to a newer version. You can get a new one from http://"
 #~ "start.mandriva.com"
 #~ msgstr ""
-#~ "Verzija vašeg Mandriva Online klijenta je prestara.\n"
+#~ "Verzija vašeg Mageia Online klijenta je prestara.\n"
 #~ "\n"
 #~ "Morate nabaviti noviju verziju. Možete je preuzeti sa adrese http://start."
 #~ "mandriva.com"
@@ -899,9 +899,9 @@ msgstr "Nisam u mogućnosti da uradim update paketa sa update_source medija.\n"
 #~ msgid "Unknown state"
 #~ msgstr "Nepoznato stanje"
 
-#~ msgid "Online services disabled. Contact Mandriva Online site\n"
+#~ msgid "Online services disabled. Contact Mageia Online site\n"
 #~ msgstr ""
-#~ "Online servisi su isključeni. Kontaktirajte Mandriva Online stranicu\n"
+#~ "Online servisi su isključeni. Kontaktirajte Mageia Online stranicu\n"
 
 #~ msgid "Wrong Password.\n"
 #~ msgstr "Pogrešna šifra\n"
@@ -923,8 +923,8 @@ msgstr "Nisam u mogućnosti da uradim update paketa sa update_source medija.\n"
 #~ "Došlo je do problema prilikom spajanja na server, molim kontaktirajte tim "
 #~ "za podršku"
 
-#~ msgid "Response from Mandriva Online server\n"
-#~ msgstr "Odgovor sa Mandriva Online servera\n"
+#~ msgid "Response from Mageia Online server\n"
+#~ msgstr "Odgovor sa Mageia Online servera\n"
 
 #~ msgid "No check"
 #~ msgstr "Bez provjere"
@@ -940,14 +940,14 @@ msgstr "Nisam u mogućnosti da uradim update paketa sa update_source medija.\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 verzija %s\n"
-#~ "Autorska prava (C) %s Mandriva.\n"
+#~ "Autorska prava (C) %s Mageia.\n"
 #~ "Ovo je slobodan softver i možete ga distribuirati pod uslovima GNU GPL-"
 #~ "a.\n"
 #~ "\n"
@@ -999,9 +999,9 @@ msgstr "Nisam u mogućnosti da uradim update paketa sa update_source medija.\n"
 #~ msgid "Account creation or authentication"
 #~ msgstr "Kreiranje računa ili identifikacija"
 
-#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgid "Enter your Mageia Online login, password and machine name:"
 #~ msgstr ""
-#~ "Upišite svoje Mandriva Online korisničko ime, šifru i naziv računara:"
+#~ "Upišite svoje Mageia Online korisničko ime, šifru i naziv računara:"
 
 #~ msgid "Email address:"
 #~ msgstr "E-mail adresa:"
@@ -1018,14 +1018,14 @@ msgstr "Nisam u mogućnosti da uradim update paketa sa update_source medija.\n"
 #~ msgid "Machine name must be 1 to 40 alphanumerical characters"
 #~ msgstr "Naziv računara mora biti dugačak od 1 do 40 znakova"
 
-#~ msgid "Connecting to Mandriva Online website..."
-#~ msgstr "Povezujem se sa Mandriva Online web stranicom..."
+#~ msgid "Connecting to Mageia Online website..."
+#~ msgstr "Povezujem se sa Mageia Online web stranicom..."
 
 #~ 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"
@@ -1040,10 +1040,10 @@ msgstr "Nisam u mogućnosti da uradim update paketa sa update_source medija.\n"
 #~ "Furthermore, you benefit from discounted paid support services on\n"
 #~ "www.mandrivaexpert.com."
 #~ msgstr ""
-#~ "Da bi imali koristi od Mandriva Online servisa,\n"
+#~ "Da bi imali koristi od Mageia Online servisa,\n"
 #~ "mi ćemo poslati vaše postavke.\n"
 #~ "\n"
-#~ "Ovaj će Čarobnjak poslati sljedeće informacije Mandriva-u:\n"
+#~ "Ovaj će Čarobnjak poslati sljedeće informacije Mageia-u:\n"
 #~ "\n"
 #~ "1) listu paketa koje imate instalirane na sistemu,\n"
 #~ "\n"
@@ -1063,8 +1063,8 @@ msgstr "Nisam u mogućnosti da uradim update paketa sa update_source medija.\n"
 #~ msgid "Problem occurs when uploading files, please try again"
 #~ msgstr "Pojavio se problem prilikom slanja datoteka, pokušajte ponovo"
 
-#~ msgid "Create a Mandriva Online Account"
-#~ msgstr "Napravi račun na Mandriva Online"
+#~ msgid "Create a Mageia Online Account"
+#~ msgstr "Napravi račun na Mageia Online"
 
 #~ msgid "Greeting:"
 #~ msgstr "Pozdrav:"
@@ -1095,10 +1095,10 @@ msgstr "Nisam u mogućnosti da uradim update paketa sa update_source medija.\n"
 #~ msgstr "Pravljenje računa nije uspjelo!"
 
 #~ msgid ""
-#~ "Mandriva Online Account successfully created.\n"
+#~ "Mageia Online Account successfully created.\n"
 #~ "Please click \"Next\" to authenticate and upload your configuration\n"
 #~ msgstr ""
-#~ "Račun za Mandriva Online je uspješno napravljen.\n"
+#~ "Račun za Mageia Online je uspješno napravljen.\n"
 #~ "Kliknite na \"Dalje\" za identifikaciju i slanje vaših postavki\n"
 
 #~ msgid "Your upload was successful!"
@@ -1106,20 +1106,20 @@ msgstr "Nisam u mogućnosti da uradim update paketa sa update_source medija.\n"
 
 #~ msgid ""
 #~ "From now you will receive on security and updates \n"
-#~ "announcements thanks to Mandriva Online."
+#~ "announcements thanks to Mageia Online."
 #~ msgstr ""
 #~ "Od sada ćete primati obavještenja o sigurnosti i\n"
-#~ "ispravkama zahvaljujući Mandriva Online."
+#~ "ispravkama zahvaljujući Mageia Online."
 
 #~ 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 ""
-#~ "Mandriva Online daje vam priliku da automatizirate ispravke.\n"
+#~ "Mageia Online daje vam priliku da automatizirate ispravke.\n"
 #~ "Program će se pokrenuti na vašem sistemu i čekati nove ispravke\n"
 
-#~ msgid "Your Mandriva Online account has been successfully configured\n"
-#~ msgstr "Vaš račun za Mandriva Online je uspješno podešen\n"
+#~ msgid "Your Mageia Online account has been successfully configured\n"
+#~ msgstr "Vaš račun za Mageia Online je uspješno podešen\n"
 
 #~ msgid "Configuration uploaded successfully"
 #~ msgstr "Konfiguracija uspješno poslana"
@@ -1128,14 +1128,14 @@ msgstr "Nisam u mogućnosti da uradim update paketa sa update_source medija.\n"
 #~ msgstr "Problem pri slanju konfiguracije"
 
 #~ 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 ""
 #~ "Ne mogu se spojiti na mandrivaonline website: pogrešno korisničko ime ili "
 #~ "šifra ili problemi sa postavkama routera/firewalla"
 
-#~ msgid "  --applet\t\t- launch Mandriva Update.\n"
-#~ msgstr "  --applet\t\t- pokreće Mandriva Update.\n"
+#~ msgid "  --applet\t\t- launch Mageia Update.\n"
+#~ msgstr "  --applet\t\t- pokreće Mageia Update.\n"
 
 #~ msgid "Cannot get list of updates: %s"
 #~ msgstr "Ne mogu preuzeti spisak updatea: %s"