sync with code

1 files changed, 131 insertions, 119 deletions

diff --git a/perl-install/install/share/po/sr.po b/perl-install/install/share/po/sr.po
index b9e1fc94a..2e98b7ef9 100644
--- a/perl-install/install/share/po/sr.po
+++ b/perl-install/install/share/po/sr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DrakX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-05-20 22:53+0200\n"
+"POT-Creation-Date: 2016-01-02 14:54+0100\n"
 "PO-Revision-Date: 2004-09-15 13:33+0200\n"
 "Last-Translator: Toma Jankovic <tomaja@net.yu>\n"
 "Language-Team: Serbian <i18n@mandrake.co.yu>\n"
@@ -90,86 +90,81 @@ msgstr ""
 
 #: any.pm:162
 #, c-format
-msgid "CD-ROM"
-msgstr "CD-ROM"
-
-#: any.pm:163
-#, c-format
 msgid "Network (HTTP)"
 msgstr "Мрежа (HTTP)"
 
-#: any.pm:164
+#: any.pm:163
 #, c-format
 msgid "Network (FTP)"
 msgstr "Мрежа (FTP)"
 
-#: any.pm:165
+#: any.pm:164
 #, c-format
 msgid "Network (NFS)"
 msgstr "Мрежа (NFS)"
 
-#: any.pm:224
+#: any.pm:223
 #, c-format
 msgid "URL of the mirror?"
 msgstr "УРЛ мирора?"
 
-#: any.pm:230
+#: any.pm:229
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr "УРЛ мора почињати са ftp:// или http://"
 
-#: any.pm:248
+#: any.pm:247
 #, c-format
 msgid "Contacting %s web site to get the list of available mirrors..."
 msgstr "Контактирајте %s web сајт да би добили листу доступних mirror-а..."
 
-#: any.pm:253
+#: any.pm:252
 #, c-format
 msgid "Failed contacting %s web site to get the list of available mirrors"
 msgstr ""
 "Неуспешно успостављање везе са %s web сајт ради листе доступних mirror-а"
 
-#: any.pm:263
+#: any.pm:262
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Изаберите mirror са ког ћете скинути пакете"
 
-#: any.pm:293
+#: any.pm:290
 #, c-format
 msgid "NFS setup"
 msgstr "Подешавање NFS-а"
 
-#: any.pm:294
+#: any.pm:291
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr "Унесите име домаћина-hostname и директоријум вашег NFS медија"
 
-#: any.pm:298
+#: any.pm:295
 #, c-format
 msgid "Hostname missing"
 msgstr "Недостаје име домаћина-hostname"
 
-#: any.pm:299
+#: any.pm:296
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr "Директоријум мора почети са  \"/\""
 
-#: any.pm:303
+#: any.pm:300
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr "Име домаћина-hostname за монтирање NFS ?"
 
-#: any.pm:304
+#: any.pm:301
 #, c-format
 msgid "Directory"
 msgstr "Директоријум"
 
-#: any.pm:334
+#: any.pm:331
 #, c-format
 msgid "Supplementary"
 msgstr "Додатни"
 
-#: any.pm:369
+#: any.pm:366
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
@@ -178,84 +173,84 @@ msgstr ""
 "Не могу пронађем листу пакета на овом мирору. проверите да ли локација "
 "исправна."
 
-#: any.pm:394
+#: any.pm:391
 #, c-format
 msgid "Core Release"
 msgstr ""
 
-#: any.pm:396
+#: any.pm:393
 #, c-format
 msgid "Tainted Release"
 msgstr ""
 
-#: any.pm:398
+#: any.pm:395
 #, c-format
 msgid "Nonfree Release"
 msgstr ""
 
-#: any.pm:436
+#: any.pm:433
 #, c-format
 msgid ""
 "Some hardware on your machine needs some non free firmwares in order for the "
 "free software drivers to work."
 msgstr ""
 
-#: any.pm:437
+#: any.pm:434
 #, c-format
 msgid "You should enable \"%s\""
 msgstr ""
 
-#: any.pm:475
+#: any.pm:472
 #, c-format
 msgid "\"%s\" contains the various pieces of the systems and its applications"
 msgstr ""
 
-#: any.pm:476
+#: any.pm:473
 #, c-format
 msgid "\"%s\" contains non free software.\n"
 msgstr ""
 
-#: any.pm:477
+#: any.pm:474
 #, c-format
 msgid ""
 "It also contains firmwares needed for certain devices to operate (eg: some "
 "ATI/AMD graphic cards, some network cards, some RAID cards, ...)"
 msgstr ""
 
-#: any.pm:478
+#: any.pm:475
 #, c-format
 msgid ""
 "\"%s\" contains software that can not be distributed in every country due to "
 "software patents."
 msgstr ""
 
-#: any.pm:479
+#: any.pm:476
 #, c-format
 msgid ""
 "It also contains software from \"%s\" rebuild with additional capabilities."
 msgstr ""
 
-#: any.pm:485
+#: any.pm:482
 #, c-format
 msgid "Here you can enable more media if you want."
 msgstr ""
 
-#: any.pm:502
+#: any.pm:499
 #, c-format
 msgid "This medium provides package updates for medium \"%s\""
 msgstr ""
 
-#: any.pm:600
+#: any.pm:597
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "Тражим већ инсталиране пакете..."
 
-#: any.pm:634
+#: any.pm:631
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Тражим пакете за ажурирање..."
 
-#: any.pm:653
+#: any.pm:650
 #, c-format
 msgid "Removing packages prior to upgrade..."
 msgstr "Уклањам старе пакете..."
@@ -304,7 +299,7 @@ msgstr "FTP"
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1382 steps_interactive.pm:948
+#: any.pm:1382 steps_interactive.pm:973
 #, c-format
 msgid "Network"
 msgstr "Мрежа"
@@ -354,7 +349,7 @@ msgstr "Инсталација"
 msgid "Configuration"
 msgstr "Конфигурација"
 
-#: install2.pm:210
+#: install2.pm:211
 #, c-format
 msgid "You must also format %s"
 msgstr "Морате и %s да форматирате"
@@ -379,22 +374,22 @@ msgstr "Приступам  мрежу"
 msgid "Bringing down the network"
 msgstr "Одступам од мреже"
 
-#: media.pm:404
+#: media.pm:407
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr ""
 
-#: media.pm:712
+#: media.pm:714
 #, c-format
 msgid "unable to add medium"
 msgstr ""
 
-#: media.pm:752
+#: media.pm:754
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr "Копирање неких поакета на дискове ради касније употребе"
 
-#: media.pm:805
+#: media.pm:807
 #, c-format
 msgid "Copying in progress"
 msgstr "Копирање у току"
@@ -439,34 +434,34 @@ msgstr ""
 msgid "No description"
 msgstr "Без описа"
 
-#: pkgs.pm:286
+#: pkgs.pm:288
 #, c-format
 msgid ""
 "Some packages requested by %s cannot be installed:\n"
 "%s"
 msgstr ""
 
-#: pkgs.pm:382 pkgs.pm:409
+#: pkgs.pm:384 pkgs.pm:411
 #, fuzzy, c-format
 msgid "An error occurred:"
 msgstr "Хм,појавила се грешка"
 
-#: pkgs.pm:401
+#: pkgs.pm:403
 #, c-format
 msgid "A fatal error occurred: %s."
 msgstr "Појавила се фатална грешка: %s."
 
-#: pkgs.pm:895 pkgs.pm:937
+#: pkgs.pm:897 pkgs.pm:939
 #, c-format
 msgid "Do not ask again"
 msgstr ""
 
-#: pkgs.pm:911
+#: pkgs.pm:913
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d инстлациона трансакција није успела"
 
-#: pkgs.pm:912
+#: pkgs.pm:914
 #, fuzzy, c-format
 msgid "Installation of packages failed:"
 msgstr "Инсталирам пакет %s"
@@ -549,33 +544,33 @@ msgstr "Конзолни алати"
 msgid "Editors, shells, file tools, terminals"
 msgstr "едитори,шелови, алати за датотеке, терминали"
 
-#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:206
-#: share/meta-task/compssUsers.pl:208
+#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:201
+#: share/meta-task/compssUsers.pl:203
 #, c-format
 msgid "Development"
 msgstr "Развојна"
 
-#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:209
+#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:204
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr "C и C++ развојне библиотеке, програми  и пропратне датотеке"
 
-#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:213
+#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:208
 #, c-format
 msgid "Documentation"
 msgstr "Документација"
 
-#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:214
+#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:209
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "Књиге и Како? (Howto's) за Linux и Бесплатни Софтвер"
 
-#: share/meta-task/compssUsers.pl:68 share/meta-task/compssUsers.pl:217
+#: share/meta-task/compssUsers.pl:68 share/meta-task/compssUsers.pl:212
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
-#: share/meta-task/compssUsers.pl:69 share/meta-task/compssUsers.pl:218
+#: share/meta-task/compssUsers.pl:69 share/meta-task/compssUsers.pl:213
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "Линуксова Стандардна База. Подршка за Third party апликаицје"
@@ -706,9 +701,9 @@ msgid "Graphical Environment"
 msgstr "Графичко Окружење"
 
 #: share/meta-task/compssUsers.pl:152
-#, c-format
-msgid "KDE Workstation"
-msgstr "KDE падна станица"
+#, fuzzy, c-format
+msgid "Plasma Workstation"
+msgstr "Радна станица"
 
 #: share/meta-task/compssUsers.pl:153
 #, c-format
@@ -796,64 +791,51 @@ msgstr ""
 "NFS server, SMB server, Proxy серверих апликација и десктопалата"
 
 #: share/meta-task/compssUsers.pl:194
-#, fuzzy, c-format
-msgid "Plasma Desktop"
-msgstr "IceWm Десктоп"
-
-#: share/meta-task/compssUsers.pl:195
-#, fuzzy, c-format
-msgid ""
-"The Plasma Desktop, the basic graphical environment with a collection of "
-"accompanying tools"
-msgstr ""
-"K Десктоп окружење, основно графичко окружење са колекцијом пратећих алата"
-
-#: share/meta-task/compssUsers.pl:199
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Други графички десктопови"
 
-#: share/meta-task/compssUsers.pl:200
+#: share/meta-task/compssUsers.pl:195
 #, fuzzy, c-format
 msgid "Window Maker, Fvwm, etc"
 msgstr " Window Maker, Enlightenment, Fvwm, итд"
 
-#: share/meta-task/compssUsers.pl:223
+#: share/meta-task/compssUsers.pl:218
 #, c-format
 msgid "Utilities"
 msgstr "Алати"
 
-#: share/meta-task/compssUsers.pl:225 share/meta-task/compssUsers.pl:226
+#: share/meta-task/compssUsers.pl:220 share/meta-task/compssUsers.pl:221
 #, c-format
 msgid "SSH Server"
 msgstr "SSH Сервер"
 
-#: share/meta-task/compssUsers.pl:230
+#: share/meta-task/compssUsers.pl:225
 #, c-format
 msgid "Webmin"
 msgstr "Webmin"
 
-#: share/meta-task/compssUsers.pl:231
+#: share/meta-task/compssUsers.pl:226
 #, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Webmin сервер за даљинску контролу"
 
-#: share/meta-task/compssUsers.pl:235
+#: share/meta-task/compssUsers.pl:230
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "Мрежни алати/Мониторинг"
 
-#: share/meta-task/compssUsers.pl:236
+#: share/meta-task/compssUsers.pl:231
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr "Алати за мониторинг, управљање процесима, tcpdump, nmap, ..."
 
-#: share/meta-task/compssUsers.pl:240
+#: share/meta-task/compssUsers.pl:235
 #, c-format
 msgid "Mageia Wizards"
 msgstr "Mageia Чаробњаци"
 
-#: share/meta-task/compssUsers.pl:241
+#: share/meta-task/compssUsers.pl:236
 #, c-format
 msgid "Wizards to configure server"
 msgstr "Чаробњаци за подешавање сервера"
@@ -867,7 +849,7 @@ msgstr ""
 "Грешка, али незнам како да је разрешим.\n"
 "Наставите на ваш ризик!"
 
-#: steps.pm:458
+#: steps.pm:460
 #, c-format
 msgid ""
 "Some important packages did not get installed properly.\n"
@@ -913,7 +895,7 @@ msgstr ""
 "постигли,\n"
 "притисните `F1' при стартању са CDROM-а, а онда укуцајте  `text'."
 
-#: steps_gtk.pm:242 steps_gtk.pm:757
+#: steps_gtk.pm:242 steps_gtk.pm:754
 #, fuzzy, c-format
 msgid "Media Selection"
 msgstr "Одабир група пакета"
@@ -1110,7 +1092,7 @@ msgstr "Преостало време"
 msgid "(estimating...)"
 msgstr "Процењујем"
 
-#: steps_gtk.pm:631
+#: steps_gtk.pm:627
 #, fuzzy, c-format
 msgid "%d package"
 msgid_plural "%d packages"
@@ -1118,22 +1100,22 @@ msgstr[0] "%d пакета"
 msgstr[1] "%d пакета"
 msgstr[2] "%d пакета"
 
-#: steps_gtk.pm:687 steps_interactive.pm:809 steps_list.pm:43
+#: steps_gtk.pm:684 steps_interactive.pm:834 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Сажетак"
 
-#: steps_gtk.pm:706
+#: steps_gtk.pm:703
 #, c-format
 msgid "Configure"
 msgstr "Подеси"
 
-#: steps_gtk.pm:723 steps_interactive.pm:805 steps_interactive.pm:961
+#: steps_gtk.pm:720 steps_interactive.pm:830 steps_interactive.pm:986
 #, c-format
 msgid "not configured"
 msgstr "није подешено"
 
-#: steps_gtk.pm:766 steps_interactive.pm:315
+#: steps_gtk.pm:763 steps_interactive.pm:315
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -1142,7 +1124,7 @@ msgstr ""
 "Пронађени су следећи инсталациони медији.\n"
 "Уколико желите да прескочите неке од њих, деселектујте их сада."
 
-#: steps_gtk.pm:782 steps_interactive.pm:321
+#: steps_gtk.pm:779 steps_interactive.pm:321
 #, c-format
 msgid ""
 "You have the option to copy the contents of the CDs onto the hard disk drive "
@@ -1154,7 +1136,7 @@ msgstr ""
 "Након тога ће инсталција наставити са хард диска а пакети ће остати доступни "
 "и када се заврши инсталација."
 
-#: steps_gtk.pm:784 steps_interactive.pm:323
+#: steps_gtk.pm:781 steps_interactive.pm:323
 #, c-format
 msgid "Copy whole CDs"
 msgstr "Копирање целог CDа"
@@ -1230,12 +1212,12 @@ msgstr ""
 
 #: steps_interactive.pm:264
 #, c-format
-msgid "IDE"
-msgstr "IDE"
+msgid "CD/DVD"
+msgstr ""
 
 #: steps_interactive.pm:264
-#, c-format
-msgid "Configuring IDE"
+#, fuzzy, c-format
+msgid "Configuring CD/DVD"
 msgstr "Конфигурација  IDE"
 
 #: steps_interactive.pm:354
@@ -1409,7 +1391,7 @@ msgstr "Постинсталациона конфигурација"
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr "Проверите да ли се у уређају %s налази медиј за ажурирање модула"
 
-#: steps_interactive.pm:739 steps_list.pm:47
+#: steps_interactive.pm:739 steps_interactive.pm:769 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Ажурирање"
@@ -1433,7 +1415,17 @@ msgid ""
 "Do you want to setup the update media?"
 msgstr ""
 
-#: steps_interactive.pm:764
+#: steps_interactive.pm:762
+#, c-format
+msgid "Failure when adding medium"
+msgstr ""
+
+#: steps_interactive.pm:762
+#, fuzzy, c-format
+msgid "Retry?"
+msgstr "Обнови"
+
+#: steps_interactive.pm:770
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1454,28 +1446,28 @@ msgstr ""
 "да ли желите да инсталирате update-ове ?"
 
 #. -PO: example: lilo-graphic on /dev/hda1
-#: steps_interactive.pm:853
+#: steps_interactive.pm:878
 #, c-format
 msgid "%s on %s"
 msgstr "%s на %s"
 
-#: steps_interactive.pm:888 steps_interactive.pm:895 steps_interactive.pm:908
-#: steps_interactive.pm:925 steps_interactive.pm:940
+#: steps_interactive.pm:913 steps_interactive.pm:920 steps_interactive.pm:933
+#: steps_interactive.pm:950 steps_interactive.pm:965
 #, c-format
 msgid "Hardware"
 msgstr "Хардвер"
 
-#: steps_interactive.pm:909 steps_interactive.pm:926
+#: steps_interactive.pm:934 steps_interactive.pm:951
 #, c-format
 msgid "Sound card"
 msgstr "Звучна картица"
 
-#: steps_interactive.pm:929
+#: steps_interactive.pm:954
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Да ли имате ISA звучну картицу?"
 
-#: steps_interactive.pm:931
+#: steps_interactive.pm:956
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1484,69 +1476,69 @@ msgstr ""
 "Покрените \"alsaconf\" или \"sndconfig\" након иснталације да би подесили "
 "своју звучну картицу"
 
-#: steps_interactive.pm:933
+#: steps_interactive.pm:958
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 "Није детектована звучна картица. Покрените \"harddrake\" након инсталације"
 
-#: steps_interactive.pm:941
+#: steps_interactive.pm:966
 #, c-format
 msgid "Graphical interface"
 msgstr "Графички интерфејс"
 
-#: steps_interactive.pm:947 steps_interactive.pm:959
+#: steps_interactive.pm:972 steps_interactive.pm:984
 #, c-format
 msgid "Network & Internet"
 msgstr "Мрежа и Интернет"
 
-#: steps_interactive.pm:960
+#: steps_interactive.pm:985
 #, c-format
 msgid "Proxies"
 msgstr "Проксији"
 
-#: steps_interactive.pm:961
+#: steps_interactive.pm:986
 #, c-format
 msgid "configured"
 msgstr "подешено"
 
-#: steps_interactive.pm:971
+#: steps_interactive.pm:996
 #, c-format
 msgid "Security Level"
 msgstr "Ниво сигурности"
 
-#: steps_interactive.pm:991
+#: steps_interactive.pm:1016
 #, c-format
 msgid "Firewall"
 msgstr "Заштитни зид (Firewall)"
 
-#: steps_interactive.pm:995
+#: steps_interactive.pm:1020
 #, c-format
 msgid "activated"
 msgstr "Активирано"
 
-#: steps_interactive.pm:995
+#: steps_interactive.pm:1020
 #, c-format
 msgid "disabled"
 msgstr "онемогућено"
 
-#: steps_interactive.pm:1009
+#: steps_interactive.pm:1034
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "Нисте подесили X. Да ли сте сигурни да желите то?"
 
 #. -PO: This is NOT the boot loader (just the kernel initrds)!!!!
-#: steps_interactive.pm:1059
+#: steps_interactive.pm:1065
 #, fuzzy, c-format
 msgid "Preparing initial startup program..."
 msgstr "Припремам инсталацију"
 
-#: steps_interactive.pm:1041
+#: steps_interactive.pm:1066
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr ""
 
-#: steps_interactive.pm:1057
+#: steps_interactive.pm:1082
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
@@ -1555,17 +1547,17 @@ msgstr ""
 "У овом сугурносном нивоу приступ фајловима на Windows партицији је дозвољен "
 "само администраторима."
 
-#: steps_interactive.pm:1089
+#: steps_interactive.pm:1114
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Убаците празну дискету у уређај %s"
 
-#: steps_interactive.pm:1091
+#: steps_interactive.pm:1116
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Креирам ауто инсталациони флопи"
 
-#: steps_interactive.pm:1102
+#: steps_interactive.pm:1127
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1576,12 +1568,12 @@ msgstr ""
 "\n"
 "Да ли стварно желите да завршите ?"
 
-#: steps_interactive.pm:1112
+#: steps_interactive.pm:1137
 #, c-format
 msgid "Congratulations"
 msgstr "Честитке"
 
-#: steps_interactive.pm:1115
+#: steps_interactive.pm:1140
 #, c-format
 msgid "Reboot"
 msgstr "Рестарт"
@@ -1718,6 +1710,26 @@ msgid ""
 "Exit"
 msgstr ""
 
+#~ msgid "CD-ROM"
+#~ msgstr "CD-ROM"
+
+#~ msgid "KDE Workstation"
+#~ msgstr "KDE падна станица"
+
+#, fuzzy
+#~ msgid "Plasma Desktop"
+#~ msgstr "IceWm Десктоп"
+
+#, fuzzy
+#~ msgid ""
+#~ "The Plasma Desktop, the basic graphical environment with a collection of "
+#~ "accompanying tools"
+#~ msgstr ""
+#~ "K Десктоп окружење, основно графичко окружење са колекцијом пратећих алата"
+
+#~ msgid "IDE"
+#~ msgstr "IDE"
+
 #~ msgid "Preparing bootloader..."
 #~ msgstr "Припремам стартер..."