sync with code

1 files changed, 111 insertions, 284 deletions

diff --git a/po/mk.po b/po/mk.po
index 2d4eb3f7..054ce054 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mgaonline-mk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-07 16:23-0300\n"
+"POT-Creation-Date: 2012-09-06 18:01+0200\n"
 "PO-Revision-Date: 2006-09-17 20:55-0700\n"
 "Last-Translator: Zoran Dimovski <zoki.dimovski@gmail.com>\n"
 "Language-Team: Macedonian\n"
@@ -20,17 +20,17 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural= n==1 || n%10==1 ? 0 : 1\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:71
+#: ../mgaapplet:72
 #, fuzzy, c-format
 msgid "Will check updates at %s"
 msgstr "Провери за ажурирање"
 
-#: ../mdkapplet:79
+#: ../mgaapplet:80
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Вашиот систем е ажуриран"
 
-#: ../mdkapplet:84
+#: ../mgaapplet:85
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -39,54 +39,49 @@ msgstr ""
 "Проблем при конфигурирање на сервисот. Ве молиме проверете ги логовите и "
 "испратете пошта на  support@mageiaonline.com"
 
-#: ../mdkapplet:90
+#: ../mgaapplet:91
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Почекајте, пронаоѓање на достапните пакети..."
 
-#: ../mdkapplet:95
+#: ../mgaapplet:96
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Достапни се нови ажурирања за вашиот систем"
 
-#: ../mdkapplet:101
+#: ../mgaapplet:102
 #, c-format
 msgid "A new version of Mageia distribution has been released"
 msgstr ""
 
-#: ../mdkapplet:119 ../mdkapplet:161
-#, c-format
-msgid "An additional package medium is available for your distribution."
-msgstr ""
-
-#: ../mdkapplet:124
+#: ../mgaapplet:113
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Мрежата не работи. Ве молиме конфигурирајте ја вашата мрежа"
 
-#: ../mdkapplet:130
+#: ../mgaapplet:119
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Сервисот не е вклучен. Ве молиме притиснете на \"Онлајн Веб сајт\""
 
-#: ../mdkapplet:135 ../mdkapplet:141
+#: ../mgaapplet:124 ../mgaapplet:130
 #, fuzzy, c-format
 msgid "urpmi database locked"
 msgstr "базата на податоци на urpmi е заклучена"
 
-#: ../mdkapplet:146
+#: ../mgaapplet:135
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 "Верзијата не е подржана (премногу стара верзија или верзија во развоја фаза)"
 
-#: ../mdkapplet:156
+#: ../mgaapplet:140
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:166
+#: ../mgaapplet:145
 #, fuzzy, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -103,518 +98,328 @@ msgstr ""
 "\n"
 "Потоа, рестатувајте го %s."
 
-#: ../mdkapplet:171
+#: ../mgaapplet:150
 #, c-format
 msgid "Enabled"
 msgstr "Овозможено"
 
-#: ../mdkapplet:184
+#: ../mgaapplet:163
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:224 ../mdkapplet:946
+#: ../mgaapplet:193 ../mgaapplet:816
 #, c-format
 msgid "Install updates"
 msgstr "Инсталирај надоградувања"
 
-#: ../mdkapplet:225 ../mdkapplet:226
-#, c-format
-msgid "Add additional package medium"
-msgstr ""
-
-#: ../mdkapplet:227
+#: ../mgaapplet:194
 #, c-format
 msgid "Check Updates"
 msgstr "Провери за ажурирање"
 
-#: ../mdkapplet:228
+#: ../mgaapplet:195
 #, c-format
 msgid "Configure Network"
 msgstr "Конфигурирај мрежа"
 
-#: ../mdkapplet:229
+#: ../mgaapplet:196
 #, c-format
 msgid "Upgrade the system"
 msgstr ""
 
-#: ../mdkapplet:394
-#, c-format
-msgid ""
-"Basic maintenance for this distribution has expired. Thanks to your "
-"subscription to extended maintenance, your system will be kept up to date "
-"until %s"
-msgstr ""
-
-#: ../mdkapplet:439
+#: ../mgaapplet:374
 #, c-format
 msgid "Received SIGHUP (probably an upgrade has finished), restarting applet."
 msgstr ""
 
-#: ../mdkapplet:446
+#: ../mgaapplet:381
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Вклучувам drakconnect\n"
 
-#: ../mdkapplet:459 ../mdkapplet:632
+#: ../mgaapplet:393 ../mgaapplet:468 ../mgaapplet:528
 #, c-format
 msgid "New version of Mageia distribution"
 msgstr ""
 
-#: ../mdkapplet:464
+#: ../mgaapplet:398
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:473
+#: ../mgaapplet:407
 #, c-format
 msgid "A new version of Mageia distribution has been released."
 msgstr ""
 
-#: ../mdkapplet:475 ../mdkapplet:572
+#: ../mgaapplet:409 ../mgaapplet:480
 #, c-format
 msgid "More info about this new version"
 msgstr ""
 
-#: ../mdkapplet:477 ../mdkapplet:566
+#: ../mgaapplet:411 ../mgaapplet:474
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr ""
 
-#: ../mdkapplet:479 ../mdkapplet:576 ../mdkapplet:1033 ../mdkapplet:1063
+#: ../mgaapplet:413 ../mgaapplet:484
 #, c-format
 msgid "Do not ask me next time"
 msgstr ""
 
-#: ../mdkapplet:482
+#: ../mgaapplet:415
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:483
+#: ../mgaapplet:416
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:489
+#: ../mgaapplet:422
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Next"
 msgstr "Следно"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Cancel"
 msgstr "Откажи"
 
-#: ../mdkapplet:508
+#: ../mgaapplet:441
 #, c-format
 msgid ""
 "Maintenance for this Mageia version has ended. No more updates will be "
 "delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:514
+#: ../mgaapplet:447
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:520
+#: ../mgaapplet:453
 #, fuzzy, c-format
 msgid "Mageia"
 msgstr "Mageia Online %s"
 
-#: ../mdkapplet:526
-#, c-format
-msgid "You should get extended maintenance."
-msgstr ""
-
-#: ../mdkapplet:528
-#, c-format
-msgid ""
-"You should either get extended maintenance or upgrade to a newer version of "
-"the %s distribution."
-msgstr ""
-
-#: ../mdkapplet:532
+#: ../mgaapplet:454
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:542
+#: ../mgaapplet:463
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:547
-#, c-format
-msgid "Extended Maintenance"
-msgstr ""
-
-#: ../mdkapplet:552
-#, c-format
-msgid ""
-"Purchase a maintenance extension for this version (%s) and keep it running "
-"until %s."
-msgstr ""
-
-#: ../mdkapplet:649
+#: ../mgaapplet:545
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
 "and may take several hours to complete."
 msgstr ""
 
-#: ../mdkapplet:651
+#: ../mgaapplet:547
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr ""
 
-#: ../mdkapplet:652
+#: ../mgaapplet:548
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 
-#: ../mdkapplet:655
+#: ../mgaapplet:551
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
 "available."
 msgstr ""
 
-#: ../mdkapplet:687
+#: ../mgaapplet:583
 #, c-format
 msgid "Launching MageiaUpdate\n"
 msgstr "Вклучувам MageiaUpdate\n"
 
-#: ../mdkapplet:719
+#: ../mgaapplet:616
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Ги пресметувам новите ажурирања...\n"
 
-#: ../mdkapplet:826
+#: ../mgaapplet:706
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Системот е ажуриран\n"
 
-#: ../mdkapplet:866
+#: ../mgaapplet:735
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Проверувам мрежа: изгледа е оневозможена\n"
 
-#: ../mdkapplet:893
+#: ../mgaapplet:762
 #, c-format
 msgid "Mageia Online %s"
 msgstr "Mageia Online %s"
 
-#: ../mdkapplet:894
+#: ../mgaapplet:763 ../mgaapplet:764
 #, c-format
 msgid "Copyright (C) %s by %s"
 msgstr "Авторски права (C) %s од „%s“"
 
-#: ../mdkapplet:897
+#: ../mgaapplet:767
 #, c-format
 msgid "Mageia Online gives access to Mageia web services."
 msgstr "„Mageia Online“ дава пристап до веб сервисите на „Mageia“."
 
-#: ../mdkapplet:899
+#: ../mgaapplet:769
 #, c-format
 msgid "Online WebSite"
 msgstr "Онлајн Веб сајт"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../mdkapplet:904
+#: ../mgaapplet:774
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../mdkapplet:932
+#: ../mgaapplet:802
 #, c-format
 msgid "Warning"
 msgstr "Внимание"
 
-#: ../mdkapplet:935 ../mdkapplet:940 ../mdkapplet:948 ../mdkapplet:950
-#: ../mdkapplet_gui.pm:264
+#: ../mgaapplet:805 ../mgaapplet:810 ../mgaapplet_gui.pm:232
 #, c-format
 msgid "More Information"
 msgstr ""
 
-#: ../mdkapplet:952
+#: ../mgaapplet:818
 #, c-format
 msgid "Add media"
 msgstr ""
 
-#: ../mdkapplet:967
+#: ../mgaapplet:833
 #, c-format
 msgid "About..."
 msgstr "За..."
 
-#: ../mdkapplet:969 ../mdkapplet-config:68
+#: ../mgaapplet:835 ../mgaapplet-config:68
 #, fuzzy, c-format
 msgid "Updates Configuration"
 msgstr "Читам конфигурација\n"
 
-#: ../mdkapplet:971
+#: ../mgaapplet:837
 #, c-format
 msgid "Always launch on startup"
 msgstr "Секогаш вклучувај при подигнување"
 
-#: ../mdkapplet:973
+#: ../mgaapplet:839
 #, c-format
 msgid "Quit"
 msgstr "Напушти"
 
-#: ../mdkapplet:1023 ../mdkapplet:1028 ../mdkapplet:1053 ../mdkapplet:1058
-#, c-format
-msgid "New medium available"
-msgstr ""
-
-#: ../mdkapplet:1030 ../mdkapplet:1060
-#, c-format
-msgid ""
-"You use '%s' distribution and therefore have privileged access to additional "
-"software."
-msgstr ""
-
-#: ../mdkapplet:1032 ../mdkapplet:1062
-#, c-format
-msgid "Do you want to install this additional software repository?"
-msgstr ""
-
-#: ../mdkapplet:1061 ../mdkonline.pm:182
-#, c-format
-msgid "Mageia Enterprise Server"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
+#: ../mgaapplet-config:43
 #, c-format
 msgid "Adding an additional package medium"
 msgstr ""
 
-#: ../mdkapplet-add-media-helper:128
-#, c-format
-msgid "Supported products are %s, '%s' is not on the list.\n"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:138
-#, c-format
-msgid "Please fill in your account ID to add an additional package medium"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:148 ../mdkapplet-add-media-helper:193
-#: ../mdkapplet-add-media-helper:225 ../mdkapplet_gui.pm:244
-#, c-format
-msgid "Error"
-msgstr "Грешка"
-
-#: ../mdkapplet-add-media-helper:149
-#, c-format
-msgid "Failure while retrieving distributions list:"
-msgstr ""
-
-#. -PO: Here '%s' will be a localized date (eg:
-#: ../mdkapplet-add-media-helper:161
-#, c-format
-msgid ""
-"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
-"base updates (up to the %s) for distributions."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:167
-#, c-format
-msgid ""
-"Extended maintenance is now available to get 18 months of additional updates "
-"(until %s)."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:170
-#, c-format
-msgid "You can subscribe <b>right now</b> to get extended maintenance:"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:174
-#, c-format
-msgid "Lifetime policy"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:175 ../mdkapplet_gui.pm:105
-#, fuzzy, c-format
-msgid "Online subscription"
-msgstr "Опис на машината:"
-
-#: ../mdkapplet-add-media-helper:194
-#, c-format
-msgid "An error occurred"
-msgstr "Се случи грешка"
-
-#: ../mdkapplet-add-media-helper:200
-#, c-format
-msgid "Your Mageia account does not have %s download subscription enabled."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:226
-#, fuzzy, c-format
-msgid "An error occurred while adding medium"
-msgstr "Неуспех при додавање медиум"
-
-#: ../mdkapplet-add-media-helper:234
-#, c-format
-msgid "Successfully added media!"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:236
-#, c-format
-msgid "Successfully added media %s."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:238
-#, c-format
-msgid "Ok"
-msgstr "Во ред"
-
-#: ../mdkapplet-config:69
+#: ../mgaapplet-config:69
 #, c-format
 msgid "Here you can configure the updates applet"
 msgstr ""
 
-#: ../mdkapplet-config:71
+#: ../mgaapplet-config:71
 #, c-format
 msgid "Update frequency (hours)"
 msgstr ""
 
-#: ../mdkapplet-config:80
+#: ../mgaapplet-config:80
 #, c-format
 msgid "First check delay (minutes)"
 msgstr ""
 
-#: ../mdkapplet-config:89
+#: ../mgaapplet-config:89
 #, c-format
 msgid "Check for newer \"%s\" releases"
 msgstr ""
 
-#: ../mdkapplet-config:95 ../mdkapplet-config:101
-#, c-format
-msgid "Check for missing \"%s\" media"
-msgstr ""
-
-#: ../mdkapplet-config:95
-#, c-format
-msgid "Restricted"
-msgstr ""
-
-#: ../mdkapplet-config:101
-#, c-format
-msgid "Enterprise"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:87
-#, c-format
-msgid ""
-"Mageia Powerpack brings you the best of Linux experience for desktop: "
-"stability and efficiency of open source solutions together with exclusive "
-"softwares and Mageia official support."
-msgstr ""
-
-#: ../mdkapplet_gui.pm:94
-#, fuzzy, c-format
-msgid "Mageia Features"
-msgstr "Mageia Online %s"
-
-#: ../mdkapplet_gui.pm:213
+#: ../mgaapplet_gui.pm:181
 #, c-format
 msgid "More information on your user account"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:220
+#: ../mgaapplet_gui.pm:188
 #, c-format
 msgid "Your email"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:221
+#: ../mgaapplet_gui.pm:189
 #, fuzzy, c-format
 msgid "Your password"
 msgstr "Погрешна лозинка"
 
-#: ../mdkapplet_gui.pm:228
+#: ../mgaapplet_gui.pm:196
 #, fuzzy, c-format
 msgid "Forgotten password"
 msgstr "Погрешна лозинка"
 
-#: ../mdkapplet_gui.pm:245
+#: ../mgaapplet_gui.pm:212
+#, c-format
+msgid "Error"
+msgstr "Грешка"
+
+#: ../mgaapplet_gui.pm:213
 #, c-format
 msgid "Password and email cannot be empty."
 msgstr ""
 
-#: ../mdkapplet_gui.pm:267
+#: ../mgaapplet_gui.pm:235
 #, c-format
 msgid "Close"
 msgstr "Затвори"
 
-#: ../mdkapplet_gui.pm:302
-#, c-format
-msgid "Choose your upgrade version"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:306
-#, c-format
-msgid "Your Powerpack access has ended"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:309
-#, c-format
-msgid "%s is now available, you can upgrade to:"
-msgstr ""
-
-#: ../mdkonline.pm:177
+#: ../mgaonline.pm:145
 #, fuzzy, c-format
 msgid "Mageia Flash"
 msgstr "Mageia Online %s"
 
-#: ../mdkonline.pm:178 ../mdkonline.pm:198
+#: ../mgaonline.pm:146 ../mgaonline.pm:160
 #, fuzzy, c-format
 msgid "Mageia Free"
 msgstr "Mageia Online %s"
 
-#: ../mdkonline.pm:179
+#: ../mgaonline.pm:147
 #, fuzzy, c-format
 msgid "Mageia Mini"
 msgstr "Mageia Online %s"
 
-#: ../mdkonline.pm:180
+#: ../mgaonline.pm:148
 #, fuzzy, c-format
 msgid "Mageia One"
 msgstr "Mageia Online %s"
 
-#: ../mdkonline.pm:181 ../mdkonline.pm:194
-#, fuzzy, c-format
-msgid "Mageia PowerPack"
-msgstr "„Mageia Online“"
-
-#: ../mdkonline.pm:195
-#, c-format
-msgid "The Mageia distribution with even more softwares and official support."
-msgstr ""
-
-#: ../mdkonline.pm:199
+#: ../mgaonline.pm:161
 #, c-format
 msgid "The 100%% Open Source distribution freely available."
 msgstr ""
 
-#: ../mdkonline.pm:213
+#: ../mgaonline.pm:175
 #, c-format
 msgid "Distribution Upgrade"
 msgstr ""
 
-#: ../mdkupdate:59
-#, c-format
+#: ../mgaupdate:60
+#, fuzzy, c-format
 msgid ""
-"mdkupdate version %s\n"
+"mgaupdate 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"
@@ -627,37 +432,59 @@ msgstr ""
 "\n"
 "употреба:\n"
 
-#: ../mdkupdate:64
+#: ../mgaupdate:66
 #, c-format
 msgid "  --help\t\t- print this help message.\n"
 msgstr "  --help\t\t- ја печати оваа помошна порака.\n"
 
-#: ../mdkupdate:65
+#: ../mgaupdate:67
 #, c-format
 msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr "  --auto\t\t- Автоматско вклучување на Mageia Update.\n"
 
-#: ../mdkupdate:66
+#: ../mgaupdate:68
 #, c-format
 msgid "  --mnf\t\t\t- launch mnf specific scripts.\n"
 msgstr "  --mnf\t\t\t- вклучува одредени mnf скрипти.\n"
 
-#: ../mdkupdate:67
+#: ../mgaupdate:69
 #, c-format
 msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr "  --noX\t\t\t- верзија на Mageia Update во текстуален режим.\n"
 
-#: ../mdkupdate:68
+#: ../mgaupdate:70
 #, c-format
 msgid "  --debug\t\t\t- log what is done\n"
 msgstr "  --debug\t\t\t- запишува што се случува\n"
 
-#: ../mdkupdate:98
+#: ../mgaupdate:100
 #, c-format
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Не можам да ги ажурирам пакетите од медиумот update_source.\n"
 
 #, fuzzy
+#~ msgid "Online subscription"
+#~ msgstr "Опис на машината:"
+
+#~ msgid "An error occurred"
+#~ msgstr "Се случи грешка"
+
+#, fuzzy
+#~ msgid "An error occurred while adding medium"
+#~ msgstr "Неуспех при додавање медиум"
+
+#~ msgid "Ok"
+#~ msgstr "Во ред"
+
+#, fuzzy
+#~ msgid "Mageia Features"
+#~ msgstr "Mageia Online %s"
+
+#, fuzzy
+#~ msgid "Mageia PowerPack"
+#~ msgstr "„Mageia Online“"
+
+#, fuzzy
 #~ msgid "Mageia Linux"
 #~ msgstr "Mageia Online %s"