Merge branch 'master' of git://git.mageia.org/software/drakx

1 files changed, 240 insertions, 189 deletions

diff --git a/perl-install/install/share/po/sr.po b/perl-install/install/share/po/sr.po
index d65931441..c747a46fd 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: 2013-05-03 10:51+0200\n"
+"POT-Creation-Date: 2013-11-03 12:08+0200\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"
@@ -75,7 +75,7 @@ msgid "Do you have further supplementary media?"
 msgstr "Да ли имате још додатних медија?"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:113
+#: any.pm:114
 #, c-format
 msgid ""
 "The following media have been found and will be used during install: %s.\n"
@@ -88,88 +88,88 @@ msgstr ""
 "\n"
 "Да ли имате додатних инсталационих медија које треба подесити?"
 
-#: any.pm:121
+#: any.pm:122
 #, c-format
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: any.pm:122
+#: any.pm:123
 #, c-format
 msgid "Network (HTTP)"
 msgstr "Мрежа (HTTP)"
 
-#: any.pm:123
+#: any.pm:124
 #, c-format
 msgid "Network (FTP)"
 msgstr "Мрежа (FTP)"
 
-#: any.pm:124
+#: any.pm:125
 #, c-format
 msgid "Network (NFS)"
 msgstr "Мрежа (NFS)"
 
-#: any.pm:171
+#: any.pm:173
 #, c-format
 msgid "URL of the mirror?"
 msgstr "УРЛ мирора?"
 
-#: any.pm:177
+#: any.pm:179
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr "УРЛ мора почињати са ftp:// или http://"
 
-#: any.pm:188
+#: any.pm:190
 #, c-format
 msgid "Contacting %s web site to get the list of available mirrors..."
 msgstr "Контактирајте %s web сајт да би добили листу доступних mirror-а..."
 
-#: any.pm:193
+#: any.pm:195
 #, c-format
 msgid "Failed contacting %s web site to get the list of available mirrors"
 msgstr ""
 "Неуспешно успостављање везе са %s web сајт ради листе доступних mirror-а"
 
-#: any.pm:203
+#: any.pm:205
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Изаберите mirror са ког ћете скинути пакете"
 
-#: any.pm:233
+#: any.pm:235
 #, c-format
 msgid "NFS setup"
 msgstr "Подешавање NFS-а"
 
-#: any.pm:234
+#: any.pm:236
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr "Унесите име домаћина-hostname и директоријум вашег NFS медија"
 
-#: any.pm:238
+#: any.pm:240
 #, c-format
 msgid "Hostname missing"
 msgstr "Недостаје име домаћина-hostname"
 
-#: any.pm:239
+#: any.pm:241
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr "Директоријум мора почети са  \"/\""
 
-#: any.pm:243
+#: any.pm:245
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr "Име домаћина-hostname за монтирање NFS ?"
 
-#: any.pm:244
+#: any.pm:246
 #, c-format
 msgid "Directory"
 msgstr "Директоријум"
 
-#: any.pm:266
+#: any.pm:268
 #, c-format
 msgid "Supplementary"
 msgstr "Додатни"
 
-#: any.pm:301
+#: any.pm:303
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
@@ -178,90 +178,90 @@ msgstr ""
 "Не могу пронађем листу пакета на овом мирору. проверите да ли локација "
 "исправна."
 
-#: any.pm:317
+#: any.pm:319
 #, c-format
 msgid "Core Release"
 msgstr ""
 
-#: any.pm:319
+#: any.pm:321
 #, c-format
 msgid "Tainted Release"
 msgstr ""
 
-#: any.pm:321
+#: any.pm:323
 #, c-format
 msgid "Nonfree Release"
 msgstr ""
 
-#: any.pm:335
+#: any.pm:351
 #, 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:336
+#: any.pm:352
 #, c-format
 msgid "You should enable \"%s\""
 msgstr ""
 
-#: any.pm:355
+#: any.pm:377
 #, c-format
 msgid "\"%s\" contains the various pieces of the systems and its applications"
 msgstr ""
 
-#: any.pm:356
+#: any.pm:378
 #, c-format
 msgid "\"%s\" contains non free software.\n"
 msgstr ""
 
-#: any.pm:357
+#: any.pm:379
 #, 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:358
+#: any.pm:380
 #, c-format
 msgid ""
 "\"%s\" contains software that can not be distributed in every country due to "
 "software patents."
 msgstr ""
 
-#: any.pm:359
+#: any.pm:381
 #, c-format
 msgid ""
 "It also contains software from \"%s\" rebuild with additional capabilities."
 msgstr ""
 
-#: any.pm:363
+#: any.pm:387
 #, c-format
 msgid "Here you can enable more media if you want."
 msgstr ""
 
-#: any.pm:378
+#: any.pm:404
 #, c-format
 msgid "This medium provides package updates for medium \"%s\""
 msgstr ""
 
-#: any.pm:451
+#: any.pm:480
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "Тражим већ инсталиране пакете..."
 
-#: any.pm:485
+#: any.pm:514
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Тражим пакете за ажурирање..."
 
-#: any.pm:498
+#: any.pm:527
 #, c-format
 msgid "Removing packages prior to upgrade..."
 msgstr "Уклањам старе пакете..."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:713
+#: any.pm:743
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -274,72 +274,72 @@ msgstr ""
 "\n"
 "Да ли заиста желите да уклоните ове пакете?\n"
 
-#: any.pm:932
+#: any.pm:962
 #, c-format
 msgid "Error reading file %s"
 msgstr "Грешка код отварања датотека %s"
 
-#: any.pm:1140
+#: any.pm:1170
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "Следећи диск(ови) ће бити преименовани:"
 
-#: any.pm:1142
+#: any.pm:1172
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s (раније са именом %s)"
 
-#: any.pm:1199
+#: any.pm:1229
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1199
+#: any.pm:1229
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1199
+#: any.pm:1229
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1218 steps_interactive.pm:970
+#: any.pm:1248 steps_interactive.pm:973
 #, c-format
 msgid "Network"
 msgstr "Мрежа"
 
-#: any.pm:1222
+#: any.pm:1252
 #, c-format
 msgid "Please choose a media"
 msgstr "Изаберите медиј"
 
-#: any.pm:1238
+#: any.pm:1268
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "Датотека већ постоји. Да ли препишем преко постојеће?"
 
-#: any.pm:1242
+#: any.pm:1272
 #, c-format
 msgid "Permission denied"
 msgstr "Приступ одбијен"
 
-#: any.pm:1290
+#: any.pm:1320
 #, c-format
 msgid "Bad NFS name"
 msgstr "Погрешно NFS име"
 
-#: any.pm:1311
+#: any.pm:1341
 #, c-format
 msgid "Bad media %s"
 msgstr "Лош медиј %s"
 
-#: any.pm:1355
+#: any.pm:1385
 #, c-format
 msgid "Cannot make screenshots before partitioning"
 msgstr "Не могу да направим снимак пре партиционирања"
 
-#: any.pm:1363
+#: any.pm:1393
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "Снимци ће бити доступни након инсталације у %s"
@@ -349,7 +349,7 @@ msgstr "Снимци ће бити доступни након инсталац�
 msgid "Installation"
 msgstr "Инсталација"
 
-#: gtk.pm:132 share/meta-task/compssUsers.pl:43
+#: gtk.pm:132 share/meta-task/compssUsers.pl:46
 #, c-format
 msgid "Configuration"
 msgstr "Конфигурација"
@@ -446,42 +446,42 @@ msgid ""
 "%s"
 msgstr ""
 
-#: pkgs.pm:382 pkgs.pm:409
+#: pkgs.pm:383 pkgs.pm:410
 #, fuzzy, c-format
 msgid "An error occurred:"
 msgstr "Хм,појавила се грешка"
 
-#: pkgs.pm:401
+#: pkgs.pm:402
 #, c-format
 msgid "A fatal error occurred: %s."
 msgstr "Појавила се фатална грешка: %s."
 
-#: pkgs.pm:891 pkgs.pm:928
+#: pkgs.pm:896 pkgs.pm:938
 #, c-format
 msgid "Do not ask again"
 msgstr ""
 
-#: pkgs.pm:907
+#: pkgs.pm:912
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d инстлациона трансакција није успела"
 
-#: pkgs.pm:908
+#: pkgs.pm:913
 #, fuzzy, c-format
 msgid "Installation of packages failed:"
 msgstr "Инсталирам пакет %s"
 
-#: share/meta-task/compssUsers.pl:13
+#: share/meta-task/compssUsers.pl:14
 #, c-format
 msgid "Workstation"
 msgstr "Радна станица"
 
-#: share/meta-task/compssUsers.pl:15
+#: share/meta-task/compssUsers.pl:16
 #, c-format
 msgid "Office Workstation"
 msgstr "Радна(Office) станица"
 
-#: share/meta-task/compssUsers.pl:17
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid ""
 "Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets "
@@ -490,32 +490,32 @@ msgstr ""
 "Office програми: текст процесори (LibreOffice Writer, Kword), табеле "
 "(LibreOffice Calc, Kspread), pdf прегледници, итд"
 
-#: share/meta-task/compssUsers.pl:22
+#: share/meta-task/compssUsers.pl:24
 #, c-format
 msgid "Game station"
 msgstr "Станица за игру"
 
-#: share/meta-task/compssUsers.pl:23
+#: share/meta-task/compssUsers.pl:25
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Забавни програми: аркаде, иге на табли, стратегије, итд"
 
-#: share/meta-task/compssUsers.pl:26
+#: share/meta-task/compssUsers.pl:28
 #, c-format
 msgid "Multimedia station"
 msgstr "Мултимедијална станица"
 
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:29
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Програми за пуштање звука и видеа"
 
-#: share/meta-task/compssUsers.pl:32
+#: share/meta-task/compssUsers.pl:34
 #, c-format
 msgid "Internet station"
 msgstr "Интернет станица"
 
-#: share/meta-task/compssUsers.pl:33
+#: share/meta-task/compssUsers.pl:35
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -524,193 +524,193 @@ msgstr ""
 "Скуп алата за читање и слање ел.поште и вести (mutt, tin..) и за "
 "претраживање Интернета"
 
-#: share/meta-task/compssUsers.pl:38
+#: share/meta-task/compssUsers.pl:40
 #, c-format
 msgid "Network Computer (client)"
 msgstr "Мрежни компјутер (клијент)"
 
-#: share/meta-task/compssUsers.pl:39
+#: share/meta-task/compssUsers.pl:41
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Клијенти за различите протоколе укључујући и ssh"
 
-#: share/meta-task/compssUsers.pl:44
+#: share/meta-task/compssUsers.pl:47
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Алати за лако конфигурисање компјутера"
 
-#: share/meta-task/compssUsers.pl:48
+#: share/meta-task/compssUsers.pl:51
 #, c-format
 msgid "Console Tools"
 msgstr "Конзолни алати"
 
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:52
 #, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "едитори,шелови, алати за датотеке, терминали"
 
-#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156
-#: share/meta-task/compssUsers.pl:158
+#: share/meta-task/compssUsers.pl:56 share/meta-task/compssUsers.pl:200
+#: share/meta-task/compssUsers.pl:202
 #, c-format
 msgid "Development"
 msgstr "Развојна"
 
-#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:203
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr "C и C++ развојне библиотеке, програми  и пропратне датотеке"
 
-#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163
+#: share/meta-task/compssUsers.pl:61 share/meta-task/compssUsers.pl:207
 #, c-format
 msgid "Documentation"
 msgstr "Документација"
 
-#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
+#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:208
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "Књиге и Како? (Howto's) за Linux и Бесплатни Софтвер"
 
-#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167
+#: share/meta-task/compssUsers.pl:66 share/meta-task/compssUsers.pl:211
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
-#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:67 share/meta-task/compssUsers.pl:212
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "Линуксова Стандардна База. Подршка за Third party апликаицје"
 
-#: share/meta-task/compssUsers.pl:72
+#: share/meta-task/compssUsers.pl:77
 #, c-format
 msgid "Web Server"
 msgstr "Веб Сервер"
 
-#: share/meta-task/compssUsers.pl:73
+#: share/meta-task/compssUsers.pl:78
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:76
+#: share/meta-task/compssUsers.pl:82
 #, c-format
 msgid "Groupware"
 msgstr "Софтвер за групни рад"
 
-#: share/meta-task/compssUsers.pl:77
+#: share/meta-task/compssUsers.pl:83
 #, c-format
 msgid "Kolab Server"
 msgstr "Kolab Сервер"
 
-#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121
+#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl:136
 #, c-format
 msgid "Firewall/Router"
 msgstr "Сервер, Firewall/Router"
 
-#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
+#: share/meta-task/compssUsers.pl:87 share/meta-task/compssUsers.pl:137
 #, c-format
 msgid "Internet gateway"
 msgstr "Интернет gateway"
 
-#: share/meta-task/compssUsers.pl:84
+#: share/meta-task/compssUsers.pl:90
 #, c-format
 msgid "Mail/News"
 msgstr "Ел.пошта/вести"
 
-#: share/meta-task/compssUsers.pl:85
+#: share/meta-task/compssUsers.pl:91
 #, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "Postfix сервер за ел.пошту,Inn сервер за вести "
 
-#: share/meta-task/compssUsers.pl:88
+#: share/meta-task/compssUsers.pl:95
 #, c-format
 msgid "Directory Server"
 msgstr "Сервер директоријума"
 
-#: share/meta-task/compssUsers.pl:92
+#: share/meta-task/compssUsers.pl:100
 #, c-format
 msgid "FTP Server"
 msgstr "FTP Сервер"
 
-#: share/meta-task/compssUsers.pl:93
+#: share/meta-task/compssUsers.pl:101
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:96
+#: share/meta-task/compssUsers.pl:105
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:97
+#: share/meta-task/compssUsers.pl:106
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "Име Домена и Мрежни Информациони Сервер"
 
-#: share/meta-task/compssUsers.pl:100
+#: share/meta-task/compssUsers.pl:110
 #, c-format
 msgid "File and Printer Sharing Server"
 msgstr "Фајл Сервер и сервер за дељење штампача"
 
-#: share/meta-task/compssUsers.pl:101
+#: share/meta-task/compssUsers.pl:111
 #, c-format
 msgid "NFS Server, Samba server"
 msgstr "NFS Сервер, Samba Сервер"
 
-#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117
+#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl:131
 #, c-format
 msgid "Database"
 msgstr "Сервер,Базе података"
 
-#: share/meta-task/compssUsers.pl:105
+#: share/meta-task/compssUsers.pl:116
 #, c-format
 msgid "PostgreSQL and MariaDB Database Server"
 msgstr "PostgreSQL или MariaDB сервер за базу података"
 
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:121
 #, c-format
 msgid "Web/FTP"
 msgstr "Сервер, Web/FTP"
 
-#: share/meta-task/compssUsers.pl:110
+#: share/meta-task/compssUsers.pl:122
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache, Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:126
 #, c-format
 msgid "Mail"
 msgstr "Пошта"
 
-#: share/meta-task/compssUsers.pl:114
+#: share/meta-task/compssUsers.pl:127
 #, c-format
 msgid "Postfix mail server"
 msgstr "Postfix mail сервер"
 
-#: share/meta-task/compssUsers.pl:118
+#: share/meta-task/compssUsers.pl:132
 #, c-format
 msgid "PostgreSQL or MariaDB database server"
 msgstr "PostgreSQL или MariaDB сервер за базу података"
 
-#: share/meta-task/compssUsers.pl:125
+#: share/meta-task/compssUsers.pl:140
 #, c-format
 msgid "Network Computer server"
 msgstr "Мрежни Сервер"
 
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:141
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr "NFS сервер, SMB сервер, Proxy сервер, SSH сервер"
 
-#: share/meta-task/compssUsers.pl:132
+#: share/meta-task/compssUsers.pl:148
 #, c-format
 msgid "Graphical Environment"
 msgstr "Графичко Окружење"
 
-#: share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "KDE Workstation"
 msgstr "KDE падна станица"
 
-#: share/meta-task/compssUsers.pl:135
+#: share/meta-task/compssUsers.pl:151
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
@@ -718,12 +718,12 @@ msgid ""
 msgstr ""
 "K Десктоп окружење, основно графичко окружење са колекцијом пратећих алата"
 
-#: share/meta-task/compssUsers.pl:139
+#: share/meta-task/compssUsers.pl:156
 #, c-format
 msgid "GNOME Workstation"
 msgstr "Gnome радна станица"
 
-#: share/meta-task/compssUsers.pl:140
+#: share/meta-task/compssUsers.pl:157 share/meta-task/compssUsers.pl:168
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
@@ -732,12 +732,41 @@ msgstr ""
 "Графичка окружења за сетом корисничк NFS server, SMB server, Proxy server, "
 "NFS server, SMB server, Proxy серверих апликација и десктопалата"
 
-#: share/meta-task/compssUsers.pl:144
+#: share/meta-task/compssUsers.pl:162
+#, fuzzy, c-format
+msgid "XFCE Workstation"
+msgstr "KDE падна станица"
+
+#: share/meta-task/compssUsers.pl:163
+#, fuzzy, c-format
+msgid ""
+"A lighter graphical environment with user-friendly set of applications and "
+"desktop tools"
+msgstr ""
+"Графичка окружења за сетом корисничк NFS server, SMB server, Proxy server, "
+"NFS server, SMB server, Proxy серверих апликација и десктопалата"
+
+#: share/meta-task/compssUsers.pl:167
+#, fuzzy, c-format
+msgid "MATE Workstation"
+msgstr "Gnome радна станица"
+
+#: share/meta-task/compssUsers.pl:172
+#, fuzzy, c-format
+msgid "Cinnamon Workstation"
+msgstr "Радна станица"
+
+#: share/meta-task/compssUsers.pl:173
+#, fuzzy, c-format
+msgid "A graphical environment based on GNOME"
+msgstr "Графичко Окружење"
+
+#: share/meta-task/compssUsers.pl:177
 #, fuzzy, c-format
 msgid "LXDE Desktop"
 msgstr "IceWm Десктоп"
 
-#: share/meta-task/compssUsers.pl:146
+#: share/meta-task/compssUsers.pl:179
 #, fuzzy, c-format
 msgid ""
 "A lightweight & fast graphical environment with user-friendly set of "
@@ -746,52 +775,74 @@ msgstr ""
 "Графичка окружења за сетом корисничк NFS server, SMB server, Proxy server, "
 "NFS server, SMB server, Proxy серверих апликација и десктопалата"
 
-#: share/meta-task/compssUsers.pl:149
+#: share/meta-task/compssUsers.pl:183
+#, fuzzy, c-format
+msgid "RazorQT Desktop"
+msgstr "IceWm Десктоп"
+
+#: share/meta-task/compssUsers.pl:185
+#, c-format
+msgid "A less developed lightweight fast graphical environment"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:188
+#, c-format
+msgid "Enlightenment e17 Desktop"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:190
+#, fuzzy, c-format
+msgid "A lightweight fast graphical environment with a dedicated following"
+msgstr ""
+"Графичка окружења за сетом корисничк NFS server, SMB server, Proxy server, "
+"NFS server, SMB server, Proxy серверих апликација и десктопалата"
+
+#: share/meta-task/compssUsers.pl:193
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Други графички десктопови"
 
-#: share/meta-task/compssUsers.pl:150
-#, c-format
-msgid "Window Maker, Enlightenment, Fvwm, etc"
+#: share/meta-task/compssUsers.pl:194
+#, fuzzy, c-format
+msgid "Window Maker, Fvwm, etc"
 msgstr " Window Maker, Enlightenment, Fvwm, итд"
 
-#: share/meta-task/compssUsers.pl:173
+#: share/meta-task/compssUsers.pl:217
 #, c-format
 msgid "Utilities"
 msgstr "Алати"
 
-#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176
+#: share/meta-task/compssUsers.pl:219 share/meta-task/compssUsers.pl:220
 #, c-format
 msgid "SSH Server"
 msgstr "SSH Сервер"
 
-#: share/meta-task/compssUsers.pl:180
+#: share/meta-task/compssUsers.pl:224
 #, c-format
 msgid "Webmin"
 msgstr "Webmin"
 
-#: share/meta-task/compssUsers.pl:181
+#: share/meta-task/compssUsers.pl:225
 #, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Webmin сервер за даљинску контролу"
 
-#: share/meta-task/compssUsers.pl:185
+#: share/meta-task/compssUsers.pl:229
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "Мрежни алати/Мониторинг"
 
-#: share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:230
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr "Алати за мониторинг, управљање процесима, tcpdump, nmap, ..."
 
-#: share/meta-task/compssUsers.pl:190
+#: share/meta-task/compssUsers.pl:234
 #, c-format
 msgid "Mageia Wizards"
 msgstr "Mageia Чаробњаци"
 
-#: share/meta-task/compssUsers.pl:191
+#: share/meta-task/compssUsers.pl:235
 #, c-format
 msgid "Wizards to configure server"
 msgstr "Чаробњаци за подешавање сервера"
@@ -805,7 +856,7 @@ msgstr ""
 "Грешка, али незнам како да је разрешим.\n"
 "Наставите на ваш ризик!"
 
-#: steps.pm:461
+#: steps.pm:458
 #, c-format
 msgid ""
 "Some important packages did not get installed properly.\n"
@@ -861,194 +912,194 @@ msgstr "Одабир група пакета"
 msgid "Install %s KDE Desktop"
 msgstr ""
 
-#: steps_gtk.pm:244
+#: steps_gtk.pm:252
 #, c-format
 msgid "Install %s GNOME Desktop"
 msgstr ""
 
-#: steps_gtk.pm:245
+#: steps_gtk.pm:253
 #, fuzzy, c-format
 msgid "Custom install"
 msgstr "Минимално инсталирај"
 
-#: steps_gtk.pm:266
+#: steps_gtk.pm:274
 #, fuzzy, c-format
 msgid "KDE Desktop"
 msgstr "IceWm Десктоп"
 
-#: steps_gtk.pm:267
+#: steps_gtk.pm:275
 #, fuzzy, c-format
 msgid "GNOME Desktop"
 msgstr "IceWm Десктоп"
 
-#: steps_gtk.pm:268
+#: steps_gtk.pm:276
 #, fuzzy, c-format
 msgid "Custom Desktop"
 msgstr "IceWm Десктоп"
 
-#: steps_gtk.pm:274
+#: steps_gtk.pm:282
 #, c-format
 msgid "Here's a preview of the '%s' desktop."
 msgstr ""
 
-#: steps_gtk.pm:301
+#: steps_gtk.pm:309
 #, c-format
 msgid "Click on images in order to see a bigger preview"
 msgstr ""
 
-#: steps_gtk.pm:319 steps_interactive.pm:633 steps_list.pm:30
+#: steps_gtk.pm:325 steps_interactive.pm:633 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Одабир група пакета"
 
-#: steps_gtk.pm:344 steps_interactive.pm:650
+#: steps_gtk.pm:350 steps_interactive.pm:650
 #, c-format
 msgid "Individual package selection"
 msgstr "Појединачно бирање пакета"
 
-#: steps_gtk.pm:351
+#: steps_gtk.pm:357
 #, c-format
 msgid "Unselect All"
 msgstr "Деселектуј Све"
 
-#: steps_gtk.pm:370 steps_interactive.pm:562
+#: steps_gtk.pm:376 steps_interactive.pm:562
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "Укупна величина: %d / %d MB"
 
-#: steps_gtk.pm:415
+#: steps_gtk.pm:421
 #, c-format
 msgid "Version: "
 msgstr "Верзија: "
 
-#: steps_gtk.pm:416
+#: steps_gtk.pm:422
 #, c-format
 msgid "Size: "
 msgstr "Величина: "
 
-#: steps_gtk.pm:416
+#: steps_gtk.pm:422
 #, c-format
 msgid "%d KB\n"
 msgstr "%d KB\n"
 
-#: steps_gtk.pm:417
+#: steps_gtk.pm:423
 #, c-format
 msgid "Importance: "
 msgstr "Важност: "
 
-#: steps_gtk.pm:452
+#: steps_gtk.pm:458
 #, c-format
 msgid "You cannot select/unselect this package"
 msgstr "Не можете селектовати/деселектовати овај пакет"
 
-#: steps_gtk.pm:456
+#: steps_gtk.pm:462
 #, c-format
 msgid "due to missing %s"
 msgstr "због не постојања %s"
 
-#: steps_gtk.pm:457
+#: steps_gtk.pm:463
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "због не задовољеног %s"
 
-#: steps_gtk.pm:458
+#: steps_gtk.pm:464
 #, c-format
 msgid "trying to promote %s"
 msgstr "покушавам да прикажем %s"
 
-#: steps_gtk.pm:459
+#: steps_gtk.pm:465
 #, c-format
 msgid "in order to keep %s"
 msgstr "да бих задржао %s"
 
-#: steps_gtk.pm:464
+#: steps_gtk.pm:470
 #, c-format
 msgid ""
 "You cannot select this package as there is not enough space left to install "
 "it"
 msgstr "Не можете селектовати овај пакет јер нема више слободног простора"
 
-#: steps_gtk.pm:467
+#: steps_gtk.pm:473
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "Следећи пакети треба да буду инсталирани"
 
-#: steps_gtk.pm:468
+#: steps_gtk.pm:474
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "Следећи пакети ће бити избрисани"
 
-#: steps_gtk.pm:494
+#: steps_gtk.pm:500
 #, c-format
 msgid "This is a mandatory package, it cannot be unselected"
 msgstr "Ово је обавезни пакет,и не може бити деселектован"
 
-#: steps_gtk.pm:496
+#: steps_gtk.pm:502
 #, c-format
 msgid "You cannot unselect this package. It is already installed"
 msgstr "Можете деселектовати овај пакет јер је већ инсталиран"
 
-#: steps_gtk.pm:498
+#: steps_gtk.pm:504
 #, c-format
 msgid "You cannot unselect this package. It must be upgraded"
 msgstr "Не можете деселектовати овај пакет.Он мора бити ажуриран"
 
-#: steps_gtk.pm:502
+#: steps_gtk.pm:508
 #, c-format
 msgid "Show automatically selected packages"
 msgstr "Аутоматски прикажи изабране пакете"
 
-#: steps_gtk.pm:509
+#: steps_gtk.pm:512
 #, c-format
 msgid "Install"
 msgstr "Инсталирај"
 
-#: steps_gtk.pm:512
+#: steps_gtk.pm:515
 #, c-format
 msgid "Load/Save selection"
 msgstr "Учитај/Сачувај избор"
 
-#: steps_gtk.pm:513
+#: steps_gtk.pm:516
 #, c-format
 msgid "Updating package selection"
 msgstr "Ажурирање селекције пакета"
 
-#: steps_gtk.pm:518
+#: steps_gtk.pm:521
 #, c-format
 msgid "Minimal install"
 msgstr "Минимално инсталирај"
 
-#: steps_gtk.pm:531
+#: steps_gtk.pm:534
 #, c-format
 msgid "Software Management"
 msgstr "Подешавање Софтвера"
 
-#: steps_gtk.pm:531 steps_interactive.pm:443
+#: steps_gtk.pm:534 steps_interactive.pm:443
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Изабери пакете за инсталацију"
 
-#: steps_gtk.pm:548 steps_interactive.pm:670 steps_list.pm:32
+#: steps_gtk.pm:551 steps_interactive.pm:670 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Инсталирам"
 
-#: steps_gtk.pm:578
+#: steps_gtk.pm:581
 #, c-format
 msgid "No details"
 msgstr "Без детаља"
 
-#: steps_gtk.pm:597
+#: steps_gtk.pm:600
 #, fuzzy, c-format
 msgid "Time remaining:"
 msgstr "Преостало време"
 
-#: steps_gtk.pm:598
+#: steps_gtk.pm:601
 #, fuzzy, c-format
 msgid "(estimating...)"
 msgstr "Процењујем"
 
-#: steps_gtk.pm:628
+#: steps_gtk.pm:631
 #, fuzzy, c-format
 msgid "%d package"
 msgid_plural "%d packages"
@@ -1056,17 +1107,17 @@ msgstr[0] "%d пакета"
 msgstr[1] "%d пакета"
 msgstr[2] "%d пакета"
 
-#: steps_gtk.pm:683 steps_interactive.pm:834 steps_list.pm:43
+#: steps_gtk.pm:687 steps_interactive.pm:837 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Сажетак"
 
-#: steps_gtk.pm:702
+#: steps_gtk.pm:706
 #, c-format
 msgid "Configure"
 msgstr "Подеси"
 
-#: steps_gtk.pm:719 steps_interactive.pm:830 steps_interactive.pm:983
+#: steps_gtk.pm:723 steps_interactive.pm:833 steps_interactive.pm:986
 #, c-format
 msgid "not configured"
 msgstr "није подешено"
@@ -1080,7 +1131,7 @@ msgstr ""
 "Пронађени су следећи инсталациони медији.\n"
 "Уколико желите да прескочите неке од њих, деселектујте их сада."
 
-#: steps_gtk.pm:778 steps_interactive.pm:349
+#: steps_gtk.pm:782 steps_interactive.pm:349
 #, c-format
 msgid ""
 "You have the option to copy the contents of the CDs onto the hard disk drive "
@@ -1092,7 +1143,7 @@ msgstr ""
 "Након тога ће инсталција наставити са хард диска а пакети ће остати доступни "
 "и када се заврши инсталација."
 
-#: steps_gtk.pm:780 steps_interactive.pm:351
+#: steps_gtk.pm:784 steps_interactive.pm:351
 #, c-format
 msgid "Copy whole CDs"
 msgstr "Копирање целог CDа"
@@ -1393,28 +1444,28 @@ msgstr ""
 "да ли желите да инсталирате update-ове ?"
 
 #. -PO: example: lilo-graphic on /dev/hda1
-#: steps_interactive.pm:878
+#: steps_interactive.pm:881
 #, c-format
 msgid "%s on %s"
 msgstr "%s на %s"
 
-#: steps_interactive.pm:910 steps_interactive.pm:917 steps_interactive.pm:930
-#: steps_interactive.pm:947 steps_interactive.pm:962
+#: 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:931 steps_interactive.pm:948
+#: steps_interactive.pm:934 steps_interactive.pm:951
 #, c-format
 msgid "Sound card"
 msgstr "Звучна картица"
 
-#: steps_interactive.pm:951
+#: steps_interactive.pm:954
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Да ли имате ISA звучну картицу?"
 
-#: steps_interactive.pm:953
+#: steps_interactive.pm:956
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1423,74 +1474,74 @@ msgstr ""
 "Покрените \"alsaconf\" или \"sndconfig\" након иснталације да би подесили "
 "своју звучну картицу"
 
-#: steps_interactive.pm:955
+#: steps_interactive.pm:958
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 "Није детектована звучна картица. Покрените \"harddrake\" након инсталације"
 
-#: steps_interactive.pm:963
+#: steps_interactive.pm:966
 #, c-format
 msgid "Graphical interface"
 msgstr "Графички интерфејс"
 
-#: steps_interactive.pm:969 steps_interactive.pm:981
+#: steps_interactive.pm:972 steps_interactive.pm:984
 #, c-format
 msgid "Network & Internet"
 msgstr "Мрежа и Интернет"
 
-#: steps_interactive.pm:982
+#: steps_interactive.pm:985
 #, c-format
 msgid "Proxies"
 msgstr "Проксији"
 
-#: steps_interactive.pm:983
+#: steps_interactive.pm:986
 #, c-format
 msgid "configured"
 msgstr "подешено"
 
-#: steps_interactive.pm:993
+#: steps_interactive.pm:996
 #, c-format
 msgid "Security Level"
 msgstr "Ниво сигурности"
 
-#: steps_interactive.pm:1013
+#: steps_interactive.pm:1016
 #, c-format
 msgid "Firewall"
 msgstr "Заштитни зид (Firewall)"
 
-#: steps_interactive.pm:1017
+#: steps_interactive.pm:1020
 #, c-format
 msgid "activated"
 msgstr "Активирано"
 
-#: steps_interactive.pm:1017
+#: steps_interactive.pm:1020
 #, c-format
 msgid "disabled"
 msgstr "онемогућено"
 
-#: steps_interactive.pm:1031
+#: steps_interactive.pm:1034
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "Нисте подесили X. Да ли сте сигурни да желите то?"
 
-#: steps_interactive.pm:1060
+#: steps_interactive.pm:1063
 #, c-format
 msgid "Preparing bootloader..."
 msgstr "Припремам стартер..."
 
 #. -PO: This is NOT the boot loader!!!!
-#: steps_interactive.pm:1062
+#: steps_interactive.pm:1065
 #, fuzzy, c-format
 msgid "Preparing initial startup program..."
 msgstr "Припремам инсталацију"
 
-#: steps_interactive.pm:1063
+#: steps_interactive.pm:1066
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr ""
 
-#: steps_interactive.pm:1074
+#: steps_interactive.pm:1077
 #, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1503,7 +1554,7 @@ msgstr ""
 "BootX или нешто друго да би подигли систем. Аргумент кернела заroot fs je: "
 "root=%s"
 
-#: steps_interactive.pm:1087
+#: steps_interactive.pm:1090
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
@@ -1512,17 +1563,17 @@ msgstr ""
 "У овом сугурносном нивоу приступ фајловима на Windows партицији је дозвољен "
 "само администраторима."
 
-#: steps_interactive.pm:1119
+#: steps_interactive.pm:1122
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Убаците празну дискету у уређај %s"
 
-#: steps_interactive.pm:1121
+#: steps_interactive.pm:1124
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Креирам ауто инсталациони флопи"
 
-#: steps_interactive.pm:1132
+#: steps_interactive.pm:1135
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1533,12 +1584,12 @@ msgstr ""
 "\n"
 "Да ли стварно желите да завршите ?"
 
-#: steps_interactive.pm:1142
+#: steps_interactive.pm:1145
 #, c-format
 msgid "Congratulations"
 msgstr "Честитке"
 
-#: steps_interactive.pm:1145
+#: steps_interactive.pm:1148
 #, c-format
 msgid "Reboot"
 msgstr "Рестарт"