sync with code

1 files changed, 155 insertions, 138 deletions

diff --git a/po/sr.po b/po/sr.po
index c0834921..7381bd3f 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-16 17:25+0200\n"
+"POT-Creation-Date: 2006-03-02 14:07+0100\n"
 "PO-Revision-Date: 2003-02-15 09:31+0100\n"
 "Last-Translator: Toma Jankovic <tomaja@net.yu>\n"
 "Language-Team: Serbian <i18n@mandrake.co.yu>\n"
@@ -16,12 +16,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../mdkapplet:64
+#: ../mdkapplet:65
 #, c-format
 msgid "Your system is up-to-date"
 msgstr ""
 
-#: ../mdkapplet:70
+#: ../mdkapplet:71
 #, fuzzy, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -30,12 +30,12 @@ msgstr ""
 "Уколико имате било какав проблем пошаљите e-mail на support@mandrivaonline."
 "net\n"
 
-#: ../mdkapplet:76
+#: ../mdkapplet:77
 #, c-format
 msgid "System is busy. Please wait ..."
 msgstr ""
 
-#: ../mdkapplet:82
+#: ../mdkapplet:83
 #, fuzzy, c-format
 msgid "New updates are available for your system"
 msgstr ""
@@ -44,277 +44,286 @@ msgstr ""
 "%s\n"
 "су директно повезани на ваш систем.\n"
 
-#: ../mdkapplet:88
+#: ../mdkapplet:89
+#, fuzzy, c-format
+msgid "New bundles are available for your system"
+msgstr ""
+"Следећи скенери\n"
+"\n"
+"%s\n"
+"су директно повезани на ваш систем.\n"
+
+#: ../mdkapplet:95
 #, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr ""
 
-#: ../mdkapplet:94
+#: ../mdkapplet:101
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr ""
 
-#: ../mdkapplet:100
+#: ../mdkapplet:107
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 
-#: ../mdkapplet:106
+#: ../mdkapplet:113
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:111 ../mdkapplet:164
+#: ../mdkapplet:118 ../mdkapplet:203
 #, c-format
 msgid "Install updates"
 msgstr "Инсталирај update-ове"
 
-#: ../mdkapplet:112
+#: ../mdkapplet:119
 #, fuzzy, c-format
 msgid "Configure the service"
 msgstr "Подеси"
 
-#: ../mdkapplet:113
+#: ../mdkapplet:120
 #, fuzzy, c-format
 msgid "Check Updates"
 msgstr "Ажурирање"
 
-#: ../mdkapplet:114 ../mdkapplet:167 ../mdkonline:87 ../mdkonline:91
-#: ../mdkonline:127 ../mdkupdate:176
+#: ../mdkapplet:121 ../mdkapplet:206 ../mdkonline:87 ../mdkonline:125
+#: ../mdkupdate:181
 #, c-format
 msgid "Please wait"
 msgstr "Само моменат..."
 
-#: ../mdkapplet:114 ../mdkapplet:166 ../mdkapplet:167
+#: ../mdkapplet:121 ../mdkapplet:205 ../mdkapplet:206
 #, fuzzy, c-format
 msgid "Check updates"
 msgstr "Сигурносне надоградње"
 
-#: ../mdkapplet:116
+#: ../mdkapplet:123
 #, c-format
 msgid "Online WebSite"
 msgstr ""
 
-#: ../mdkapplet:117
+#: ../mdkapplet:124
 #, fuzzy, c-format
 msgid "Configure Network"
 msgstr "Подеси мрежу"
 
-#: ../mdkapplet:118
+#: ../mdkapplet:125
 #, fuzzy, c-format
 msgid "Configure Now!"
 msgstr "Подеси веб"
 
-#: ../mdkapplet:152 ../mdkapplet:223
+#: ../mdkapplet:193 ../mdkapplet:264
 #, fuzzy, c-format
 msgid "Mandriva Linux Updates Applet"
 msgstr "Mandriva Update"
 
-#: ../mdkapplet:162
+#: ../mdkapplet:201
 #, c-format
 msgid "Actions"
 msgstr "Акције"
 
-#: ../mdkapplet:165
+#: ../mdkapplet:204
 #, c-format
 msgid "Configure"
 msgstr "Подеси"
 
-#: ../mdkapplet:169
+#: ../mdkapplet:208
 #, fuzzy, c-format
 msgid "See logs"
 msgstr "Тражи +5s"
 
-#: ../mdkapplet:172
+#: ../mdkapplet:211
 #, c-format
 msgid "Status"
 msgstr "Статус"
 
-#: ../mdkapplet:176 ../mdkapplet:381
+#: ../mdkapplet:215 ../mdkapplet:416
 #, c-format
 msgid "Close"
 msgstr "Затвори"
 
-#: ../mdkapplet:204
+#: ../mdkapplet:244
 #, fuzzy, c-format
 msgid "Network Connection: "
 msgstr "Конекција за Виртуелни Мрежу"
 
-#: ../mdkapplet:204
+#: ../mdkapplet:244
 #, c-format
 msgid "Up"
 msgstr "горе"
 
-#: ../mdkapplet:204
+#: ../mdkapplet:244
 #, c-format
 msgid "Down"
 msgstr "Доле"
 
-#: ../mdkapplet:205
+#: ../mdkapplet:245
 #, c-format
 msgid "Last check: "
 msgstr ""
 
-#: ../mdkapplet:206 ../mdkonline:120
+#: ../mdkapplet:246 ../mdkonline:116
 #, fuzzy, c-format
 msgid "Machine name:"
 msgstr "Минице"
 
-#: ../mdkapplet:207
+#: ../mdkapplet:247
 #, fuzzy, c-format
 msgid "Updates: "
 msgstr "Ажурирање"
 
-#: ../mdkapplet:211
+#: ../mdkapplet:251
 #, fuzzy, c-format
 msgid "Launching drakconnect\n"
 msgstr "Покрени userdrake"
 
-#: ../mdkapplet:215
+#: ../mdkapplet:255
 #, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr ""
 
-#: ../mdkapplet:218
+#: ../mdkapplet:259
 #, c-format
 msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
 msgstr ""
 
-#: ../mdkapplet:229
+#: ../mdkapplet:270
 #, c-format
 msgid "Computing new updates...\n"
 msgstr ""
 
-#: ../mdkapplet:231
+#: ../mdkapplet:272
 #, fuzzy, c-format
 msgid "Connecting to"
 msgstr "Проблем са повезивањем"
 
-#: ../mdkapplet:242
+#: ../mdkapplet:283
 #, fuzzy, c-format
 msgid "Response from Mandriva Online server\n"
 msgstr "Добродошли у Mandriva Linux"
 
-#: ../mdkapplet:260
+#: ../mdkapplet:301
 #, c-format
 msgid "Checking... Updates are available\n"
 msgstr ""
 
-#: ../mdkapplet:265
+#: ../mdkapplet:306
 #, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
-#: ../mdkapplet:266
+#: ../mdkapplet:307
 #, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
-#: ../mdkapplet:267
+#: ../mdkapplet:308
 #, fuzzy, c-format
 msgid "Unknown state"
 msgstr "Непознато име хоста"
 
-#: ../mdkapplet:268
+#: ../mdkapplet:309
 #, c-format
 msgid "Online services disabled. Contact Mandriva Online site\n"
 msgstr ""
 
-#: ../mdkapplet:269
+#: ../mdkapplet:310
 #, fuzzy, c-format
 msgid "Wrong Password.\n"
 msgstr "Потврди лозинку:"
 
-#: ../mdkapplet:270
+#: ../mdkapplet:311
 #, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr ""
 
-#: ../mdkapplet:271
+#: ../mdkapplet:312
 #, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
 msgstr ""
 
-#: ../mdkapplet:273
+#: ../mdkapplet:314
 #, c-format
 msgid ""
 "Problem occured while connecting to the server, please contact the support "
 "team"
 msgstr ""
 
-#: ../mdkapplet:275
+#: ../mdkapplet:316
 #, fuzzy, c-format
 msgid "System is up-to-date\n"
 msgstr "Системски мод"
 
-#: ../mdkapplet:307
+#: ../mdkapplet:347
 #, c-format
 msgid "No check"
 msgstr ""
 
-#: ../mdkapplet:320
+#: ../mdkapplet:360
 #, fuzzy, c-format
 msgid "Checking config file: Not present\n"
 msgstr "Недостаје конфигурациони фајл %s.\n"
 
-#: ../mdkapplet:323
+#: ../mdkapplet:363
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
-#: ../mdkapplet:371
+#: ../mdkapplet:406
 #, c-format
 msgid "Logs"
 msgstr "Лог записи"
 
-#: ../mdkapplet:387
+#: ../mdkapplet:422
 #, c-format
 msgid "Clear"
 msgstr "Очисти"
 
-#: ../mdkapplet:414
+#: ../mdkapplet:448
 #, c-format
 msgid "About..."
 msgstr "О..."
 
-#: ../mdkapplet:415
+#: ../mdkapplet:449
 #, c-format
 msgid "Always launch on startup"
 msgstr ""
 
-#: ../mdkapplet:417
+#: ../mdkapplet:451
 #, c-format
 msgid "Quit"
 msgstr "Заврши"
 
-#: ../mdkonline:59 ../mdkonline:99
+#: ../mdkonline:60 ../mdkonline:95
 #, c-format
 msgid "Mandriva Online"
 msgstr "Mandriva Online"
 
-#: ../mdkonline:62
+#: ../mdkonline:63
 #, c-format
 msgid "I already have an account"
 msgstr ""
 
-#: ../mdkonline:63
+#: ../mdkonline:64
 #, c-format
 msgid "I want to subscribe"
 msgstr ""
 
-#: ../mdkonline:68
+#: ../mdkonline:69
 #, c-format
 msgid "Mr."
 msgstr "г-дин"
 
-#: ../mdkonline:68
+#: ../mdkonline:69
 #, c-format
 msgid "Mrs."
 msgstr "г-ђа"
 
-#: ../mdkonline:68
+#: ../mdkonline:69
 #, c-format
 msgid "Ms."
 msgstr "г-ђа"
@@ -324,12 +333,7 @@ msgstr "г-ђа"
 msgid "Reading configuration\n"
 msgstr "Поново уносим конфигурацију: "
 
-#: ../mdkonline:91
-#, c-format
-msgid "Sending configuration..."
-msgstr "Шаљем подешавања..."
-
-#: ../mdkonline:102
+#: ../mdkonline:98
 #, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
@@ -337,37 +341,47 @@ msgid ""
 "order to keep you informed about security updates and useful upgrades.\n"
 msgstr ""
 
-#: ../mdkonline:107
+#: ../mdkonline:103
 #, c-format
 msgid "Account creation or authentication"
 msgstr ""
 
-#: ../mdkonline:112
+#: ../mdkonline:108
 #, c-format
 msgid "Enter your Mandriva Online login, password and machine name:"
 msgstr ""
 
-#: ../mdkonline:118 ../mdkonline:158
+#: ../mdkonline:114 ../mdkonline:155
 #, fuzzy, c-format
 msgid "Email address:"
 msgstr "IP адреса"
 
-#: ../mdkonline:119 ../mdkonline:159
+#: ../mdkonline:115 ../mdkonline:156
 #, c-format
 msgid "Password:"
 msgstr "Лозинка:"
 
-#: ../mdkonline:125
+#: ../mdkonline:117
+#, fuzzy, c-format
+msgid "Machine description:"
+msgstr "Минице"
+
+#: ../mdkonline:118
+#, c-format
+msgid "(Ex: My Home Office's Computer)"
+msgstr ""
+
+#: ../mdkonline:123
 #, fuzzy, c-format
 msgid "Machine name must be 1 to 40 alphanumerical characters"
 msgstr "Тачке монтирања треба да садрже само алфанумеричке карактере"
 
-#: ../mdkonline:127
+#: ../mdkonline:125
 #, fuzzy, c-format
 msgid "Connecting to Mandriva Online website..."
 msgstr "Добродошли у Mandriva Linux"
 
-#: ../mdkonline:137
+#: ../mdkonline:135
 #, c-format
 msgid ""
 "In order to benefit from Mandriva Online services,\n"
@@ -386,32 +400,32 @@ msgid ""
 "www.mandrivaexpert.com."
 msgstr ""
 
-#: ../mdkonline:152
+#: ../mdkonline:149
 #, fuzzy, c-format
 msgid "Create a Mandriva Online Account"
 msgstr "Mandriva Club Рачун"
 
-#: ../mdkonline:155
+#: ../mdkonline:152
 #, fuzzy, c-format
 msgid "Greeting:"
 msgstr "Зелена"
 
-#: ../mdkonline:156
+#: ../mdkonline:153
 #, c-format
 msgid "First name:"
 msgstr "Име:"
 
-#: ../mdkonline:157
+#: ../mdkonline:154
 #, fuzzy, c-format
 msgid "Last name:"
 msgstr "Име:"
 
-#: ../mdkonline:160
+#: ../mdkonline:157
 #, c-format
 msgid "Confirm Password:"
 msgstr "Потврди лозинку:"
 
-#: ../mdkonline:167
+#: ../mdkonline:164
 #, c-format
 msgid ""
 "The passwords do not match\n"
@@ -420,132 +434,132 @@ msgstr ""
 "Лозинке се не слажу\n"
 " Покушајте поново\n"
 
-#: ../mdkonline:167
+#: ../mdkonline:164
 #, fuzzy, c-format
 msgid "Please fill in each field"
 msgstr "Молим ВАС да попуните или означите поља испод"
 
-#: ../mdkonline:167
+#: ../mdkonline:164
 #, c-format
 msgid "Not a valid mail address!\n"
 msgstr "Е-mail адреса није исправна!\n"
 
-#: ../mdkonline:173
+#: ../mdkonline:170
 #, c-format
 msgid ""
 "Mandriva Online Account successfully created.\n"
 "Please click \"Next\" to authenticate and upload your configuration\n"
 msgstr ""
 
-#: ../mdkonline:182
+#: ../mdkonline:179
 #, c-format
 msgid "Your upload was successful!"
 msgstr ""
 
-#: ../mdkonline:182
+#: ../mdkonline:179
 #, c-format
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to Mandriva Online."
 msgstr ""
 
-#: ../mdkonline:182
+#: ../mdkonline:179
 #, c-format
 msgid ""
 "Mandriva Online offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
 msgstr ""
 
-#: ../mdkonline:184 ../mdkupdate:146
+#: ../mdkonline:181
 #, c-format
 msgid "Connection problem"
 msgstr "Проблем са повезивањем"
 
-#: ../mdkonline:184
+#: ../mdkonline:181
 #, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr ""
 
-#: ../mdkonline:190
+#: ../mdkonline:187
 #, c-format
 msgid "Country"
 msgstr "Држава"
 
-#: ../mdkonline:207
+#: ../mdkonline:203
 #, c-format
 msgid "Congratulations"
 msgstr "Честитке"
 
-#: ../mdkonline:207
+#: ../mdkonline:203
 #, c-format
 msgid "Your Mandriva Online account has been successfully configured\n"
 msgstr ""
 
-#: ../mdkonline:223
+#: ../mdkonline:218
 #, c-format
 msgid "Configuration uploaded successfully"
 msgstr ""
 
-#: ../mdkonline:224
+#: ../mdkonline:219
 #, fuzzy, c-format
 msgid "Problem uploading configuration"
 msgstr "Поново уносим конфигурацију: "
 
-#: ../mdkonline:226
+#: ../mdkonline:221
 #, c-format
 msgid ""
 "Cannot connect to Mandriva Online website: wrong login/password or router/"
 "firewall bad settings"
 msgstr ""
 
-#: ../mdkonline.pm:95
+#: ../mdkonline.pm:178
 #, fuzzy, c-format
 msgid "Security error"
 msgstr "Сигурносни аларми:"
 
-#: ../mdkonline.pm:95
+#: ../mdkonline.pm:178
 #, c-format
-msgid "Unsecure invocation: Method available through httpS only"
+msgid "Generic error (machine already registered)"
 msgstr ""
 
-#: ../mdkonline.pm:96
+#: ../mdkonline.pm:179
 #, fuzzy, c-format
 msgid "Database error"
 msgstr "Грешка у бази података"
 
-#: ../mdkonline.pm:96
+#: ../mdkonline.pm:179
 #, c-format
 msgid ""
 "Server Database failed\n"
 "Please Try again Later"
 msgstr ""
 
-#: ../mdkonline.pm:97
+#: ../mdkonline.pm:180
 #, fuzzy, c-format
 msgid "Registration error"
 msgstr "Тип регистрације"
 
-#: ../mdkonline.pm:97
+#: ../mdkonline.pm:180
 #, fuzzy, c-format
 msgid "Some parameters are missing"
 msgstr "Недостаје име удаљеног штампача!"
 
-#: ../mdkonline.pm:98 ../mdkonline.pm:104
+#: ../mdkonline.pm:181 ../mdkonline.pm:187
 #, fuzzy, c-format
 msgid "Password error"
 msgstr "Лозика за %s"
 
-#: ../mdkonline.pm:98
+#: ../mdkonline.pm:181
 #, fuzzy, c-format
 msgid "Wrong password"
 msgstr "Без лозинке"
 
-#: ../mdkonline.pm:99 ../mdkonline.pm:100 ../mdkonline.pm:101
+#: ../mdkonline.pm:182 ../mdkonline.pm:183 ../mdkonline.pm:184
 #, fuzzy, c-format
 msgid "Login error"
 msgstr "непозната грешка"
 
-#: ../mdkonline.pm:99
+#: ../mdkonline.pm:182
 #, fuzzy, c-format
 msgid ""
 "The email you provided is already in use\n"
@@ -554,73 +568,73 @@ msgstr ""
 "Име * %s * је већ у употреби или није исправно\n"
 "Молим вас да изаберете друго\n"
 
-#: ../mdkonline.pm:100
+#: ../mdkonline.pm:183
 #, c-format
 msgid "The email you provided is invalid or forbidden"
 msgstr ""
 
-#: ../mdkonline.pm:101
+#: ../mdkonline.pm:184
 #, fuzzy, c-format
 msgid ""
 "Email address box is empty\n"
 "Please provide one"
 msgstr "Поље за име је празно, упишите име"
 
-#: ../mdkonline.pm:102
+#: ../mdkonline.pm:185
 #, fuzzy, c-format
 msgid "Restriction Error"
 msgstr "Опис:"
 
-#: ../mdkonline.pm:102
+#: ../mdkonline.pm:185
 #, fuzzy, c-format
 msgid "Database access forbidden"
 msgstr "Особине приступа бази података"
 
-#: ../mdkonline.pm:103 ../mdkonline.pm:105
+#: ../mdkonline.pm:186 ../mdkonline.pm:188
 #, fuzzy, c-format
 msgid "Service error"
 msgstr "Грешка при испису\n"
 
-#: ../mdkonline.pm:103
+#: ../mdkonline.pm:186
 #, c-format
 msgid ""
 "Mandriva web services are currently unavailable\n"
 "Please Try again Later"
 msgstr ""
 
-#: ../mdkonline.pm:104
+#: ../mdkonline.pm:187
 #, fuzzy, c-format
 msgid "Password mismatch"
 msgstr "Погрешна лозинка."
 
-#: ../mdkonline.pm:105
+#: ../mdkonline.pm:188
 #, c-format
 msgid ""
 "Mandriva web services are under maintenance\n"
 "Please Try again Later"
 msgstr ""
 
-#: ../mdkonline.pm:106
+#: ../mdkonline.pm:189
 #, fuzzy, c-format
 msgid "User Forbidden"
 msgstr "Горњи сорпски"
 
-#: ../mdkonline.pm:106
+#: ../mdkonline.pm:189
 #, c-format
 msgid "User account forbidden by Mandriva web services"
 msgstr ""
 
-#: ../mdkonline.pm:107
+#: ../mdkonline.pm:190
 #, fuzzy, c-format
 msgid "Connection error"
 msgstr "Име конекције"
 
-#: ../mdkonline.pm:107
+#: ../mdkonline.pm:190
 #, c-format
 msgid "Mandriva web services not reachable"
 msgstr ""
 
-#: ../mdkupdate:61
+#: ../mdkupdate:62
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
@@ -637,56 +651,59 @@ msgstr ""
 "\n"
 "употреба:\n"
 
-#: ../mdkupdate:66
-#, c-format
-msgid "  --help         - print this help message.\n"
-msgstr "  --help         - приказује ову поруку.\n"
-
 #: ../mdkupdate:67
 #, fuzzy, c-format
-msgid "  --auto         - Mandriva Update launched automatically.\n"
-msgstr "  --applet       - ажурира све информације.\n"
+msgid "  --help\t\t- print this help message.\n"
+msgstr "  --help         - приказује ову поруку.\n"
 
 #: ../mdkupdate:68
 #, fuzzy, c-format
-msgid "  --applet       - launch Mandriva Update.\n"
+msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
 msgstr "  --applet       - ажурира све информације.\n"
 
 #: ../mdkupdate:69
+#, fuzzy, c-format
+msgid "  --applet\t\t- launch Mandriva Update.\n"
+msgstr "  --applet       - ажурира све информације.\n"
+
+#: ../mdkupdate:70
 #, c-format
-msgid "  --mnf          - launch mnf specific scripts.\n"
+msgid "  --mnf\t\t\t- launch mnf specific scripts.\n"
 msgstr ""
 
-#: ../mdkupdate:70
+#: ../mdkupdate:71
 #, fuzzy, c-format
-msgid "  --noX          - text mode version of Mandriva Update.\n"
+msgid "  --noX\t\t\t- text mode version of Mandriva Update.\n"
 msgstr "  --applet       - ажурира све информације.\n"
 
-#: ../mdkupdate:78
+#: ../mdkupdate:72
 #, c-format
-msgid "No %s file found. Run mdkonline wizard first"
+msgid ""
+"  --bundle file.bundle\t- parse and install package from .bundle metainfo "
+"file.\n"
 msgstr ""
 
-#: ../mdkupdate:146
-#, c-format
-msgid "Mandriva Update could not contact the site, we will try again."
-msgstr "Mandriva Update не може да контактира сајт, покушаћемо поново."
-
-#: ../mdkupdate:154
+#: ../mdkupdate:157
 #, c-format
 msgid "Choose which packages should be installed and Press Ok"
 msgstr ""
 
-#: ../mdkupdate:176
+#: ../mdkupdate:181
 #, c-format
 msgid "Installing packages ...\n"
 msgstr "Инсталирам пакете...\n"
 
-#: ../mdkupdate:179 ../mdkupdate:264
+#: ../mdkupdate:185 ../mdkupdate:253
 #, c-format
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Не могу да ажурирам пакете са update_source медија.\n"
 
+#~ msgid "Sending configuration..."
+#~ msgstr "Шаљем подешавања..."
+
+#~ msgid "Mandriva Update could not contact the site, we will try again."
+#~ msgstr "Mandriva Update не може да контактира сајт, покушаћемо поново."
+
 #~ msgid "Login:"
 #~ msgstr "Login:"