summaryrefslogtreecommitdiffstats
path: root/perl-install/install
diff options
context:
space:
mode:
Diffstat (limited to 'perl-install/install')
-rw-r--r--perl-install/install/share/po/DrakX.pot403
-rw-r--r--perl-install/install/share/po/af.po411
-rw-r--r--perl-install/install/share/po/am.po411
-rw-r--r--perl-install/install/share/po/ar.po429
-rw-r--r--perl-install/install/share/po/az.po411
-rw-r--r--perl-install/install/share/po/be.po411
-rw-r--r--perl-install/install/share/po/bg.po411
-rw-r--r--perl-install/install/share/po/bn.po408
-rw-r--r--perl-install/install/share/po/br.po408
-rw-r--r--perl-install/install/share/po/bs.po408
-rw-r--r--perl-install/install/share/po/ca.po408
-rw-r--r--perl-install/install/share/po/cs.po450
-rw-r--r--perl-install/install/share/po/cy.po429
-rw-r--r--perl-install/install/share/po/da.po446
-rw-r--r--perl-install/install/share/po/de.po443
-rw-r--r--perl-install/install/share/po/el.po436
-rw-r--r--perl-install/install/share/po/eo.po414
-rw-r--r--perl-install/install/share/po/es.po431
-rw-r--r--perl-install/install/share/po/et.po431
-rw-r--r--perl-install/install/share/po/eu.po444
-rw-r--r--perl-install/install/share/po/fa.po411
-rw-r--r--perl-install/install/share/po/fi.po433
-rw-r--r--perl-install/install/share/po/fr.po435
-rw-r--r--perl-install/install/share/po/fur.po403
-rw-r--r--perl-install/install/share/po/ga.po411
-rw-r--r--perl-install/install/share/po/gl.po437
-rw-r--r--perl-install/install/share/po/he.po429
-rw-r--r--perl-install/install/share/po/hi.po411
-rw-r--r--perl-install/install/share/po/hr.po411
-rw-r--r--perl-install/install/share/po/hu.po653
-rw-r--r--perl-install/install/share/po/id.po414
-rw-r--r--perl-install/install/share/po/is.po437
-rw-r--r--perl-install/install/share/po/it.po448
-rw-r--r--perl-install/install/share/po/ja.po422
-rw-r--r--perl-install/install/share/po/ko.po411
-rw-r--r--perl-install/install/share/po/ky.po666
-rw-r--r--perl-install/install/share/po/lt.po411
-rw-r--r--perl-install/install/share/po/ltg.po408
-rw-r--r--perl-install/install/share/po/lv.po411
-rw-r--r--perl-install/install/share/po/mk.po408
-rw-r--r--perl-install/install/share/po/mn.po411
-rw-r--r--perl-install/install/share/po/ms.po411
-rw-r--r--perl-install/install/share/po/mt.po411
-rw-r--r--perl-install/install/share/po/nb.po457
-rw-r--r--perl-install/install/share/po/nl.po439
-rw-r--r--perl-install/install/share/po/nn.po429
-rw-r--r--perl-install/install/share/po/pa_IN.po411
-rw-r--r--perl-install/install/share/po/pl.po446
-rw-r--r--perl-install/install/share/po/pt.po434
-rw-r--r--perl-install/install/share/po/pt_BR.po429
-rw-r--r--perl-install/install/share/po/ro.po437
-rw-r--r--perl-install/install/share/po/ru.po642
-rw-r--r--perl-install/install/share/po/sc.po403
-rw-r--r--perl-install/install/share/po/sk.po408
-rw-r--r--perl-install/install/share/po/sl.po429
-rw-r--r--perl-install/install/share/po/sq.po411
-rw-r--r--perl-install/install/share/po/sr.po408
-rw-r--r--perl-install/install/share/po/sr@Latn.po408
-rw-r--r--perl-install/install/share/po/sv.po429
-rw-r--r--perl-install/install/share/po/ta.po411
-rw-r--r--perl-install/install/share/po/tg.po411
-rw-r--r--perl-install/install/share/po/th.po411
-rw-r--r--perl-install/install/share/po/tl.po411
-rw-r--r--perl-install/install/share/po/tr.po429
-rw-r--r--perl-install/install/share/po/uk.po444
-rw-r--r--perl-install/install/share/po/uz.po408
-rw-r--r--perl-install/install/share/po/uz@cyrillic.po408
-rw-r--r--perl-install/install/share/po/vi.po408
-rw-r--r--perl-install/install/share/po/wa.po408
-rw-r--r--perl-install/install/share/po/zh_CN.po429
-rw-r--r--perl-install/install/share/po/zh_TW.po429
71 files changed, 13994 insertions, 16579 deletions
diff --git a/perl-install/install/share/po/DrakX.pot b/perl-install/install/share/po/DrakX.pot
index ecdb31565..8e1d73058 100644
--- a/perl-install/install/share/po/DrakX.pot
+++ b/perl-install/install/share/po/DrakX.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,31 +17,6 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr ""
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr ""
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr ""
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr ""
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr ""
-
#: any.pm:109
#, c-format
msgid "Do you have further supplementary media?"
@@ -77,92 +52,92 @@ msgstr ""
msgid "Network (NFS)"
msgstr ""
-#: any.pm:163
+#: any.pm:165
#, c-format
msgid "URL of the mirror?"
msgstr ""
-#: any.pm:169
+#: any.pm:171
#, c-format
msgid "URL must start with ftp:// or http://"
msgstr ""
-#: any.pm:180
+#: any.pm:182
#, c-format
msgid ""
"Contacting Mandriva Linux web site to get the list of available mirrors..."
msgstr ""
-#: any.pm:185
+#: any.pm:187
#, c-format
msgid ""
"Failed contacting Mandriva Linux web site to get the list of available "
"mirrors"
msgstr ""
-#: any.pm:195
+#: any.pm:197
#, c-format
msgid "Choose a mirror from which to get the packages"
msgstr ""
-#: any.pm:225
+#: any.pm:227
#, c-format
msgid "NFS setup"
msgstr ""
-#: any.pm:226
+#: any.pm:228
#, c-format
msgid "Please enter the hostname and directory of your NFS media"
msgstr ""
-#: any.pm:230
+#: any.pm:232
#, c-format
msgid "Hostname missing"
msgstr ""
-#: any.pm:231
+#: any.pm:233
#, c-format
msgid "Directory must begin with \"/\""
msgstr ""
-#: any.pm:235
+#: any.pm:237
#, c-format
msgid "Hostname of the NFS mount ?"
msgstr ""
-#: any.pm:236
+#: any.pm:238
#, c-format
msgid "Directory"
msgstr ""
-#: any.pm:258
+#: any.pm:260
#, c-format
msgid "Supplementary"
msgstr ""
-#: any.pm:293
+#: any.pm:295
#, c-format
msgid ""
"Can't find a package list file on this mirror. Make sure the location is "
"correct."
msgstr ""
-#: any.pm:328
+#: any.pm:334
#, c-format
msgid "Looking at packages already installed..."
msgstr ""
-#: any.pm:362
+#: any.pm:368
#, c-format
msgid "Finding packages to upgrade..."
msgstr ""
-#: any.pm:381
+#: any.pm:387
#, c-format
msgid "Removing packages prior to upgrade..."
msgstr ""
-#: any.pm:402
+#: any.pm:408
#, c-format
msgid ""
"You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -174,18 +149,18 @@ msgid ""
"please reboot your system and upgrade using the Mandriva update applet."
msgstr ""
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
#, c-format
msgid "Reboot"
msgstr ""
-#: any.pm:407
+#: any.pm:413
#, c-format
msgid "Proceed"
msgstr ""
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -194,72 +169,72 @@ msgid ""
"Do you really want to remove these packages?\n"
msgstr ""
-#: any.pm:815
+#: any.pm:821
#, c-format
msgid "Error reading file %s"
msgstr ""
-#: any.pm:1022
+#: any.pm:1028
#, c-format
msgid "The following disk(s) were renamed:"
msgstr ""
-#: any.pm:1024
+#: any.pm:1030
#, c-format
msgid "%s (previously named as %s)"
msgstr ""
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "HTTP"
msgstr ""
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "FTP"
msgstr ""
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "NFS"
msgstr ""
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
#, c-format
msgid "Network"
msgstr ""
-#: any.pm:1104
+#: any.pm:1110
#, c-format
msgid "Please choose a media"
msgstr ""
-#: any.pm:1120
+#: any.pm:1126
#, c-format
msgid "File already exists. Overwrite it?"
msgstr ""
-#: any.pm:1124
+#: any.pm:1130
#, c-format
msgid "Permission denied"
msgstr ""
-#: any.pm:1172
+#: any.pm:1178
#, c-format
msgid "Bad NFS name"
msgstr ""
-#: any.pm:1193
+#: any.pm:1199
#, c-format
msgid "Bad media %s"
msgstr ""
-#: any.pm:1236
+#: any.pm:1242
#, c-format
msgid "Can not make screenshots before partitioning"
msgstr ""
-#: any.pm:1244
+#: any.pm:1250
#, c-format
msgid "Screenshots will be available after install in %s"
msgstr ""
@@ -270,11 +245,15 @@ msgid "Installation"
msgstr ""
#: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
#, c-format
msgid "Configuration"
msgstr ""
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
#: install2.pm:168
#, c-format
msgid "You must also format %s"
@@ -297,22 +276,22 @@ msgstr ""
msgid "Bringing down the network"
msgstr ""
-#: media.pm:402
+#: media.pm:399
#, c-format
msgid "Please wait, retrieving file"
msgstr ""
-#: media.pm:734
+#: media.pm:718
#, c-format
-msgid "Downloading file %s..."
+msgid "unable to add medium"
msgstr ""
-#: media.pm:822
+#: media.pm:758
#, c-format
msgid "Copying some packages on disks for future use"
msgstr ""
-#: media.pm:875
+#: media.pm:811
#, c-format
msgid "Copying in progress"
msgstr ""
@@ -354,296 +333,278 @@ msgstr ""
msgid "An error occurred:"
msgstr ""
-#: pkgs.pm:776
+#: pkgs.pm:780
#, c-format
msgid "%d installation transactions failed"
msgstr ""
-#: pkgs.pm:777
+#: pkgs.pm:781
#, c-format
msgid "Installation of packages failed:"
msgstr ""
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
#, c-format
msgid "Workstation"
msgstr ""
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
#, c-format
msgid "Office Workstation"
msgstr ""
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
#, c-format
msgid ""
"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
msgstr ""
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
#, c-format
msgid ""
"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
"gnumeric), pdf viewers, etc"
msgstr ""
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
#, c-format
msgid "Game station"
msgstr ""
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
#, c-format
msgid "Amusement programs: arcade, boards, strategy, etc"
msgstr ""
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
#, c-format
msgid "Multimedia station"
msgstr ""
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
#, c-format
msgid "Sound and video playing/editing programs"
msgstr ""
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
#, c-format
msgid "Internet station"
msgstr ""
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
#, c-format
msgid ""
"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
"Web"
msgstr ""
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
#, c-format
msgid "Network Computer (client)"
msgstr ""
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
#, c-format
msgid "Clients for different protocols including ssh"
msgstr ""
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
#, c-format
msgid "Tools to ease the configuration of your computer"
msgstr ""
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
#, c-format
msgid "Console Tools"
msgstr ""
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
#, c-format
msgid "Editors, shells, file tools, terminals"
msgstr ""
#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
#, c-format
msgid "Development"
msgstr ""
#: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
#, c-format
msgid "C and C++ development libraries, programs and include files"
msgstr ""
#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
#, c-format
msgid "Documentation"
msgstr ""
#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
#, c-format
msgid "Books and Howto's on Linux and Free Software"
msgstr ""
#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
#, c-format
msgid "LSB"
msgstr ""
#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
#, c-format
msgid "Linux Standard Base. Third party applications support"
msgstr ""
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
#, c-format
msgid "Web Server"
msgstr ""
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
#, c-format
msgid "Apache"
msgstr ""
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
#, c-format
msgid "Groupware"
msgstr ""
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
#, c-format
msgid "Kolab Server"
msgstr ""
#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
#, c-format
msgid "Firewall/Router"
msgstr ""
#: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
#, c-format
msgid "Internet gateway"
msgstr ""
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
#, c-format
msgid "Mail/News"
msgstr ""
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
#, c-format
msgid "Postfix mail server, Inn news server"
msgstr ""
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
#, c-format
msgid "Directory Server"
msgstr ""
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
#, c-format
msgid "FTP Server"
msgstr ""
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
#, c-format
msgid "ProFTPd"
msgstr ""
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
#, c-format
msgid "DNS/NIS"
msgstr ""
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
#, c-format
msgid "Domain Name and Network Information Server"
msgstr ""
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
#, c-format
msgid "File and Printer Sharing Server"
msgstr ""
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
#, c-format
msgid "NFS Server, Samba server"
msgstr ""
#: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
#, c-format
msgid "Database"
msgstr ""
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
#, c-format
msgid "PostgreSQL and MySQL Database Server"
msgstr ""
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
#, c-format
msgid "Web/FTP"
msgstr ""
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
#, c-format
msgid "Apache, Pro-ftpd"
msgstr ""
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
#, c-format
msgid "Mail"
msgstr ""
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
#, c-format
msgid "Postfix mail server"
msgstr ""
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
#, c-format
msgid "PostgreSQL or MySQL database server"
msgstr ""
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
#, c-format
msgid "Network Computer server"
msgstr ""
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
#, c-format
msgid "NFS server, SMB server, Proxy server, ssh server"
msgstr ""
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
#, c-format
msgid "Graphical Environment"
msgstr ""
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
#, c-format
msgid "KDE Workstation"
msgstr ""
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
#, c-format
msgid ""
"The K Desktop Environment, the basic graphical environment with a collection "
"of accompanying tools"
msgstr ""
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
#, c-format
msgid "GNOME Workstation"
msgstr ""
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
#, c-format
msgid ""
"A graphical environment with user-friendly set of applications and desktop "
"tools"
msgstr ""
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
#, c-format
msgid "LXDE Desktop"
msgstr ""
@@ -655,54 +616,52 @@ msgid ""
"applications and desktop tools"
msgstr ""
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
#, c-format
msgid "Other Graphical Desktops"
msgstr ""
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
#, c-format
msgid "Window Maker, Enlightenment, Fvwm, etc"
msgstr ""
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
#, c-format
msgid "Utilities"
msgstr ""
#: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
#, c-format
msgid "SSH Server"
msgstr ""
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
#, c-format
msgid "Webmin"
msgstr ""
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
#, c-format
msgid "Webmin Remote Configuration Server"
msgstr ""
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
#, c-format
msgid "Network Utilities/Monitoring"
msgstr ""
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
#, c-format
msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
msgstr ""
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
#, c-format
msgid "Mandriva Wizards"
msgstr ""
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
#, c-format
msgid "Wizards to configure server"
msgstr ""
@@ -792,17 +751,17 @@ msgstr ""
msgid "Click on images in order to see a bigger preview"
msgstr ""
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
#, c-format
msgid "Package Group Selection"
msgstr ""
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
#, c-format
msgid "Individual package selection"
msgstr ""
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
#, c-format
msgid "Total size: %d / %d MB"
msgstr ""
@@ -919,12 +878,12 @@ msgstr ""
msgid "Software Management"
msgstr ""
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
#, c-format
msgid "Choose the packages you want to install"
msgstr ""
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
#, c-format
msgid "Installing"
msgstr ""
@@ -951,7 +910,7 @@ msgid_plural "%d packages"
msgstr[0] ""
msgstr[1] ""
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
#, c-format
msgid "Summary"
msgstr ""
@@ -961,7 +920,7 @@ msgstr ""
msgid "Configure"
msgstr ""
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
#, c-format
msgid "not configured"
msgstr ""
@@ -971,14 +930,14 @@ msgstr ""
msgid "Media Selection"
msgstr ""
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
#, c-format
msgid ""
"The following installation media have been found.\n"
"If you want to skip some of them, you can unselect them now."
msgstr ""
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
#, c-format
msgid ""
"You have the option to copy the contents of the CDs onto the hard drive "
@@ -987,7 +946,7 @@ msgid ""
"available once the system is fully installed."
msgstr ""
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
#, c-format
msgid "Copy whole CDs"
msgstr ""
@@ -1007,59 +966,49 @@ msgstr ""
msgid "Here is the full list of available keyboards:"
msgstr ""
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
#, c-format
msgid "Install/Upgrade"
msgstr ""
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
#, c-format
msgid "Is this an install or an upgrade?"
msgstr ""
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
#, c-format
msgid ""
"_: This is a noun:\n"
"Install"
msgstr ""
-#: steps_interactive.pm:147
-#, c-format
-msgid "Upgrade %s"
-msgstr ""
-
#: steps_interactive.pm:151
#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
+msgid "Upgrade %s"
msgstr ""
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
#, c-format
msgid "Encryption key for %s"
msgstr ""
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
#, c-format
msgid "Cancel installation, reboot system"
msgstr ""
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
#, c-format
msgid "New Installation"
msgstr ""
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
#, c-format
msgid "Upgrade previous installation (not recommended)"
msgstr ""
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
#, c-format
msgid ""
"Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1071,24 +1020,24 @@ msgid ""
"Installation\"."
msgstr ""
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "IDE"
msgstr ""
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "Configuring IDE"
msgstr ""
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
#, c-format
msgid ""
"No free space for 1MB bootstrap! Install will continue, but to boot your "
"system, you'll need to create the bootstrap partition in DiskDrake"
msgstr ""
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
#, c-format
msgid ""
"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1096,7 +1045,7 @@ msgid ""
"DiskDrake"
msgstr ""
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
#, c-format
msgid ""
"Change your Cd-Rom!\n"
@@ -1105,153 +1054,153 @@ msgid ""
"If you do not have it, press Cancel to avoid installation from this Cd-Rom."
msgstr ""
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
#, c-format
msgid "Looking for available packages..."
msgstr ""
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
#, c-format
msgid ""
"Your system does not have enough space left for installation or upgrade (%"
"dMB > %dMB)"
msgstr ""
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
#, c-format
msgid ""
"Please choose load or save package selection.\n"
"The format is the same as auto_install generated files."
msgstr ""
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Load"
msgstr ""
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Save"
msgstr ""
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
#, c-format
msgid "Bad file"
msgstr ""
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
#, c-format
msgid "KDE"
msgstr ""
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
#, c-format
msgid "GNOME"
msgstr ""
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
#, c-format
msgid "Desktop Selection"
msgstr ""
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
#, c-format
msgid "You can choose your workstation desktop profile."
msgstr ""
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
#, c-format
msgid "Selected size is larger than available space"
msgstr ""
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
#, c-format
msgid "Type of install"
msgstr ""
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
#, c-format
msgid ""
"You have not selected any group of packages.\n"
"Please choose the minimal installation you want:"
msgstr ""
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
#, c-format
msgid "With X"
msgstr ""
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
#, c-format
msgid "With basic documentation (recommended!)"
msgstr ""
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
#, c-format
msgid "Truly minimal install (especially no urpmi)"
msgstr ""
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
#, c-format
msgid "Preparing installation"
msgstr ""
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
#, c-format
msgid "Installing package %s"
msgstr ""
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "There was an error ordering packages:"
msgstr ""
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "Go on anyway?"
msgstr ""
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
#, c-format
msgid "Retry"
msgstr ""
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
#, c-format
msgid "Skip this package"
msgstr ""
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
#, c-format
msgid "Skip all packages from medium \"%s\""
msgstr ""
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
#, c-format
msgid "Go back to media and packages selection"
msgstr ""
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
#, c-format
msgid "There was an error installing package %s."
msgstr ""
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
#, c-format
msgid "Post-install configuration"
msgstr ""
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
#, c-format
msgid "Please ensure the Update Modules media is in drive %s"
msgstr ""
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
#, c-format
msgid "Updates"
msgstr ""
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
#, c-format
msgid ""
"You now have the opportunity to download updated packages. These packages\n"
@@ -1264,95 +1213,95 @@ msgid ""
"Do you want to install the updates?"
msgstr ""
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
#, c-format
msgid "%s on %s"
msgstr ""
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
#, c-format
msgid "Hardware"
msgstr ""
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
#, c-format
msgid "Sound card"
msgstr ""
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
#, c-format
msgid "Do you have an ISA sound card?"
msgstr ""
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
#, c-format
msgid ""
"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
"card"
msgstr ""
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
#, c-format
msgid "No sound card detected. Try \"harddrake\" after installation"
msgstr ""
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
#, c-format
msgid "Graphical interface"
msgstr ""
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
#, c-format
msgid "Network & Internet"
msgstr ""
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
#, c-format
msgid "Proxies"
msgstr ""
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
#, c-format
msgid "configured"
msgstr ""
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
#, c-format
msgid "Security Level"
msgstr ""
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
#, c-format
msgid "Firewall"
msgstr ""
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "activated"
msgstr ""
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "disabled"
msgstr ""
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
#, c-format
msgid "You have not configured X. Are you sure you really want this?"
msgstr ""
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
#, c-format
msgid "Preparing bootloader..."
msgstr ""
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
#, c-format
msgid "Be patient, this may take a while..."
msgstr ""
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
#, c-format
msgid ""
"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1361,24 +1310,24 @@ msgid ""
"root fs is: root=%s"
msgstr ""
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
#, c-format
msgid ""
"In this security level, access to the files in the Windows partition is "
"restricted to the administrator."
msgstr ""
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr ""
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
#, c-format
msgid "Creating auto install floppy..."
msgstr ""
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
#, c-format
msgid ""
"Some steps are not completed.\n"
@@ -1386,7 +1335,7 @@ msgid ""
"Do you really want to quit now?"
msgstr ""
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
#, c-format
msgid "Congratulations"
msgstr ""
diff --git a/perl-install/install/share/po/af.po b/perl-install/install/share/po/af.po
index 03031c889..c4ee7bc60 100644
--- a/perl-install/install/share/po/af.po
+++ b/perl-install/install/share/po/af.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: DrakX-af\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
"PO-Revision-Date: 2005-04-21 17:33+0200\n"
"Last-Translator: Dirk van der Walt <dirkvanderwalt@webmail.co.za>\n"
"Language-Team: Afrikaans\n"
@@ -21,31 +21,6 @@ msgstr ""
"X-Generator: KBabel 1.0.2\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr ""
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr ""
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr ""
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr ""
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr ""
-
#: any.pm:109
#, fuzzy, c-format
msgid "Do you have further supplementary media?"
@@ -81,92 +56,92 @@ msgstr "Netwerk %s"
msgid "Network (NFS)"
msgstr ""
-#: any.pm:163
+#: any.pm:165
#, c-format
msgid "URL of the mirror?"
msgstr ""
-#: any.pm:169
+#: any.pm:171
#, c-format
msgid "URL must start with ftp:// or http://"
msgstr ""
-#: any.pm:180
+#: any.pm:182
#, c-format
msgid ""
"Contacting Mandriva Linux web site to get the list of available mirrors..."
msgstr "Kontak Mandriva Linux se webwerf vir 'n lys van spieëlwebplekke...."
-#: any.pm:185
+#: any.pm:187
#, fuzzy, c-format
msgid ""
"Failed contacting Mandriva Linux web site to get the list of available "
"mirrors"
msgstr "Kontak Mandriva Linux se webwerf vir 'n lys van spieëlwebplekke...."
-#: any.pm:195
+#: any.pm:197
#, c-format
msgid "Choose a mirror from which to get the packages"
msgstr "Kies 'n spieël waar die pakkette verkry kan word"
-#: any.pm:225
+#: any.pm:227
#, c-format
msgid "NFS setup"
msgstr ""
-#: any.pm:226
+#: any.pm:228
#, c-format
msgid "Please enter the hostname and directory of your NFS media"
msgstr ""
-#: any.pm:230
+#: any.pm:232
#, c-format
msgid "Hostname missing"
msgstr ""
-#: any.pm:231
+#: any.pm:233
#, c-format
msgid "Directory must begin with \"/\""
msgstr ""
-#: any.pm:235
+#: any.pm:237
#, c-format
msgid "Hostname of the NFS mount ?"
msgstr ""
-#: any.pm:236
+#: any.pm:238
#, c-format
msgid "Directory"
msgstr "Gids"
-#: any.pm:258
+#: any.pm:260
#, c-format
msgid "Supplementary"
msgstr ""
-#: any.pm:293
+#: any.pm:295
#, fuzzy, c-format
msgid ""
"Can't find a package list file on this mirror. Make sure the location is "
"correct."
msgstr "Kan nie %s op %s vind nie"
-#: any.pm:328
+#: any.pm:334
#, c-format
msgid "Looking at packages already installed..."
msgstr "Ondersoek pakette wat reeds geïnstalleer is..."
-#: any.pm:362
+#: any.pm:368
#, c-format
msgid "Finding packages to upgrade..."
msgstr "Soek vir pakkette om op te gradeer..."
-#: any.pm:381
+#: any.pm:387
#, c-format
msgid "Removing packages prior to upgrade..."
msgstr ""
-#: any.pm:402
+#: any.pm:408
#, c-format
msgid ""
"You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -178,18 +153,18 @@ msgid ""
"please reboot your system and upgrade using the Mandriva update applet."
msgstr ""
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
#, c-format
msgid "Reboot"
msgstr "Herlaai"
-#: any.pm:407
+#: any.pm:413
#, c-format
msgid "Proceed"
msgstr ""
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -202,73 +177,73 @@ msgstr ""
"\n"
"Wil u werklik dat ons hulle verwyder?\n"
-#: any.pm:815
+#: any.pm:821
#, c-format
msgid "Error reading file %s"
msgstr "Fout met die lees van lêer %s"
#
-#: any.pm:1022
+#: any.pm:1028
#, fuzzy, c-format
msgid "The following disk(s) were renamed:"
msgstr "Die volgende pakkette geïnstalleer word:\n"
-#: any.pm:1024
+#: any.pm:1030
#, c-format
msgid "%s (previously named as %s)"
msgstr ""
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "HTTP"
msgstr ""
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "FTP"
msgstr "Ftp"
-#: any.pm:1081
+#: any.pm:1087
#, fuzzy, c-format
msgid "NFS"
msgstr "PFS"
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
#, c-format
msgid "Network"
msgstr "Netwerk"
-#: any.pm:1104
+#: any.pm:1110
#, fuzzy, c-format
msgid "Please choose a media"
msgstr "Kies asseblief"
-#: any.pm:1120
+#: any.pm:1126
#, fuzzy, c-format
msgid "File already exists. Overwrite it?"
msgstr "Lêer bestaan alreeds. Moet dit gebruik word?"
-#: any.pm:1124
+#: any.pm:1130
#, c-format
msgid "Permission denied"
msgstr "Toegang verbied"
-#: any.pm:1172
+#: any.pm:1178
#, c-format
msgid "Bad NFS name"
msgstr ""
-#: any.pm:1193
+#: any.pm:1199
#, c-format
msgid "Bad media %s"
msgstr ""
-#: any.pm:1236
+#: any.pm:1242
#, c-format
msgid "Can not make screenshots before partitioning"
msgstr "Kan nie skermfoto's neem voor partisie skep nie"
-#: any.pm:1244
+#: any.pm:1250
#, c-format
msgid "Screenshots will be available after install in %s"
msgstr "Skermfoto's sal na die installasie beskikbaar wees in %s"
@@ -279,11 +254,15 @@ msgid "Installation"
msgstr "Besig met installasie"
#: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
#, c-format
msgid "Configuration"
msgstr "Konfigurasie"
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
#: install2.pm:168
#, c-format
msgid "You must also format %s"
@@ -308,22 +287,22 @@ msgstr "Netwerk op pad op"
msgid "Bringing down the network"
msgstr "Netwerk op pad af"
-#: media.pm:402
+#: media.pm:399
#, c-format
msgid "Please wait, retrieving file"
msgstr ""
-#: media.pm:734
-#, fuzzy, c-format
-msgid "Downloading file %s..."
-msgstr "Stuur lêers..."
+#: media.pm:718
+#, c-format
+msgid "unable to add medium"
+msgstr ""
-#: media.pm:822
+#: media.pm:758
#, c-format
msgid "Copying some packages on disks for future use"
msgstr ""
-#: media.pm:875
+#: media.pm:811
#, fuzzy, c-format
msgid "Copying in progress"
msgstr "Bespeuring aan die gebeur"
@@ -365,27 +344,27 @@ msgstr ""
msgid "An error occurred:"
msgstr "'n Fout het voorgekom"
-#: pkgs.pm:776
+#: pkgs.pm:780
#, fuzzy, c-format
msgid "%d installation transactions failed"
msgstr "onsuksesvolle installasie"
-#: pkgs.pm:777
+#: pkgs.pm:781
#, fuzzy, c-format
msgid "Installation of packages failed:"
msgstr "Installeer pakket %s"
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
#, c-format
msgid "Workstation"
msgstr "Werkstasie"
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
#, c-format
msgid "Office Workstation"
msgstr "Kantoorwerkstasie"
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
#, c-format
msgid ""
"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -394,7 +373,7 @@ msgstr ""
"Kantoorprogramme: Woordverwerkers(OpenOffice.org Writer, Kword), spreistate "
"(OpenOffice.org Calc, Kspread), PDF-sigprogramme, ens."
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
#, c-format
msgid ""
"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -403,32 +382,32 @@ msgstr ""
"Kantoorprogramme: Woordverwerkers( kword, abiword), spreistate (kspread, "
"gnumeric), PDF-sigprogramme, ens."
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
#, c-format
msgid "Game station"
msgstr "Speletjiesrekenaar"
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
#, c-format
msgid "Amusement programs: arcade, boards, strategy, etc"
msgstr "Vermaak: Arkade, Bordspel, Strategie ens."
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
#, c-format
msgid "Multimedia station"
msgstr "Multimediastasie"
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
#, c-format
msgid "Sound and video playing/editing programs"
msgstr "Klank- en videospelers/redigeerders"
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
#, c-format
msgid "Internet station"
msgstr "Internetstasie"
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
#, c-format
msgid ""
"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -437,27 +416,27 @@ msgstr ""
"Stel hulpprogramme om e-pos en netnuus te lees en te stuur (mutt, tin) en om "
"ook die web deur te blaai."
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
#, c-format
msgid "Network Computer (client)"
msgstr "Netwerkrekenaar (kliënt)"
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
#, c-format
msgid "Clients for different protocols including ssh"
msgstr "Kliëntprogramme vir 'n verkeidenheid protokolle insluitend SSH"
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
#, c-format
msgid "Tools to ease the configuration of your computer"
msgstr "Nutsprogramme wat u rekenaarkonfigurasie vergemaklik"
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
#, c-format
msgid "Console Tools"
msgstr "Konsole Hulpprogramme"
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
#, c-format
msgid "Editors, shells, file tools, terminals"
msgstr ""
@@ -465,185 +444,167 @@ msgstr ""
"programme"
#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
#, c-format
msgid "Development"
msgstr "Ontwikkeling"
#: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
#, c-format
msgid "C and C++ development libraries, programs and include files"
msgstr "C en C++ ontwikkelingsprogrammateke, programme en insluitlêers"
#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
#, c-format
msgid "Documentation"
msgstr "Dokumentasie"
#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
#, c-format
msgid "Books and Howto's on Linux and Free Software"
msgstr "Boeke en HOWTO's oor Linux en Vrye Sagteware"
#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
#, c-format
msgid "LSB"
msgstr "LSB"
#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
#, c-format
msgid "Linux Standard Base. Third party applications support"
msgstr "Linux Standard Base. Derdeparty ondersteuning van programme"
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
#, c-format
msgid "Web Server"
msgstr "Web-bediener"
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
#, c-format
msgid "Apache"
msgstr "Apache"
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
#, fuzzy, c-format
msgid "Groupware"
msgstr "Groep:"
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
#, c-format
msgid "Kolab Server"
msgstr "Kolab-bediener"
#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
#, c-format
msgid "Firewall/Router"
msgstr "Vuurmuur/Netwerkroteerder"
#: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
#, c-format
msgid "Internet gateway"
msgstr "Internetpoort"
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
#, fuzzy, c-format
msgid "Mail/News"
msgstr "/Lêer/_Nuut"
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
#, fuzzy, c-format
msgid "Postfix mail server, Inn news server"
msgstr "Postfix e-pos-bediener"
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
#, fuzzy, c-format
msgid "Directory Server"
msgstr "Herstel vanaf CD"
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
#, c-format
msgid "FTP Server"
msgstr "FTP-bediener"
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
#, c-format
msgid "ProFTPd"
msgstr ""
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
#, c-format
msgid "DNS/NIS"
msgstr "DNS/NIS"
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
#, c-format
msgid "Domain Name and Network Information Server"
msgstr "Domeinnaam en Netwerk-informasie-bediener (DNS/NIS)"
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
#, fuzzy, c-format
msgid "File and Printer Sharing Server"
msgstr "Drukkerbediener"
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
#, fuzzy, c-format
msgid "NFS Server, Samba server"
msgstr "Samba-bediener"
#: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
#, c-format
msgid "Database"
msgstr "Databasis"
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
#, fuzzy, c-format
msgid "PostgreSQL and MySQL Database Server"
msgstr "PostgreSQL of MySQL databasisbediener"
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
#, c-format
msgid "Web/FTP"
msgstr "Web/FTP"
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
#, c-format
msgid "Apache, Pro-ftpd"
msgstr "Apache, Pro-ftpd"
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
#, c-format
msgid "Mail"
msgstr "e-Pos"
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
#, c-format
msgid "Postfix mail server"
msgstr "Postfix e-pos-bediener"
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
#, c-format
msgid "PostgreSQL or MySQL database server"
msgstr "PostgreSQL of MySQL databasisbediener"
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
#, c-format
msgid "Network Computer server"
msgstr "Netwerkrekenaar-bediener"
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
#, c-format
msgid "NFS server, SMB server, Proxy server, ssh server"
msgstr "NFS, SMB, Instaan- , SSH (Bedieners)"
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
#, c-format
msgid "Graphical Environment"
msgstr "Grafiese Omgewing"
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
#, c-format
msgid "KDE Workstation"
msgstr "KDE Werkstasie"
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
#, c-format
msgid ""
"The K Desktop Environment, the basic graphical environment with a collection "
@@ -652,12 +613,12 @@ msgstr ""
"Die K-werkskermomgewing (KDE), die basiese grafiese omgewing met 'n "
"versameling bygaande hulpprogramme"
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
#, c-format
msgid "GNOME Workstation"
msgstr "GNOME-werkstasie"
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
#, c-format
msgid ""
"A graphical environment with user-friendly set of applications and desktop "
@@ -666,7 +627,7 @@ msgstr ""
"'n Grafiese omgewing met gebruikersvriendelike stel applikasies en "
"werkskerm-hulpprogramme"
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
#, fuzzy, c-format
msgid "LXDE Desktop"
msgstr "'n Werkstasie"
@@ -680,54 +641,52 @@ msgstr ""
"'n Grafiese omgewing met gebruikersvriendelike stel applikasies en "
"werkskerm-hulpprogramme"
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
#, c-format
msgid "Other Graphical Desktops"
msgstr "Ander Grafiese Werkskerms"
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
#, fuzzy, c-format
msgid "Window Maker, Enlightenment, Fvwm, etc"
msgstr "Icewm, Window Maker, Enlightenment, Fvwm, ens."
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
#, c-format
msgid "Utilities"
msgstr "Nutsprogramme"
#: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
#, c-format
msgid "SSH Server"
msgstr "SSH-bediener"
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
#, fuzzy, c-format
msgid "Webmin"
msgstr "Webkamera"
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
#, fuzzy, c-format
msgid "Webmin Remote Configuration Server"
msgstr "Terminal Server Konfigurasie"
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
#, fuzzy, c-format
msgid "Network Utilities/Monitoring"
msgstr "Monitor van Netwerk"
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
#, c-format
msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
msgstr ""
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
#, fuzzy, c-format
msgid "Mandriva Wizards"
msgstr "<b>Mandriva Store</b>"
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
#, fuzzy, c-format
msgid "Wizards to configure server"
msgstr "Probleme met die konfigurasie van drukker \" %s\"!"
@@ -829,17 +788,17 @@ msgstr ""
msgid "Click on images in order to see a bigger preview"
msgstr ""
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
#, c-format
msgid "Package Group Selection"
msgstr "Kies Pakketgroepe"
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
#, c-format
msgid "Individual package selection"
msgstr "Individuele pakket-seleksie"
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
#, c-format
msgid "Total size: %d / %d MB"
msgstr "Totale grootte: %d / %d MB"
@@ -958,12 +917,12 @@ msgstr "Minimale installasie"
msgid "Software Management"
msgstr "Sagteware Beheer"
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
#, c-format
msgid "Choose the packages you want to install"
msgstr "Kies die pakkette wat u wil installeer"
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
#, c-format
msgid "Installing"
msgstr "Besig met installasie"
@@ -990,7 +949,7 @@ msgid_plural "%d packages"
msgstr[0] "%d pakket"
msgstr[1] "%d pakkette"
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
#, c-format
msgid "Summary"
msgstr "Opsomming"
@@ -1000,7 +959,7 @@ msgstr "Opsomming"
msgid "Configure"
msgstr "Konfigureer"
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
#, c-format
msgid "not configured"
msgstr "nie gekonfigureer nie"
@@ -1010,14 +969,14 @@ msgstr "nie gekonfigureer nie"
msgid "Media Selection"
msgstr "Kies Pakketgroepe"
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
#, c-format
msgid ""
"The following installation media have been found.\n"
"If you want to skip some of them, you can unselect them now."
msgstr ""
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
#, c-format
msgid ""
"You have the option to copy the contents of the CDs onto the hard drive "
@@ -1026,7 +985,7 @@ msgid ""
"available once the system is fully installed."
msgstr ""
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
#, c-format
msgid "Copy whole CDs"
msgstr ""
@@ -1046,59 +1005,49 @@ msgstr "Kies asseblief u sleutelborduitleg"
msgid "Here is the full list of available keyboards:"
msgstr "Hier is die volle lys van beskikbare lande"
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
#, c-format
msgid "Install/Upgrade"
msgstr "Installeer/Opgradeer"
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
#, c-format
msgid "Is this an install or an upgrade?"
msgstr "Is hierdie 'n installasie of opgradering?"
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
#, fuzzy, c-format
msgid ""
"_: This is a noun:\n"
"Install"
msgstr "Installasie"
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
#, c-format
msgid "Upgrade %s"
msgstr "Opgradeer %s"
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
#, c-format
msgid "Encryption key for %s"
msgstr "Enkripsie-sleutel vir %s"
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
#, c-format
msgid "Cancel installation, reboot system"
msgstr ""
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
#, fuzzy, c-format
msgid "New Installation"
msgstr "Besig met installasie"
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
#, c-format
msgid "Upgrade previous installation (not recommended)"
msgstr ""
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
#, c-format
msgid ""
"Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1110,17 +1059,17 @@ msgid ""
"Installation\"."
msgstr ""
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "IDE"
msgstr "IDE"
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "Configuring IDE"
msgstr "IDE word opgestel"
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
#, c-format
msgid ""
"No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1130,7 +1079,7 @@ msgstr ""
"sal herlaaipartisie met DiskDrake moet skep indien u die stelsel wil "
"herlaai."
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
#, fuzzy, c-format
msgid ""
"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1141,7 +1090,7 @@ msgstr ""
"sal herlaaipartisie met DiskDrake moet skep indien u die stelsel wil "
"herlaai."
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
#, c-format
msgid ""
"Change your Cd-Rom!\n"
@@ -1155,19 +1104,19 @@ msgstr ""
"nie\n"
"hieroor beskik nie, druk Kanselleer om installasies vanaf dié CDROM te vermy."
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
#, c-format
msgid "Looking for available packages..."
msgstr "Soek vir beskikbare pakkette"
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
#, c-format
msgid ""
"Your system does not have enough space left for installation or upgrade (%"
"dMB > %dMB)"
msgstr ""
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
#, fuzzy, c-format
msgid ""
"Please choose load or save package selection.\n"
@@ -1176,52 +1125,52 @@ msgstr ""
"Kies asb. die laai of stoor pakketkeuse op die floppie.\n"
"Die formaat is dieselfde as outoinstallasie-genereerde floppies."
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Load"
msgstr "Las"
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Save"
msgstr "Stoor"
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
#, fuzzy, c-format
msgid "Bad file"
msgstr "Laai lêer"
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
#, fuzzy, c-format
msgid "KDE"
msgstr "IDE"
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
#, c-format
msgid "GNOME"
msgstr "GNOME"
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
#, fuzzy, c-format
msgid "Desktop Selection"
msgstr "Kies Pakketgroepe"
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
#, c-format
msgid "You can choose your workstation desktop profile."
msgstr ""
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
#, c-format
msgid "Selected size is larger than available space"
msgstr "Geselekteerde grootte is groter as beskikbare spasie."
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
#, c-format
msgid "Type of install"
msgstr "Tipe installasie"
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
#, c-format
msgid ""
"You have not selected any group of packages.\n"
@@ -1230,82 +1179,82 @@ msgstr ""
"U het glad nie 'n groep pakkette gekies nie.\n"
"Kies asseblief die tipe minimale installasie:"
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
#, c-format
msgid "With X"
msgstr "Met X"
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
#, c-format
msgid "With basic documentation (recommended!)"
msgstr "Met basiese dokumentasie (word aanbeveel!)"
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
#, c-format
msgid "Truly minimal install (especially no urpmi)"
msgstr "Absolute minimale installasie (geen urpmi!)"
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
#, c-format
msgid "Preparing installation"
msgstr "Berei installasie voor"
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
#, c-format
msgid "Installing package %s"
msgstr "Installeer pakket %s"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "There was an error ordering packages:"
msgstr "Daar was 'n fout met pakkette:"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "Go on anyway?"
msgstr "Gaan steeds voort?"
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
#, c-format
msgid "Retry"
msgstr ""
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
#, c-format
msgid "Skip this package"
msgstr ""
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
#, c-format
msgid "Skip all packages from medium \"%s\""
msgstr ""
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
#, fuzzy, c-format
msgid "Go back to media and packages selection"
msgstr "Stoor pakketseleksie"
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
#, fuzzy, c-format
msgid "There was an error installing package %s."
msgstr "Daar was 'n fout met die installasie van die pakkette:"
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
#, c-format
msgid "Post-install configuration"
msgstr "Post-installasiekonfigurasie"
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
#, c-format
msgid "Please ensure the Update Modules media is in drive %s"
msgstr ""
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
#, c-format
msgid "Updates"
msgstr ""
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
#, c-format
msgid ""
"You now have the opportunity to download updated packages. These packages\n"
@@ -1325,96 +1274,96 @@ msgstr ""
"\n"
"Wil u dit nou installeer?"
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
#, c-format
msgid "%s on %s"
msgstr "%s op %s"
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
#, c-format
msgid "Hardware"
msgstr "Hardeware"
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
#, c-format
msgid "Sound card"
msgstr "Klankkaart"
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
#, c-format
msgid "Do you have an ISA sound card?"
msgstr "Beskik u oor 'n ISA klankkaart?"
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
#, fuzzy, c-format
msgid ""
"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
"card"
msgstr "Loop \"sndconfig\" na die installasie om u klankkaart te konfigureer"
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
#, c-format
msgid "No sound card detected. Try \"harddrake\" after installation"
msgstr ""
"Geen klankkaart opgespoor nie. Probeer \"harddrake\" na die installasie"
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
#, c-format
msgid "Graphical interface"
msgstr "Grafiese-koppelvlak"
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
#, c-format
msgid "Network & Internet"
msgstr "Netwerk & Internet"
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
#, c-format
msgid "Proxies"
msgstr "Instaan bedieners"
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
#, c-format
msgid "configured"
msgstr "gekonfigureer"
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
#, c-format
msgid "Security Level"
msgstr "Sekuriteitsvlak"
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
#, c-format
msgid "Firewall"
msgstr "Vuurmuur"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "activated"
msgstr "ge-aktiveer"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "disabled"
msgstr "ge-deaktiveer"
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
#, c-format
msgid "You have not configured X. Are you sure you really want this?"
msgstr "U het nog nie 'X' opgestel nie. Verlang u dit regtig?"
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
#, c-format
msgid "Preparing bootloader..."
msgstr "Herlaaistelsel word voorberei..."
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
#, c-format
msgid "Be patient, this may take a while..."
msgstr ""
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
#, fuzzy, c-format
msgid ""
"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1427,7 +1376,7 @@ msgstr ""
"Ons sal voortgaan met die installasie, maar u sal\n"
"BootX of 'n ander manier moet gedruik om u rekenaar te selflaai"
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
#, c-format
msgid ""
"In this security level, access to the files in the Windows partition is "
@@ -1436,17 +1385,17 @@ msgstr ""
"Met hierdie sekuriteitsvlak word toegang na lêers op die Windows partisie "
"vernou na slegs die administrateur"
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr "Sit 'n leë floppie in aandrywer %s"
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
#, c-format
msgid "Creating auto install floppy..."
msgstr "Outoinstallasieskyf word geskep."
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
#, c-format
msgid ""
"Some steps are not completed.\n"
@@ -1457,7 +1406,7 @@ msgstr ""
"\n"
"Wil u werklik nou eindig?"
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
#, c-format
msgid "Congratulations"
msgstr "Geluk"
@@ -1601,6 +1550,10 @@ msgid ""
"Exit"
msgstr "Verlaat"
+#, fuzzy
+#~ msgid "Downloading file %s..."
+#~ msgstr "Stuur lêers..."
+
#~ msgid ""
#~ "You have selected the following server(s): %s\n"
#~ "\n"
diff --git a/perl-install/install/share/po/am.po b/perl-install/install/share/po/am.po
index 0eb672a81..1931181b0 100644
--- a/perl-install/install/share/po/am.po
+++ b/perl-install/install/share/po/am.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: DrakX\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
"PO-Revision-Date: 2004-06-01 03:36+0100\n"
"Last-Translator: Alemayehu <alemayehu@gmx.at>\n"
"Language-Team: Amharic <am-translate@geez.org>\n"
@@ -14,31 +14,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr ""
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr ""
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr ""
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr ""
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr ""
-
#: any.pm:109
#, fuzzy, c-format
msgid "Do you have further supplementary media?"
@@ -74,92 +49,92 @@ msgstr "መረብ"
msgid "Network (NFS)"
msgstr ""
-#: any.pm:163
+#: any.pm:165
#, c-format
msgid "URL of the mirror?"
msgstr ""
-#: any.pm:169
+#: any.pm:171
#, c-format
msgid "URL must start with ftp:// or http://"
msgstr ""
-#: any.pm:180
+#: any.pm:182
#, c-format
msgid ""
"Contacting Mandriva Linux web site to get the list of available mirrors..."
msgstr ""
-#: any.pm:185
+#: any.pm:187
#, c-format
msgid ""
"Failed contacting Mandriva Linux web site to get the list of available "
"mirrors"
msgstr ""
-#: any.pm:195
+#: any.pm:197
#, c-format
msgid "Choose a mirror from which to get the packages"
msgstr ""
-#: any.pm:225
+#: any.pm:227
#, c-format
msgid "NFS setup"
msgstr ""
-#: any.pm:226
+#: any.pm:228
#, c-format
msgid "Please enter the hostname and directory of your NFS media"
msgstr ""
-#: any.pm:230
+#: any.pm:232
#, c-format
msgid "Hostname missing"
msgstr ""
-#: any.pm:231
+#: any.pm:233
#, c-format
msgid "Directory must begin with \"/\""
msgstr ""
-#: any.pm:235
+#: any.pm:237
#, c-format
msgid "Hostname of the NFS mount ?"
msgstr ""
-#: any.pm:236
+#: any.pm:238
#, c-format
msgid "Directory"
msgstr "ዶሴ"
-#: any.pm:258
+#: any.pm:260
#, c-format
msgid "Supplementary"
msgstr ""
-#: any.pm:293
+#: any.pm:295
#, fuzzy, c-format
msgid ""
"Can't find a package list file on this mirror. Make sure the location is "
"correct."
msgstr "መረጃ በ%s መጠቀሚያ ፕሮግራም ላይ"
-#: any.pm:328
+#: any.pm:334
#, c-format
msgid "Looking at packages already installed..."
msgstr ""
-#: any.pm:362
+#: any.pm:368
#, c-format
msgid "Finding packages to upgrade..."
msgstr ""
-#: any.pm:381
+#: any.pm:387
#, c-format
msgid "Removing packages prior to upgrade..."
msgstr ""
-#: any.pm:402
+#: any.pm:408
#, c-format
msgid ""
"You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -171,18 +146,18 @@ msgid ""
"please reboot your system and upgrade using the Mandriva update applet."
msgstr ""
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
#, c-format
msgid "Reboot"
msgstr "እንደገና ጀምር"
-#: any.pm:407
+#: any.pm:413
#, c-format
msgid "Proceed"
msgstr ""
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -191,72 +166,72 @@ msgid ""
"Do you really want to remove these packages?\n"
msgstr ""
-#: any.pm:815
+#: any.pm:821
#, c-format
msgid "Error reading file %s"
msgstr "%sን በማንበብ ላይ ስህተት ተፈጥሯል"
-#: any.pm:1022
+#: any.pm:1028
#, fuzzy, c-format
msgid "The following disk(s) were renamed:"
msgstr "የሚከተሉት ጥቅሎች ሊወገዱ ነው"
-#: any.pm:1024
+#: any.pm:1030
#, c-format
msgid "%s (previously named as %s)"
msgstr ""
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "HTTP"
msgstr "HTTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "FTP"
msgstr "FTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "NFS"
msgstr "NFS"
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
#, c-format
msgid "Network"
msgstr "መረብ"
-#: any.pm:1104
+#: any.pm:1110
#, fuzzy, c-format
msgid "Please choose a media"
msgstr "እባክዎ ያለ ሰነድን ይምረጡ"
-#: any.pm:1120
+#: any.pm:1126
#, fuzzy, c-format
msgid "File already exists. Overwrite it?"
msgstr "ፋይሉ በፊትም ነበር። ልጠቀምበት?"
-#: any.pm:1124
+#: any.pm:1130
#, c-format
msgid "Permission denied"
msgstr "ፈቃድ አልተሰጠም"
-#: any.pm:1172
+#: any.pm:1178
#, c-format
msgid "Bad NFS name"
msgstr ""
-#: any.pm:1193
+#: any.pm:1199
#, fuzzy, c-format
msgid "Bad media %s"
msgstr "ፋይል ተጭኗል %s"
-#: any.pm:1236
+#: any.pm:1242
#, c-format
msgid "Can not make screenshots before partitioning"
msgstr ""
-#: any.pm:1244
+#: any.pm:1250
#, c-format
msgid "Screenshots will be available after install in %s"
msgstr ""
@@ -267,11 +242,15 @@ msgid "Installation"
msgstr "በመትከል ላይ"
#: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
#, c-format
msgid "Configuration"
msgstr "ስየማ"
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
#: install2.pm:168
#, c-format
msgid "You must also format %s"
@@ -294,22 +273,22 @@ msgstr "መረቡን በማቀራረብ ላይ"
msgid "Bringing down the network"
msgstr "መረቡን በማለያየት ላይ"
-#: media.pm:402
+#: media.pm:399
#, c-format
msgid "Please wait, retrieving file"
msgstr ""
-#: media.pm:734
-#, fuzzy, c-format
-msgid "Downloading file %s..."
-msgstr "የቅርብ ጊዜ ፋይሎች"
+#: media.pm:718
+#, c-format
+msgid "unable to add medium"
+msgstr ""
-#: media.pm:822
+#: media.pm:758
#, c-format
msgid "Copying some packages on disks for future use"
msgstr ""
-#: media.pm:875
+#: media.pm:811
#, fuzzy, c-format
msgid "Copying in progress"
msgstr "የተሻሻለ ዊድጌት ፍጠር"
@@ -351,296 +330,278 @@ msgstr ""
msgid "An error occurred:"
msgstr "ስህተት ተፈጥሯል"
-#: pkgs.pm:776
+#: pkgs.pm:780
#, fuzzy, c-format
msgid "%d installation transactions failed"
msgstr "%s አልተገኘም"
-#: pkgs.pm:777
+#: pkgs.pm:781
#, fuzzy, c-format
msgid "Installation of packages failed:"
msgstr "የ%s ጥቅል በመትከል ላይ"
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
#, fuzzy, c-format
msgid "Workstation"
msgstr "የቅርብ መረብ ምርጫ"
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
#, c-format
msgid "Office Workstation"
msgstr ""
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
#, c-format
msgid ""
"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
msgstr ""
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
#, c-format
msgid ""
"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
"gnumeric), pdf viewers, etc"
msgstr ""
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
#, c-format
msgid "Game station"
msgstr ""
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
#, c-format
msgid "Amusement programs: arcade, boards, strategy, etc"
msgstr ""
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
#, fuzzy, c-format
msgid "Multimedia station"
msgstr "የመገናኛ ብዙሃን"
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
#, c-format
msgid "Sound and video playing/editing programs"
msgstr ""
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
#, fuzzy, c-format
msgid "Internet station"
msgstr "ፈጣን መልእክት"
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
#, c-format
msgid ""
"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
"Web"
msgstr ""
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
#, fuzzy, c-format
msgid "Network Computer (client)"
msgstr "ኮምፒውተር ሳይንስ"
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
#, c-format
msgid "Clients for different protocols including ssh"
msgstr ""
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
#, c-format
msgid "Tools to ease the configuration of your computer"
msgstr ""
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
#, fuzzy, c-format
msgid "Console Tools"
msgstr "የፋይል መሳሪያዎች"
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
#, c-format
msgid "Editors, shells, file tools, terminals"
msgstr ""
#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
#, c-format
msgid "Development"
msgstr "እድገት"
#: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
#, c-format
msgid "C and C++ development libraries, programs and include files"
msgstr ""
#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
#, c-format
msgid "Documentation"
msgstr "ማስረጃ"
#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
#, c-format
msgid "Books and Howto's on Linux and Free Software"
msgstr ""
#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
#, c-format
msgid "LSB"
msgstr ""
#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
#, c-format
msgid "Linux Standard Base. Third party applications support"
msgstr ""
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
#, c-format
msgid "Web Server"
msgstr "የመረብ ሰርቨር"
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
#, fuzzy, c-format
msgid "Apache"
msgstr "መተላለፊያ"
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
#, fuzzy, c-format
msgid "Groupware"
msgstr "የውይይት መድረክ"
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
#, fuzzy, c-format
msgid "Kolab Server"
msgstr "የሳምባ ተጠሪ"
#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
#, c-format
msgid "Firewall/Router"
msgstr ""
#: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
#, c-format
msgid "Internet gateway"
msgstr ""
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
#, fuzzy, c-format
msgid "Mail/News"
msgstr "አዲስ ፋይል።"
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
#, fuzzy, c-format
msgid "Postfix mail server, Inn news server"
msgstr "የመልዕክት ተጠሪ ሚስጢራዊ ቃል ያስፈልጋል"
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
#, fuzzy, c-format
msgid "Directory Server"
msgstr "በዝርዝር ውስጥ ዶሴ ጨምር"
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
#, c-format
msgid "FTP Server"
msgstr "የFTP ተጠሪ"
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
#, c-format
msgid "ProFTPd"
msgstr ""
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
#, c-format
msgid "DNS/NIS"
msgstr "DNS/NIS"
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
#, fuzzy, c-format
msgid "Domain Name and Network Information Server"
msgstr "የዘርፍ ስም ሰርቨር"
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
#, fuzzy, c-format
msgid "File and Printer Sharing Server"
msgstr "የማተሚያ ሰርቨር"
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
#, fuzzy, c-format
msgid "NFS Server, Samba server"
msgstr "የሳምባ ሰርቨር"
#: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
#, c-format
msgid "Database"
msgstr "ዳታቤዝ"
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
#, c-format
msgid "PostgreSQL and MySQL Database Server"
msgstr ""
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
#, c-format
msgid "Web/FTP"
msgstr ""
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
#, c-format
msgid "Apache, Pro-ftpd"
msgstr ""
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
#, c-format
msgid "Mail"
msgstr "ፖስታ"
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
#, c-format
msgid "Postfix mail server"
msgstr ""
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
#, c-format
msgid "PostgreSQL or MySQL database server"
msgstr ""
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
#, fuzzy, c-format
msgid "Network Computer server"
msgstr "ኮምፒውተር ሳይንስ"
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
#, c-format
msgid "NFS server, SMB server, Proxy server, ssh server"
msgstr ""
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
#, c-format
msgid "Graphical Environment"
msgstr ""
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
#, c-format
msgid "KDE Workstation"
msgstr ""
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
#, c-format
msgid ""
"The K Desktop Environment, the basic graphical environment with a collection "
"of accompanying tools"
msgstr ""
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
#, c-format
msgid "GNOME Workstation"
msgstr ""
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
#, c-format
msgid ""
"A graphical environment with user-friendly set of applications and desktop "
"tools"
msgstr ""
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
#, fuzzy, c-format
msgid "LXDE Desktop"
msgstr "ሰሌዳ"
@@ -652,54 +613,52 @@ msgid ""
"applications and desktop tools"
msgstr ""
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
#, c-format
msgid "Other Graphical Desktops"
msgstr ""
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
#, c-format
msgid "Window Maker, Enlightenment, Fvwm, etc"
msgstr ""
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
#, fuzzy, c-format
msgid "Utilities"
msgstr "ፊሊፒንስ"
#: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
#, fuzzy, c-format
msgid "SSH Server"
msgstr "ስለተጠሪ መረጃ"
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
#, fuzzy, c-format
msgid "Webmin"
msgstr "ዌብ-ካም"
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
#, fuzzy, c-format
msgid "Webmin Remote Configuration Server"
msgstr "ቀዳሚ ተጠሪ ይጠቀም"
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
#, fuzzy, c-format
msgid "Network Utilities/Monitoring"
msgstr "Name=መረብ"
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
#, c-format
msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
msgstr ""
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
#, fuzzy, c-format
msgid "Mandriva Wizards"
msgstr "<b>የMandriva Linux ባለሞያ</b>"
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
#, fuzzy, c-format
msgid "Wizards to configure server"
msgstr "የባሕር-መዝገብ እሴት '%s' ወደ '%s' እንደገና መሰየም አልተቻለም።"
@@ -789,17 +748,17 @@ msgstr ""
msgid "Click on images in order to see a bigger preview"
msgstr ""
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
#, c-format
msgid "Package Group Selection"
msgstr "የጥቅል ቡድን ምርጫ"
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
#, c-format
msgid "Individual package selection"
msgstr "የነጠላ ጥቅል ምርጫ"
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
#, c-format
msgid "Total size: %d / %d MB"
msgstr "አጠቃላይ መጠን: %d / %d MB"
@@ -916,12 +875,12 @@ msgstr "አነስተኛ ተከላ"
msgid "Software Management"
msgstr ""
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
#, c-format
msgid "Choose the packages you want to install"
msgstr "ለመትከል የሚፈልጉትን ጥቅል ይምረጡ"
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
#, c-format
msgid "Installing"
msgstr "በመትከል ላይ"
@@ -948,7 +907,7 @@ msgid_plural "%d packages"
msgstr[0] "%d ጥቅሎች"
msgstr[1] "%d ጥቅሎች"
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
#, c-format
msgid "Summary"
msgstr "ማጠቃለያ"
@@ -958,7 +917,7 @@ msgstr "ማጠቃለያ"
msgid "Configure"
msgstr "ለውጥ"
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
#, c-format
msgid "not configured"
msgstr "አልተስተካከለም"
@@ -968,14 +927,14 @@ msgstr "አልተስተካከለም"
msgid "Media Selection"
msgstr "የጥቅል ቡድን ምርጫ"
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
#, c-format
msgid ""
"The following installation media have been found.\n"
"If you want to skip some of them, you can unselect them now."
msgstr ""
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
#, c-format
msgid ""
"You have the option to copy the contents of the CDs onto the hard drive "
@@ -984,7 +943,7 @@ msgid ""
"available once the system is fully installed."
msgstr ""
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
#, c-format
msgid "Copy whole CDs"
msgstr ""
@@ -1004,59 +963,49 @@ msgstr ""
msgid "Here is the full list of available keyboards:"
msgstr ""
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
#, c-format
msgid "Install/Upgrade"
msgstr "ትከል/አሳድግ"
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
#, c-format
msgid "Is this an install or an upgrade?"
msgstr ""
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
#, fuzzy, c-format
msgid ""
"_: This is a noun:\n"
"Install"
msgstr "ትከል"
-#: steps_interactive.pm:147
-#, c-format
-msgid "Upgrade %s"
-msgstr ""
-
#: steps_interactive.pm:151
#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
+msgid "Upgrade %s"
msgstr ""
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
#, c-format
msgid "Encryption key for %s"
msgstr "የ%s ሚስጢራዊ መገልበጫ ቁልፍ"
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
#, c-format
msgid "Cancel installation, reboot system"
msgstr ""
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
#, fuzzy, c-format
msgid "New Installation"
msgstr "በመትከል ላይ"
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
#, c-format
msgid "Upgrade previous installation (not recommended)"
msgstr ""
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
#, c-format
msgid ""
"Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1068,24 +1017,24 @@ msgid ""
"Installation\"."
msgstr ""
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "IDE"
msgstr "IDE"
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "Configuring IDE"
msgstr "IDEን በማስተካከል ላይ"
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
#, c-format
msgid ""
"No free space for 1MB bootstrap! Install will continue, but to boot your "
"system, you'll need to create the bootstrap partition in DiskDrake"
msgstr ""
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
#, c-format
msgid ""
"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1093,7 +1042,7 @@ msgid ""
"DiskDrake"
msgstr ""
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
#, c-format
msgid ""
"Change your Cd-Rom!\n"
@@ -1102,153 +1051,153 @@ msgid ""
"If you do not have it, press Cancel to avoid installation from this Cd-Rom."
msgstr ""
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
#, c-format
msgid "Looking for available packages..."
msgstr ""
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
#, c-format
msgid ""
"Your system does not have enough space left for installation or upgrade (%"
"dMB > %dMB)"
msgstr ""
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
#, c-format
msgid ""
"Please choose load or save package selection.\n"
"The format is the same as auto_install generated files."
msgstr ""
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Load"
msgstr "ጫን"
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Save"
msgstr "አስቀምጥ"
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
#, fuzzy, c-format
msgid "Bad file"
msgstr "1 ፋይል"
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
#, fuzzy, c-format
msgid "KDE"
msgstr "IDE"
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
#, c-format
msgid "GNOME"
msgstr "ኖም"
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
#, fuzzy, c-format
msgid "Desktop Selection"
msgstr "የጥቅል ቡድን ምርጫ"
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
#, c-format
msgid "You can choose your workstation desktop profile."
msgstr ""
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
#, c-format
msgid "Selected size is larger than available space"
msgstr ""
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
#, c-format
msgid "Type of install"
msgstr "የተከላው አይነት"
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
#, c-format
msgid ""
"You have not selected any group of packages.\n"
"Please choose the minimal installation you want:"
msgstr ""
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
#, c-format
msgid "With X"
msgstr "በX"
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
#, c-format
msgid "With basic documentation (recommended!)"
msgstr ""
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
#, c-format
msgid "Truly minimal install (especially no urpmi)"
msgstr ""
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
#, c-format
msgid "Preparing installation"
msgstr "ተከላ በማዘጋጀት ላይ"
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
#, c-format
msgid "Installing package %s"
msgstr "የ%s ጥቅል በመትከል ላይ"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "There was an error ordering packages:"
msgstr ""
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "Go on anyway?"
msgstr "ለማንኛውም ቀጥል?"
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
#, c-format
msgid "Retry"
msgstr ""
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
#, c-format
msgid "Skip this package"
msgstr ""
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
#, c-format
msgid "Skip all packages from medium \"%s\""
msgstr ""
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
#, fuzzy, c-format
msgid "Go back to media and packages selection"
msgstr "የጥቅሎችን ምርጫ አስቀምጥ"
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
#, fuzzy, c-format
msgid "There was an error installing package %s."
msgstr "የ%s ጥቅል በመትከል ላይ"
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
#, c-format
msgid "Post-install configuration"
msgstr "Post-install configuration"
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
#, c-format
msgid "Please ensure the Update Modules media is in drive %s"
msgstr ""
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
#, c-format
msgid "Updates"
msgstr "አሻሻዎች"
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
#, c-format
msgid ""
"You now have the opportunity to download updated packages. These packages\n"
@@ -1261,95 +1210,95 @@ msgid ""
"Do you want to install the updates?"
msgstr ""
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
#, c-format
msgid "%s on %s"
msgstr "%s %s ላይ ነው"
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
#, c-format
msgid "Hardware"
msgstr "ሀርድዌር"
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
#, c-format
msgid "Sound card"
msgstr "የድምፅ ካርድ"
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
#, c-format
msgid "Do you have an ISA sound card?"
msgstr "የISA ድምጽ ካርድ አለዎት?"
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
#, c-format
msgid ""
"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
"card"
msgstr ""
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
#, c-format
msgid "No sound card detected. Try \"harddrake\" after installation"
msgstr ""
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
#, c-format
msgid "Graphical interface"
msgstr "ንድፋዊ እይታ"
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
#, c-format
msgid "Network & Internet"
msgstr "መረብ እና ኢንተርኔት"
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
#, c-format
msgid "Proxies"
msgstr "ወኪሎች"
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
#, c-format
msgid "configured"
msgstr "ተስተካክሏል"
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
#, c-format
msgid "Security Level"
msgstr "የደህንነት ደረጃ"
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
#, c-format
msgid "Firewall"
msgstr "የእሳት ግድግዳ"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "activated"
msgstr "መስራት ጀምሯል"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "disabled"
msgstr "መስራት አቁሟል"
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
#, c-format
msgid "You have not configured X. Are you sure you really want this?"
msgstr ""
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
#, c-format
msgid "Preparing bootloader..."
msgstr "አስጀማሪ በማዘጋጀት ላይ..."
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
#, c-format
msgid "Be patient, this may take a while..."
msgstr ""
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
#, c-format
msgid ""
"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1358,24 +1307,24 @@ msgid ""
"root fs is: root=%s"
msgstr ""
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
#, c-format
msgid ""
"In this security level, access to the files in the Windows partition is "
"restricted to the administrator."
msgstr ""
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr ""
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
#, c-format
msgid "Creating auto install floppy..."
msgstr ""
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
#, c-format
msgid ""
"Some steps are not completed.\n"
@@ -1383,7 +1332,7 @@ msgid ""
"Do you really want to quit now?"
msgstr ""
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
#, c-format
msgid "Congratulations"
msgstr "እንኳን ደስ ያለዎ!"
@@ -1528,6 +1477,10 @@ msgid ""
msgstr "ውጣ"
#, fuzzy
+#~ msgid "Downloading file %s..."
+#~ msgstr "የቅርብ ጊዜ ፋይሎች"
+
+#, fuzzy
#~ msgid "IceWm Desktop"
#~ msgstr "ሰሌዳ"
diff --git a/perl-install/install/share/po/ar.po b/perl-install/install/share/po/ar.po
index 4a6a4feef..495b2630d 100644
--- a/perl-install/install/share/po/ar.po
+++ b/perl-install/install/share/po/ar.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: DrakX\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
"PO-Revision-Date: 2009-03-25 19:22+0400\n"
"Last-Translator: Yaser Ammar <linux.uae@gawab.com>\n"
"Language-Team: Arabic <doc@arabeyes.org>\n"
@@ -22,31 +22,6 @@ msgstr ""
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr "سطح مكتبك على وحدة USB"
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr "توزيعة لينكس ماندريفا مفتوحة المصدر 100%%"
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr "اكتشف لينكس بسهولة مع ماندريفا ون"
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr "سطح مكتب لينكس ماندريفا كامل مع الدعم"
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr "ماندريفا: توزيعات تلبي احتياجات الجميع"
-
#: any.pm:109
#, c-format
msgid "Do you have further supplementary media?"
@@ -86,93 +61,93 @@ msgstr "الشبكة (FTP)"
msgid "Network (NFS)"
msgstr "الشبكة (NFS)"
-#: any.pm:163
+#: any.pm:165
#, c-format
msgid "URL of the mirror?"
msgstr "مسار المرآة؟"
-#: any.pm:169
+#: any.pm:171
#, c-format
msgid "URL must start with ftp:// or http://"
msgstr "يجب أن يبدأ المسار بـ http:// أو بـ ftp://"
-#: any.pm:180
+#: any.pm:182
#, c-format
msgid ""
"Contacting Mandriva Linux web site to get the list of available mirrors..."
msgstr ""
"يجري الاتصال بموقع لينكس ماندريفا للحصول على قائمة بالمرايا المتوفرة..."
-#: any.pm:185
+#: any.pm:187
#, c-format
msgid ""
"Failed contacting Mandriva Linux web site to get the list of available "
"mirrors"
msgstr "فشل الاتصال بموقع لينكس ماندريفا للحصول على قائمة بالمرايا المتوفرة"
-#: any.pm:195
+#: any.pm:197
#, c-format
msgid "Choose a mirror from which to get the packages"
msgstr "اختر مرآة لتحصيل الحزم"
-#: any.pm:225
+#: any.pm:227
#, c-format
msgid "NFS setup"
msgstr "تثبيت NFS"
-#: any.pm:226
+#: any.pm:228
#, c-format
msgid "Please enter the hostname and directory of your NFS media"
msgstr "فضلا أدخل اسم المضيف والدليل لوسائط NFS"
-#: any.pm:230
+#: any.pm:232
#, c-format
msgid "Hostname missing"
msgstr "اسم المضيف غير موجود"
-#: any.pm:231
+#: any.pm:233
#, c-format
msgid "Directory must begin with \"/\""
msgstr "يجب أن يبدأ الدليل بـ \"/\""
-#: any.pm:235
+#: any.pm:237
#, c-format
msgid "Hostname of the NFS mount ?"
msgstr "اسم مضيف نقطة وصل NFS ؟"
-#: any.pm:236
+#: any.pm:238
#, c-format
msgid "Directory"
msgstr "الدليل"
-#: any.pm:258
+#: any.pm:260
#, c-format
msgid "Supplementary"
msgstr "إضافي"
-#: any.pm:293
+#: any.pm:295
#, c-format
msgid ""
"Can't find a package list file on this mirror. Make sure the location is "
"correct."
msgstr "لم يمكن العثور على ملف لائحة الحزم على هذه المرآة. تأكد من صحة الموقع."
-#: any.pm:328
+#: any.pm:334
#, c-format
msgid "Looking at packages already installed..."
msgstr "التعرف على الحزم المثبتة مسبقاً..."
-#: any.pm:362
+#: any.pm:368
#, c-format
msgid "Finding packages to upgrade..."
msgstr "البحث عن حزم لترقيتها..."
-#: any.pm:381
+#: any.pm:387
#, c-format
msgid "Removing packages prior to upgrade..."
msgstr "إزالة الحزم قبيل ترقيتها"
-#: any.pm:402
+#: any.pm:408
#, c-format
msgid ""
"You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -189,18 +164,18 @@ msgstr ""
" إن أردت الترقية مع إبقاء كِدي 3.5 والاحتفاظ بإعداداتك الشخصية\n"
" فقم بإعادة الحاسوب والترقية باستخدام بريمج تحديث ماندريفا."
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
#, c-format
msgid "Reboot"
msgstr "إعادة الحاسوب"
-#: any.pm:407
+#: any.pm:413
#, c-format
msgid "Proceed"
msgstr ""
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -213,72 +188,72 @@ msgstr ""
"\n"
"هل تريد حذف هذه الحزم فعلاً؟\n"
-#: any.pm:815
+#: any.pm:821
#, c-format
msgid "Error reading file %s"
msgstr "خطأ في قراءة الملف %s"
-#: any.pm:1022
+#: any.pm:1028
#, c-format
msgid "The following disk(s) were renamed:"
msgstr "لقد غُيّرت أسماء الأقراص التّالية:"
-#: any.pm:1024
+#: any.pm:1030
#, c-format
msgid "%s (previously named as %s)"
msgstr "%s (المسمّى %s سابقاً)"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "HTTP"
msgstr "HTTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "FTP"
msgstr "FTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "NFS"
msgstr "NFS"
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
#, c-format
msgid "Network"
msgstr "الشبكة"
-#: any.pm:1104
+#: any.pm:1110
#, c-format
msgid "Please choose a media"
msgstr "فضلا.. اختر أحد الوسائط"
-#: any.pm:1120
+#: any.pm:1126
#, c-format
msgid "File already exists. Overwrite it?"
msgstr "الملف موجود مسبقاً. هل تريد الكتابة عليه؟"
-#: any.pm:1124
+#: any.pm:1130
#, c-format
msgid "Permission denied"
msgstr "الإذن مرفوض"
-#: any.pm:1172
+#: any.pm:1178
#, c-format
msgid "Bad NFS name"
msgstr "اسم NFS غير صالح"
-#: any.pm:1193
+#: any.pm:1199
#, c-format
msgid "Bad media %s"
msgstr "الوسيط %s سيء"
-#: any.pm:1236
+#: any.pm:1242
#, c-format
msgid "Can not make screenshots before partitioning"
msgstr "لا يمكن عمل لقطات للشاشة قبل التجزئة"
-#: any.pm:1244
+#: any.pm:1250
#, c-format
msgid "Screenshots will be available after install in %s"
msgstr "ستكون لقطات الشاشة موجودة بعد التثبيت في %s"
@@ -289,11 +264,15 @@ msgid "Installation"
msgstr "التثبيت"
#: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
#, c-format
msgid "Configuration"
msgstr "الضبط"
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
#: install2.pm:168
#, c-format
msgid "You must also format %s"
@@ -318,22 +297,22 @@ msgstr "يجري تشغيل الشبكة"
msgid "Bringing down the network"
msgstr "يجري إغلاق الشبكة"
-#: media.pm:402
+#: media.pm:399
#, c-format
msgid "Please wait, retrieving file"
msgstr "انتظر رجاءً، يجري جلب الملف"
-#: media.pm:734
+#: media.pm:718
#, c-format
-msgid "Downloading file %s..."
-msgstr "يجري تنزيل الملف %s ..."
+msgid "unable to add medium"
+msgstr ""
-#: media.pm:822
+#: media.pm:758
#, c-format
msgid "Copying some packages on disks for future use"
msgstr "نسخ بعض الحزم إلى الأقراص لاستخدامها مستقبلاً"
-#: media.pm:875
+#: media.pm:811
#, c-format
msgid "Copying in progress"
msgstr "يجري النسخ"
@@ -377,27 +356,27 @@ msgstr ""
msgid "An error occurred:"
msgstr "حدث خطأ"
-#: pkgs.pm:776
+#: pkgs.pm:780
#, c-format
msgid "%d installation transactions failed"
msgstr ""
-#: pkgs.pm:777
+#: pkgs.pm:781
#, fuzzy, c-format
msgid "Installation of packages failed:"
msgstr "تثبيت الحزمة %s"
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
#, c-format
msgid "Workstation"
msgstr "محطة عمل"
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
#, c-format
msgid "Office Workstation"
msgstr "محطّة عمل مكتبية"
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
#, c-format
msgid ""
"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -406,7 +385,7 @@ msgstr ""
"برامج مكتبية: معالجات كلمات (OpenOffice.org Writer، Kword)، جداول ممتدة "
"(OpenOffice.org Calc، Kspread)، برامج عرض pdf، إلخ"
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
#, c-format
msgid ""
"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -415,32 +394,32 @@ msgstr ""
"برامج مكتبية: معالجات كلمات (kword، abiword)، جداول ممتدة (kspread، gnumeric)"
"، برامج عرض pdf، إلخ"
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
#, c-format
msgid "Game station"
msgstr "محطّة ألعاب"
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
#, c-format
msgid "Amusement programs: arcade, boards, strategy, etc"
msgstr "برامج تسلية: ألعاب فيديو، ألعاب لوحات، ألعاب استراتيجية، إلخ"
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
#, c-format
msgid "Multimedia station"
msgstr "محطة وسائط متعدّدة"
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
#, c-format
msgid "Sound and video playing/editing programs"
msgstr "برامج تحرير/تشغيل فيديو وصوتيات"
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
#, c-format
msgid "Internet station"
msgstr "محطّة إنترنت"
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
#, c-format
msgid ""
"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -448,211 +427,193 @@ msgid ""
msgstr ""
"مجموعة أدوات لقراءة وإرسال البريد والأخبار (mutt، tin..) ولتصفح الإنترنت"
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
#, c-format
msgid "Network Computer (client)"
msgstr "جهاز شبكة (عميل)"
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
#, c-format
msgid "Clients for different protocols including ssh"
msgstr "عملاء لبروتوكولات مختلفة بما فيها ssh"
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
#, c-format
msgid "Tools to ease the configuration of your computer"
msgstr "أدوات لتسهيل ضبط حاسوبك"
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
#, c-format
msgid "Console Tools"
msgstr "أدوات الطرفيّات"
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
#, c-format
msgid "Editors, shells, file tools, terminals"
msgstr "محررات نصوص، صَدَفات، أدوات ملفات، طرفيات"
#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
#, c-format
msgid "Development"
msgstr "تطوير"
#: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
#, c-format
msgid "C and C++ development libraries, programs and include files"
msgstr "برامج ومكتبات تطوير C و C++ وملفات مضمنة"
#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
#, c-format
msgid "Documentation"
msgstr "توثيق"
#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
#, c-format
msgid "Books and Howto's on Linux and Free Software"
msgstr "كتب ودلائل إرشادية حول لينكس والبرامج الحرة"
#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
#, c-format
msgid "LSB"
msgstr "LSB"
#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
#, c-format
msgid "Linux Standard Base. Third party applications support"
msgstr "القاعدة القياسيّة للينكس (LSB). دعم تطبيقات الطرف الثالث"
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
#, c-format
msgid "Web Server"
msgstr "خادم وب"
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
#, c-format
msgid "Apache"
msgstr "Apache"
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
#, c-format
msgid "Groupware"
msgstr "برامج مجموعات"
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
#, c-format
msgid "Kolab Server"
msgstr "خادم Kolab"
#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
#, c-format
msgid "Firewall/Router"
msgstr "جدار ناري/موجِّه"
#: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
#, c-format
msgid "Internet gateway"
msgstr "بوابة إنترنت"
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
#, c-format
msgid "Mail/News"
msgstr "بريد/أخبار"
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
#, c-format
msgid "Postfix mail server, Inn news server"
msgstr "خادم بريد Postfix، خادم أخبار Inn"
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
#, c-format
msgid "Directory Server"
msgstr "خادم مجلّدات"
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
#, c-format
msgid "FTP Server"
msgstr "خادم FTP"
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
#, c-format
msgid "ProFTPd"
msgstr "ProFTPd"
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
#, c-format
msgid "DNS/NIS"
msgstr "DNS/NIS"
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
#, c-format
msgid "Domain Name and Network Information Server"
msgstr "خادم أسماء نطاقات ومعلومات شبكة"
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
#, c-format
msgid "File and Printer Sharing Server"
msgstr "خادم مشاركة ملفّات وطابعات"
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
#, c-format
msgid "NFS Server, Samba server"
msgstr "خادم NFS، خادم Samba"
#: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
#, c-format
msgid "Database"
msgstr "قواعد بيانات"
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
#, c-format
msgid "PostgreSQL and MySQL Database Server"
msgstr "خادم قواعد بيانات PostgreSQL و MySQL"
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
#, c-format
msgid "Web/FTP"
msgstr "وب/FTP"
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
#, c-format
msgid "Apache, Pro-ftpd"
msgstr "Apache، Pro-ftpd"
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
#, c-format
msgid "Mail"
msgstr "البريد"
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
#, c-format
msgid "Postfix mail server"
msgstr "خادم بريد Postfix"
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
#, c-format
msgid "PostgreSQL or MySQL database server"
msgstr "خادم قواعد بيانات PostgreSQL أو MySQL"
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
#, c-format
msgid "Network Computer server"
msgstr "خادم شبكات"
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
#, c-format
msgid "NFS server, SMB server, Proxy server, ssh server"
msgstr "خادم NFS، خادم SMB، خادم وسيط، خادم ssh"
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
#, c-format
msgid "Graphical Environment"
msgstr "بيئات رسومية"
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
#, c-format
msgid "KDE Workstation"
msgstr "محطّة عمل كِدي"
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
#, c-format
msgid ""
"The K Desktop Environment, the basic graphical environment with a collection "
@@ -660,12 +621,12 @@ msgid ""
msgstr ""
"بيئة سطح مكتب كِدي؛ البيئة الرسومية الأساسية مع مجموعة من الأدوات المصاحبة"
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
#, c-format
msgid "GNOME Workstation"
msgstr "محطّة عمل جنوم"
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
#, c-format
msgid ""
"A graphical environment with user-friendly set of applications and desktop "
@@ -674,7 +635,7 @@ msgstr ""
"بيئة رسومية مع مجموعة من التطبيقات وأدوات سطح المكتب المناسبة للمستخدمين "
"العاديين"
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
#, fuzzy, c-format
msgid "LXDE Desktop"
msgstr "سطح مكتب كِدي"
@@ -688,54 +649,52 @@ msgstr ""
"بيئة رسومية مع مجموعة من التطبيقات وأدوات سطح المكتب المناسبة للمستخدمين "
"العاديين"
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
#, c-format
msgid "Other Graphical Desktops"
msgstr "أسطح مكتب رسومية أخرى"
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
#, c-format
msgid "Window Maker, Enlightenment, Fvwm, etc"
msgstr "Icewm، Window Maker، Enlightenment، Fvwm، إلخ"
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
#, c-format
msgid "Utilities"
msgstr "وسائل"
#: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
#, c-format
msgid "SSH Server"
msgstr "خادم SSH"
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
#, c-format
msgid "Webmin"
msgstr "Webmin"
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
#, c-format
msgid "Webmin Remote Configuration Server"
msgstr "خادم الضبط البعيد Webmin"
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
#, c-format
msgid "Network Utilities/Monitoring"
msgstr "وسائل الشبكة/المراقبة"
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
#, c-format
msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
msgstr "أدوات مراقبة، محاسبة عمليّات، tcpdump، nmap، ..."
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
#, c-format
msgid "Mandriva Wizards"
msgstr "مرشدو ماندريفا"
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
#, c-format
msgid "Wizards to configure server"
msgstr "مرشدو ضبط الخادم"
@@ -833,17 +792,17 @@ msgstr "هذه معاينة لشكل سطح مكتب %s"
msgid "Click on images in order to see a bigger preview"
msgstr "اضغط على الصور لكي تراها كبيرة"
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
#, c-format
msgid "Package Group Selection"
msgstr "انتقاء مجموعات الحزم"
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
#, c-format
msgid "Individual package selection"
msgstr "انتقاء مفرد للحزم"
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
#, c-format
msgid "Total size: %d / %d MB"
msgstr "الحجم الإجمالي: %d / %d م.ب"
@@ -960,12 +919,12 @@ msgstr "تثبيت مصغّر"
msgid "Software Management"
msgstr "إدارة البرامج"
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
#, c-format
msgid "Choose the packages you want to install"
msgstr "اختر الحزم التي تريد تثبيتها"
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
#, c-format
msgid "Installing"
msgstr "التثبيت"
@@ -996,7 +955,7 @@ msgstr[3] "%d حزم"
msgstr[4] "%d حزمة"
msgstr[5] "%d حزمة"
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
#, c-format
msgid "Summary"
msgstr "ملخص"
@@ -1006,7 +965,7 @@ msgstr "ملخص"
msgid "Configure"
msgstr "اضبط"
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
#, c-format
msgid "not configured"
msgstr "غير مضبوط"
@@ -1016,7 +975,7 @@ msgstr "غير مضبوط"
msgid "Media Selection"
msgstr "انتقاء الوسائط"
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
#, c-format
msgid ""
"The following installation media have been found.\n"
@@ -1025,7 +984,7 @@ msgstr ""
"عُثر على وسائط التثبيت التالية.\n"
"إن كنت تريد تخطي بعضها، فيمكنك إلغاء انتقائها الآن."
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
#, c-format
msgid ""
"You have the option to copy the contents of the CDs onto the hard drive "
@@ -1036,7 +995,7 @@ msgstr ""
"لديك الخيار بنسخ محتويات الأقراص المدمجة إلى قرصك الصلب قبل التثبيت.\n"
"حيئذ، سيكمل التثبيت من القرص الصلب وستبقى الحزم متوفرة حتى يثبت النظام كاملاً."
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
#, c-format
msgid "Copy whole CDs"
msgstr "نسخ الأقراص كاملة"
@@ -1056,59 +1015,49 @@ msgstr "اختر تخطيط لوحة مفاتيحك رجاء"
msgid "Here is the full list of available keyboards:"
msgstr "هذه القائمة الكاملة لكلّ لوحات المفاتيح المتاحة:"
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
#, c-format
msgid "Install/Upgrade"
msgstr "تثبيت/ترقية"
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
#, c-format
msgid "Is this an install or an upgrade?"
msgstr "هل هذا تثبيت أم ترقية؟"
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
#, c-format
msgid ""
"_: This is a noun:\n"
"Install"
msgstr "تثبيت"
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
#, c-format
msgid "Upgrade %s"
msgstr "ترقية %s"
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr "الترقية من توزيعة 32 بت إلى 64 بت غير مدعومة"
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr "الترقية من توزيعة 64 بت إلى 32 بت غير مدعومة"
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
#, c-format
msgid "Encryption key for %s"
msgstr "مفتاح التعمية لـ %s"
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
#, c-format
msgid "Cancel installation, reboot system"
msgstr "إلغاء التثبيت، وإعادة النظام"
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
#, c-format
msgid "New Installation"
msgstr "تثبيت جديد"
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
#, c-format
msgid "Upgrade previous installation (not recommended)"
msgstr "ترقية تثبيت سابق (غير مستحسن)"
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
#, c-format
msgid ""
"Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1126,17 +1075,17 @@ msgstr ""
" \n"
" تحذير: ينبغي أن تنسخ جميع بياناتك الشخصية احتياطًا قبل اختيار\"تثبيت جديد\""
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "IDE"
msgstr "IDE"
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "Configuring IDE"
msgstr "ضبط IDE"
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
#, c-format
msgid ""
"No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1145,7 +1094,7 @@ msgstr ""
"ليس هناك مساحة حرّة لواحد ميجابات من نظام الإقلاع! سوف يستمرّ التّثبيت، لكن "
"لإقلاع نظامك، سوف تحتاج لإنشاء قسم لنظام الإقلاع في DiskDrake"
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
#, c-format
msgid ""
"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1155,7 +1104,7 @@ msgstr ""
"تحتاج إلى إنشاء نظام إقلاع PPC PReP Boot! ستكمل عملية التثبيت، ولكن لإقلاع "
"نظامك، أنت بحاجة إلى إنشاء لنظام الإقلاع من خلال DiskDrake"
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
#, c-format
msgid ""
"Change your Cd-Rom!\n"
@@ -1167,19 +1116,19 @@ msgstr ""
"من فضلك أدخل القرص المسّمى \"%s\" في الّسواقة واضغط على موافق عندما تنتهي.\n"
"إن لم يكن القرص لديك، اضغط على إلغاء لتجّنب التثبيت من هذا القرص."
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
#, c-format
msgid "Looking for available packages..."
msgstr "البحث عن الحزم المتاحة..."
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
#, c-format
msgid ""
"Your system does not have enough space left for installation or upgrade (%"
"dMB > %dMB)"
msgstr "لا توجد مساحة كافية في نظامك للتثبيت أو الترقية (%d > %dMB)"
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
#, c-format
msgid ""
"Please choose load or save package selection.\n"
@@ -1188,52 +1137,52 @@ msgstr ""
"اختر حفظ أو تحميل انتقائك للحزم رجاء.\n"
"النسق مشابه لملفات التثبيت الآلي المولّدة."
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Load"
msgstr "حمِّل"
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Save"
msgstr "احفظ"
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
#, c-format
msgid "Bad file"
msgstr "ملف فاسد"
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
#, c-format
msgid "KDE"
msgstr "كِدي"
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
#, c-format
msgid "GNOME"
msgstr "جنوم"
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
#, c-format
msgid "Desktop Selection"
msgstr "انتقاء سطح المكتب"
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
#, c-format
msgid "You can choose your workstation desktop profile."
msgstr "بإمكانك اختيار لاحة سطح محطة العمل هذه"
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
#, c-format
msgid "Selected size is larger than available space"
msgstr "الحجم المختار أكبر من المساحة المتاحة"
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
#, c-format
msgid "Type of install"
msgstr "نوع التثبيت"
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
#, c-format
msgid ""
"You have not selected any group of packages.\n"
@@ -1242,82 +1191,82 @@ msgstr ""
"لم تختر أي مجموعة من الحزم.\n"
"رجاء اختر حد التثبيت الأدنى الذي تريده:"
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
#, c-format
msgid "With X"
msgstr "مع X"
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
#, c-format
msgid "With basic documentation (recommended!)"
msgstr "مع وثائق المساعدة الأساسية (مفضّل)"
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
#, c-format
msgid "Truly minimal install (especially no urpmi)"
msgstr "حد التثبيت الأدنى الحقيقي (دون urpmi خصوصًا)"
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
#, c-format
msgid "Preparing installation"
msgstr "التثبيت يُحضَّر"
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
#, c-format
msgid "Installing package %s"
msgstr "تثبيت الحزمة %s"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "There was an error ordering packages:"
msgstr "كان هناك خطأ في ترتيب الحزم:"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "Go on anyway?"
msgstr "هل تريد المتابعة على أية حال؟"
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
#, c-format
msgid "Retry"
msgstr "أعد المحاولة"
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
#, c-format
msgid "Skip this package"
msgstr "تخطّ هذه الحزمة"
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
#, c-format
msgid "Skip all packages from medium \"%s\""
msgstr "تخطّ جميع الحزم من الوسيط \"%s\""
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
#, c-format
msgid "Go back to media and packages selection"
msgstr "ارجع إلى الوسائط وانتقاء الحزم"
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
#, c-format
msgid "There was an error installing package %s."
msgstr "كان هناك خطأ في تثبيت الحزمة %s"
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
#, c-format
msgid "Post-install configuration"
msgstr "ضبط ما بعد التثبيت"
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
#, c-format
msgid "Please ensure the Update Modules media is in drive %s"
msgstr "تأكد رجاء من وجود وسائط وحدات التحديث في محرك الأقراص %s"
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
#, c-format
msgid "Updates"
msgstr "التحديثات"
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
#, c-format
msgid ""
"You now have the opportunity to download updated packages. These packages\n"
@@ -1338,95 +1287,95 @@ msgstr ""
"\n"
"هل تريد تثبيت هذه التحديثات؟"
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
#, c-format
msgid "%s on %s"
msgstr "%s على %s"
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
#, c-format
msgid "Hardware"
msgstr "العتاد"
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
#, c-format
msgid "Sound card"
msgstr "بطاقة الصوت"
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
#, c-format
msgid "Do you have an ISA sound card?"
msgstr "هل لديك بطاقة صوت ISA؟"
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
#, c-format
msgid ""
"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
"card"
msgstr "شغّل \"alsaconf\" أو \"sndconfig\" بعد التّثبيت لضبط بطاقة الصّوت"
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
#, c-format
msgid "No sound card detected. Try \"harddrake\" after installation"
msgstr "لم يُعثر على بطاقة صوت. حاول تشغيل \"harddrake\" بعد التثبيت"
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
#, c-format
msgid "Graphical interface"
msgstr "الواجهة الرسومية"
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
#, c-format
msgid "Network & Internet"
msgstr "الشبكة والإنترنت"
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
#, c-format
msgid "Proxies"
msgstr "الخوادم الوسيطة"
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
#, c-format
msgid "configured"
msgstr "مضبوط"
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
#, c-format
msgid "Security Level"
msgstr "مستوى الأمن"
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
#, c-format
msgid "Firewall"
msgstr "جدار ناري"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "activated"
msgstr "مُنشّط"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "disabled"
msgstr "مُعطّل"
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
#, c-format
msgid "You have not configured X. Are you sure you really want this?"
msgstr "لم تقم بضبط خادم س (X). هل أنت متأكد أنك تريد ذلك؟"
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
#, c-format
msgid "Preparing bootloader..."
msgstr "محمّل الإقلاع يُحضَّر..."
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
#, c-format
msgid "Be patient, this may take a while..."
msgstr ""
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
#, c-format
msgid ""
"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1438,7 +1387,7 @@ msgstr ""
"نظامك. ستكمل عملية التثبيت، ولكنك بحاجة إلى استخدام BootX أو طريقة ما أخرى "
"لإقلاع نظامك. مُعطى النواة لنظام الملفات الجذر هو: root=%s"
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
#, c-format
msgid ""
"In this security level, access to the files in the Windows partition is "
@@ -1447,17 +1396,17 @@ msgstr ""
"في هذا المستوى الأمني، الوصول إلى الملفّات في قسم وندوز سيكون مقصوراً على "
"المدير."
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr "أدخل قرصًا مرنًا فارغًا في محرك الأقراص %s"
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
#, c-format
msgid "Creating auto install floppy..."
msgstr "إنشاء قرص مرن للتثبيت الآلي..."
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
#, c-format
msgid ""
"Some steps are not completed.\n"
@@ -1468,7 +1417,7 @@ msgstr ""
"\n"
"هل تريد الخروج الآن حقاً؟"
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
#, c-format
msgid "Congratulations"
msgstr "تهانينا"
@@ -1612,6 +1561,30 @@ msgid ""
"Exit"
msgstr "اخرج"
+#~ msgid "Your desktop on a USB key"
+#~ msgstr "سطح مكتبك على وحدة USB"
+
+#~ msgid "The 100%% open source Mandriva Linux distribution"
+#~ msgstr "توزيعة لينكس ماندريفا مفتوحة المصدر 100%%"
+
+#~ msgid "Explore Linux easily with Mandriva One"
+#~ msgstr "اكتشف لينكس بسهولة مع ماندريفا ون"
+
+#~ msgid "A full Mandriva Linux desktop, with support"
+#~ msgstr "سطح مكتب لينكس ماندريفا كامل مع الدعم"
+
+#~ msgid "Mandriva: distributions for everybody's needs"
+#~ msgstr "ماندريفا: توزيعات تلبي احتياجات الجميع"
+
+#~ msgid "Downloading file %s..."
+#~ msgstr "يجري تنزيل الملف %s ..."
+
+#~ msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
+#~ msgstr "الترقية من توزيعة 32 بت إلى 64 بت غير مدعومة"
+
+#~ msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
+#~ msgstr "الترقية من توزيعة 64 بت إلى 32 بت غير مدعومة"
+
#~ msgid ""
#~ "You have selected the following server(s): %s\n"
#~ "\n"
diff --git a/perl-install/install/share/po/az.po b/perl-install/install/share/po/az.po
index 0788af952..76b97d09a 100644
--- a/perl-install/install/share/po/az.po
+++ b/perl-install/install/share/po/az.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: DrakX-az\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
"PO-Revision-Date: 2005-03-31 14:21+0200\n"
"Last-Translator: Mətin Əmirov <metin@karegen.com>\n"
"Language-Team: Azerbaijani <translation-team-az@lists.sourceforge.net>\n"
@@ -20,31 +20,6 @@ msgstr ""
"X-Generator: KBabel 1.3.1\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr ""
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr ""
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr ""
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr ""
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr ""
-
#: any.pm:109
#, fuzzy, c-format
msgid "Do you have further supplementary media?"
@@ -80,17 +55,17 @@ msgstr "Şəbəkə %s"
msgid "Network (NFS)"
msgstr ""
-#: any.pm:163
+#: any.pm:165
#, c-format
msgid "URL of the mirror?"
msgstr ""
-#: any.pm:169
+#: any.pm:171
#, c-format
msgid "URL must start with ftp:// or http://"
msgstr ""
-#: any.pm:180
+#: any.pm:182
#, c-format
msgid ""
"Contacting Mandriva Linux web site to get the list of available mirrors..."
@@ -98,7 +73,7 @@ msgstr ""
"Mövcud əkslərin siyahısını almaq üçün Mandriva Linux səhifəsi ilə təmas "
"qurulur..."
-#: any.pm:185
+#: any.pm:187
#, fuzzy, c-format
msgid ""
"Failed contacting Mandriva Linux web site to get the list of available "
@@ -107,69 +82,69 @@ msgstr ""
"Mövcud əkslərin siyahısını almaq üçün Mandriva Linux səhifəsi ilə təmas "
"qurulur..."
-#: any.pm:195
+#: any.pm:197
#, c-format
msgid "Choose a mirror from which to get the packages"
msgstr "Paketleri almaq üçün bir əks ünvanı seçin"
-#: any.pm:225
+#: any.pm:227
#, c-format
msgid "NFS setup"
msgstr ""
-#: any.pm:226
+#: any.pm:228
#, c-format
msgid "Please enter the hostname and directory of your NFS media"
msgstr ""
-#: any.pm:230
+#: any.pm:232
#, c-format
msgid "Hostname missing"
msgstr ""
-#: any.pm:231
+#: any.pm:233
#, c-format
msgid "Directory must begin with \"/\""
msgstr ""
-#: any.pm:235
+#: any.pm:237
#, c-format
msgid "Hostname of the NFS mount ?"
msgstr ""
-#: any.pm:236
+#: any.pm:238
#, c-format
msgid "Directory"
msgstr "Qovluq"
-#: any.pm:258
+#: any.pm:260
#, c-format
msgid "Supplementary"
msgstr ""
-#: any.pm:293
+#: any.pm:295
#, fuzzy, c-format
msgid ""
"Can't find a package list file on this mirror. Make sure the location is "
"correct."
msgstr "%s, %s üstündə tapıla bilmir"
-#: any.pm:328
+#: any.pm:334
#, c-format
msgid "Looking at packages already installed..."
msgstr "Qurulu olan paketlər yoxlanır..."
-#: any.pm:362
+#: any.pm:368
#, c-format
msgid "Finding packages to upgrade..."
msgstr "Güncəllənəcək paketlar tapılır"
-#: any.pm:381
+#: any.pm:387
#, c-format
msgid "Removing packages prior to upgrade..."
msgstr ""
-#: any.pm:402
+#: any.pm:408
#, c-format
msgid ""
"You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -181,18 +156,18 @@ msgid ""
"please reboot your system and upgrade using the Mandriva update applet."
msgstr ""
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
#, c-format
msgid "Reboot"
msgstr "Yenidən başlat"
-#: any.pm:407
+#: any.pm:413
#, c-format
msgid "Proceed"
msgstr ""
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -205,72 +180,72 @@ msgstr ""
"\n"
"Bu paketləri həqiqətən də silmək istəyirsiniz?\n"
-#: any.pm:815
+#: any.pm:821
#, c-format
msgid "Error reading file %s"
msgstr "%s faylı oxunurkan xəta oldu"
-#: any.pm:1022
+#: any.pm:1028
#, fuzzy, c-format
msgid "The following disk(s) were renamed:"
msgstr "Aşağıdakı paketlər qurulmalıdır:\n"
-#: any.pm:1024
+#: any.pm:1030
#, c-format
msgid "%s (previously named as %s)"
msgstr ""
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "HTTP"
msgstr ""
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "FTP"
msgstr "FTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "NFS"
msgstr "NFS"
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
#, c-format
msgid "Network"
msgstr "Şəbəkə"
-#: any.pm:1104
+#: any.pm:1110
#, fuzzy, c-format
msgid "Please choose a media"
msgstr "Xahiş edirik seçin"
-#: any.pm:1120
+#: any.pm:1126
#, fuzzy, c-format
msgid "File already exists. Overwrite it?"
msgstr "Fayl onsuz da mövcuddur. Üstünə yazım?"
-#: any.pm:1124
+#: any.pm:1130
#, c-format
msgid "Permission denied"
msgstr "Səlahiyyət yoxdur"
-#: any.pm:1172
+#: any.pm:1178
#, c-format
msgid "Bad NFS name"
msgstr ""
-#: any.pm:1193
+#: any.pm:1199
#, fuzzy, c-format
msgid "Bad media %s"
msgstr "%s medyası əlavə edildi"
-#: any.pm:1236
+#: any.pm:1242
#, c-format
msgid "Can not make screenshots before partitioning"
msgstr "Bölmələmədən əvvəl görüntü alına bilməz"
-#: any.pm:1244
+#: any.pm:1250
#, c-format
msgid "Screenshots will be available after install in %s"
msgstr "Ekran görüntüləri qurulumdan sonra %s mövqeyində olacaqdır"
@@ -281,11 +256,15 @@ msgid "Installation"
msgstr "Qurulur"
#: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
#, c-format
msgid "Configuration"
msgstr "Quraşdırma"
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
#: install2.pm:168
#, c-format
msgid "You must also format %s"
@@ -311,22 +290,22 @@ msgstr "Şəbəkə fəallaşdırılır"
msgid "Bringing down the network"
msgstr "Şəbəkə dayandırılır"
-#: media.pm:402
+#: media.pm:399
#, c-format
msgid "Please wait, retrieving file"
msgstr ""
-#: media.pm:734
-#, fuzzy, c-format
-msgid "Downloading file %s..."
-msgstr "Fayllar göndərilir..."
+#: media.pm:718
+#, c-format
+msgid "unable to add medium"
+msgstr ""
-#: media.pm:822
+#: media.pm:758
#, c-format
msgid "Copying some packages on disks for future use"
msgstr ""
-#: media.pm:875
+#: media.pm:811
#, fuzzy, c-format
msgid "Copying in progress"
msgstr "Təsbit etmə fəaliyyətdədir"
@@ -368,27 +347,27 @@ msgstr ""
msgid "An error occurred:"
msgstr "Bir xəta oldu"
-#: pkgs.pm:776
+#: pkgs.pm:780
#, fuzzy, c-format
msgid "%d installation transactions failed"
msgstr "Qurulum bacarılmadı"
-#: pkgs.pm:777
+#: pkgs.pm:781
#, fuzzy, c-format
msgid "Installation of packages failed:"
msgstr "%s paketi qurulur"
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
#, c-format
msgid "Workstation"
msgstr "İş Stansiyası"
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
#, c-format
msgid "Office Workstation"
msgstr "Ofis İş Stansiyası"
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
#, c-format
msgid ""
"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -397,7 +376,7 @@ msgstr ""
"İdarə proqramları: kəlmə işləyənlər (OpenOffice.org Writer, Kword), "
"hesablayıcılar və pdf göstəriciləri, vs."
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
#, c-format
msgid ""
"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -406,32 +385,32 @@ msgstr ""
"İdarə proqramları: kəlmə işləyənlər (kword, abiword), hesablayıcılar və pdf "
"göstəriciləri, vs."
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
#, c-format
msgid "Game station"
msgstr "Oyun stansiyası"
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
#, c-format
msgid "Amusement programs: arcade, boards, strategy, etc"
msgstr "Məzəli proqramlar: arkad, lövhə oyunları, strategiya, vs"
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
#, c-format
msgid "Multimedia station"
msgstr "Multimedya stansiyası"
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
#, c-format
msgid "Sound and video playing/editing programs"
msgstr "Səs və video çalınması/düzəliş proqramları"
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
#, c-format
msgid "Internet station"
msgstr "İnternet stansiyası"
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
#, c-format
msgid ""
"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -440,223 +419,205 @@ msgstr ""
"Elektronik məktub və xəbər oxuyucu vasitələr dəstəsi (pine, mutt, tin..) və "
"Veb səyyahları"
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
#, c-format
msgid "Network Computer (client)"
msgstr "Şəbəkə Kompüteri (alıcı)"
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
#, c-format
msgid "Clients for different protocols including ssh"
msgstr "SSH daxil bir çox protokolların alıcıları"
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
#, c-format
msgid "Tools to ease the configuration of your computer"
msgstr "Kompüter qurğularını asandlaşdıran vasitələr"
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
#, c-format
msgid "Console Tools"
msgstr "Konsol Vasitələri"
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
#, c-format
msgid "Editors, shells, file tools, terminals"
msgstr "Editorlar, rəflər, fayl vasitələri, terminallar"
#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
#, c-format
msgid "Development"
msgstr "İnkişaf"
#: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
#, c-format
msgid "C and C++ development libraries, programs and include files"
msgstr "C və C++ inkişaf kitabxanaları, proqramları və daxil ediləcək fayllar"
#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
#, c-format
msgid "Documentation"
msgstr "Sənədlər"
#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
#, c-format
msgid "Books and Howto's on Linux and Free Software"
msgstr "Linuks və sərbəst proqram tə'minatı haqqında Kitablar və Howtolar"
#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
#, c-format
msgid "LSB"
msgstr "LSB"
#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
#, c-format
msgid "Linux Standard Base. Third party applications support"
msgstr "Linux Standartları Bazası. Üçüncü partiya tə'minat dəstəyi"
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
#, c-format
msgid "Web Server"
msgstr "Veb Vericisi"
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
#, c-format
msgid "Apache"
msgstr "Apache"
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
#, fuzzy, c-format
msgid "Groupware"
msgstr "Qrup"
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
#, c-format
msgid "Kolab Server"
msgstr "Kolab Vericisi"
#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
#, c-format
msgid "Firewall/Router"
msgstr "Atəş Divarı/İstiqamətləndirici"
#: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
#, c-format
msgid "Internet gateway"
msgstr "İnternet keçidi"
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
#, fuzzy, c-format
msgid "Mail/News"
msgstr "/Fayl/_Təze"
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
#, fuzzy, c-format
msgid "Postfix mail server, Inn news server"
msgstr "Postfix poçt vericisi"
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
#, fuzzy, c-format
msgid "Directory Server"
msgstr "CD'dən Geri Yüklə"
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
#, fuzzy, c-format
msgid "FTP Server"
msgstr "NTP Verici"
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
#, c-format
msgid "ProFTPd"
msgstr ""
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
#, fuzzy, c-format
msgid "DNS/NIS"
msgstr "DNS"
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
#, fuzzy, c-format
msgid "Domain Name and Network Information Server"
msgstr "Domen Adı Vericisi"
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
#, fuzzy, c-format
msgid "File and Printer Sharing Server"
msgstr "Çapçı Vericisi"
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
#, fuzzy, c-format
msgid "NFS Server, Samba server"
msgstr "Samba vericisi"
#: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
#, c-format
msgid "Database"
msgstr "Mə'lumat Bazası"
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
#, fuzzy, c-format
msgid "PostgreSQL and MySQL Database Server"
msgstr "PostgreSQL ya da MySQL mə'lumat bazası vericisi"
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
#, c-format
msgid "Web/FTP"
msgstr "Veb/FTP"
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
#, c-format
msgid "Apache, Pro-ftpd"
msgstr "Apache, Pro-ftpd"
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
#, c-format
msgid "Mail"
msgstr "Poçt"
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
#, c-format
msgid "Postfix mail server"
msgstr "Postfix poçt vericisi"
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
#, c-format
msgid "PostgreSQL or MySQL database server"
msgstr "PostgreSQL ya da MySQL mə'lumat bazası vericisi"
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
#, c-format
msgid "Network Computer server"
msgstr "Şəbəkə Kompüter vericisi"
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
#, c-format
msgid "NFS server, SMB server, Proxy server, ssh server"
msgstr "NFS vericisi, SMB vericisi, Vəkil vericisi, SSH verici"
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
#, c-format
msgid "Graphical Environment"
msgstr "Qrafiki Mühit"
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
#, c-format
msgid "KDE Workstation"
msgstr "KDE iş stansiyası"
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
#, c-format
msgid ""
"The K Desktop Environment, the basic graphical environment with a collection "
"of accompanying tools"
msgstr "KDE, əsas qrafiki ara üz və yardımçi proqramlar kolleksiyası"
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
#, c-format
msgid "GNOME Workstation"
msgstr "GNOME iş stansiyası"
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
#, c-format
msgid ""
"A graphical environment with user-friendly set of applications and desktop "
@@ -664,7 +625,7 @@ msgid ""
msgstr ""
"İstifadəçi dostu proqram və masa üstü ilə bərabər qrafiki ara üz vasitələri"
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
#, fuzzy, c-format
msgid "LXDE Desktop"
msgstr "Masa üstü"
@@ -677,54 +638,52 @@ msgid ""
msgstr ""
"İstifadəçi dostu proqram və masa üstü ilə bərabər qrafiki ara üz vasitələri"
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
#, c-format
msgid "Other Graphical Desktops"
msgstr "Başqa qrafiki ara üzlər"
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
#, fuzzy, c-format
msgid "Window Maker, Enlightenment, Fvwm, etc"
msgstr "Icewm, Window Maker, Enlightenment, Fvwm, vs."
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
#, c-format
msgid "Utilities"
msgstr "Vasitələr"
#: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
#, c-format
msgid "SSH Server"
msgstr "SSH Vericisi"
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
#, fuzzy, c-format
msgid "Webmin"
msgstr "Veb kamerası"
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
#, fuzzy, c-format
msgid "Webmin Remote Configuration Server"
msgstr "Terminal Server Quraşdırılması"
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
#, fuzzy, c-format
msgid "Network Utilities/Monitoring"
msgstr "Şəbəkə İzlənməsi"
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
#, c-format
msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
msgstr ""
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
#, fuzzy, c-format
msgid "Mandriva Wizards"
msgstr "<b>Mandriva Store</b>"
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
#, fuzzy, c-format
msgid "Wizards to configure server"
msgstr "\"%s\" çapçısı quraşdırıla bilmədi!"
@@ -825,17 +784,17 @@ msgstr ""
msgid "Click on images in order to see a bigger preview"
msgstr ""
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
#, c-format
msgid "Package Group Selection"
msgstr "Paket Qruplarının Seçimi"
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
#, c-format
msgid "Individual package selection"
msgstr "Fərdi paket seçimi"
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
#, c-format
msgid "Total size: %d / %d MB"
msgstr "Ümumi böyüklük: %d / %d Mb"
@@ -952,12 +911,12 @@ msgstr "Minimal qurulum"
msgid "Software Management"
msgstr "Proqram Tə'minatı İdarəsi"
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
#, c-format
msgid "Choose the packages you want to install"
msgstr "Qurmaq istədiyiniz paketləri seçin"
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
#, c-format
msgid "Installing"
msgstr "Qurulur"
@@ -983,7 +942,7 @@ msgid "%d package"
msgid_plural "%d packages"
msgstr[0] "%d paket"
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
#, c-format
msgid "Summary"
msgstr "İcmal"
@@ -993,7 +952,7 @@ msgstr "İcmal"
msgid "Configure"
msgstr "Qur"
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
#, c-format
msgid "not configured"
msgstr "quraşdırılmayıb"
@@ -1003,14 +962,14 @@ msgstr "quraşdırılmayıb"
msgid "Media Selection"
msgstr "Paket Qruplarının Seçimi"
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
#, c-format
msgid ""
"The following installation media have been found.\n"
"If you want to skip some of them, you can unselect them now."
msgstr ""
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
#, c-format
msgid ""
"You have the option to copy the contents of the CDs onto the hard drive "
@@ -1019,7 +978,7 @@ msgid ""
"available once the system is fully installed."
msgstr ""
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
#, c-format
msgid "Copy whole CDs"
msgstr ""
@@ -1039,59 +998,49 @@ msgstr "Xahiş edirik, klaviatura düzülüşünüzü seçin"
msgid "Here is the full list of available keyboards:"
msgstr "Bütün mövcud ölkələrinn siyahısı"
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
#, c-format
msgid "Install/Upgrade"
msgstr "Qurulum/Yeniləmə"
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
#, c-format
msgid "Is this an install or an upgrade?"
msgstr "Bu bir qurulum, yoxsa yeniləmədir?"
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
#, fuzzy, c-format
msgid ""
"_: This is a noun:\n"
"Install"
msgstr "Qur"
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
#, c-format
msgid "Upgrade %s"
msgstr "%s-i yenilə"
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
#, c-format
msgid "Encryption key for %s"
msgstr "%s üçün şifrələmə açarı"
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
#, c-format
msgid "Cancel installation, reboot system"
msgstr ""
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
#, fuzzy, c-format
msgid "New Installation"
msgstr "Qurulur"
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
#, c-format
msgid "Upgrade previous installation (not recommended)"
msgstr ""
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
#, c-format
msgid ""
"Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1103,17 +1052,17 @@ msgid ""
"Installation\"."
msgstr ""
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "IDE"
msgstr "İDE"
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "Configuring IDE"
msgstr "İDE qapıları qurulur"
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
#, c-format
msgid ""
"No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1122,7 +1071,7 @@ msgstr ""
"1 MB bootstrap üçün yer yoxdur! Qurulum davam edəcək, ancaq sisteminizi aça "
"bilmək üçün DiskDrake'də bootstrap bölməsi yaratmalısınız."
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
#, fuzzy, c-format
msgid ""
"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1132,7 +1081,7 @@ msgstr ""
"1 MB bootstrap üçün yer yoxdur! Qurulum davam edəcək, ancaq sisteminizi aça "
"bilmək üçün DiskDrake'də bootstrap bölməsi yaratmalısınız."
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
#, fuzzy, c-format
msgid ""
"Change your Cd-Rom!\n"
@@ -1147,19 +1096,19 @@ msgstr ""
"Əgər CD-ROM əlinizdə deyilsə, bu CD-Rom'dan qurmamaq üçün Ləğv Et düyməsinə "
"basın."
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
#, c-format
msgid "Looking for available packages..."
msgstr "Mövcud olan paketlər axtarılır."
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
#, c-format
msgid ""
"Your system does not have enough space left for installation or upgrade (%"
"dMB > %dMB)"
msgstr ""
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
#, fuzzy, c-format
msgid ""
"Please choose load or save package selection.\n"
@@ -1168,52 +1117,52 @@ msgstr ""
"Xahiş edirik, paket seçkilərini disketə qeyd et/disketdən yüklə\n"
"seçənəyini seçin."
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Load"
msgstr "Yüklə"
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Save"
msgstr "Qeyd Et"
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
#, c-format
msgid "Bad file"
msgstr "Səhv fayl"
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
#, fuzzy, c-format
msgid "KDE"
msgstr "İDE"
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
#, c-format
msgid "GNOME"
msgstr "GNOME"
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
#, fuzzy, c-format
msgid "Desktop Selection"
msgstr "Paket Qruplarının Seçimi"
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
#, c-format
msgid "You can choose your workstation desktop profile."
msgstr ""
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
#, c-format
msgid "Selected size is larger than available space"
msgstr "Seçili böyüklük var olandan daha böyükdür"
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
#, c-format
msgid "Type of install"
msgstr "Qurulum növü"
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
#, c-format
msgid ""
"You have not selected any group of packages.\n"
@@ -1222,82 +1171,82 @@ msgstr ""
"Heç bir paket qrupunu seçmədiniz.\n"
"Xahiş edirik, istədiyiniz ən kiçik qurulumu seçin:"
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
#, c-format
msgid "With X"
msgstr "X ilə"
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
#, c-format
msgid "With basic documentation (recommended!)"
msgstr "Əsas sənədlərlə birlikdə (məsləhət edilən!)"
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
#, c-format
msgid "Truly minimal install (especially no urpmi)"
msgstr "Həqiqətən minimal qurulum (xüsusilə urpmi olmasın)"
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
#, c-format
msgid "Preparing installation"
msgstr "Qurulum hazırlanır"
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
#, c-format
msgid "Installing package %s"
msgstr "%s paketi qurulur"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "There was an error ordering packages:"
msgstr "Paketləri istərkən xəta yarandı:"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "Go on anyway?"
msgstr "Yenə də davam edək?"
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
#, c-format
msgid "Retry"
msgstr ""
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
#, c-format
msgid "Skip this package"
msgstr ""
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
#, c-format
msgid "Skip all packages from medium \"%s\""
msgstr ""
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
#, fuzzy, c-format
msgid "Go back to media and packages selection"
msgstr "Paket seçkilərini qeyd et"
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
#, fuzzy, c-format
msgid "There was an error installing package %s."
msgstr "Paketlər qurulurkən bir xəta oldu:"
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
#, c-format
msgid "Post-install configuration"
msgstr "Qurulum sonrası qurğular"
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
#, c-format
msgid "Please ensure the Update Modules media is in drive %s"
msgstr ""
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
#, c-format
msgid "Updates"
msgstr "Yeniləmələr"
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
#, c-format
msgid ""
"You now have the opportunity to download updated packages. These packages\n"
@@ -1319,28 +1268,28 @@ msgstr ""
"\n"
"Yeniləmələri qurmaq istəyirsiniz ?"
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
#, c-format
msgid "%s on %s"
msgstr "%2$s üstündə %1$s"
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
#, c-format
msgid "Hardware"
msgstr "Avadanlıq"
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
#, c-format
msgid "Sound card"
msgstr "Səs kartı"
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
#, c-format
msgid "Do you have an ISA sound card?"
msgstr "Heç İSA səs kartınız var?"
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
#, fuzzy, c-format
msgid ""
"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1348,67 +1297,67 @@ msgid ""
msgstr ""
"Qurulumdan sonra səs kartınızı qurğulamaq üçün \"sndconfig\" əmrini icra edin"
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
#, c-format
msgid "No sound card detected. Try \"harddrake\" after installation"
msgstr "Səs kartı tapılmadı. Qurulumdan sonra \"harddrake\"ni işə salın"
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
#, c-format
msgid "Graphical interface"
msgstr "Qrafiki ara üz"
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
#, c-format
msgid "Network & Internet"
msgstr "Şəbəkə və İnternet"
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
#, c-format
msgid "Proxies"
msgstr "Vəkil vericiləri"
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
#, c-format
msgid "configured"
msgstr "quraşdırılıb"
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
#, c-format
msgid "Security Level"
msgstr "Təhlükəsizlik Səviyyəsi"
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
#, c-format
msgid "Firewall"
msgstr "Atəş Divarı"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "activated"
msgstr "fəal"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "disabled"
msgstr "qeyri-fəal"
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
#, c-format
msgid "You have not configured X. Are you sure you really want this?"
msgstr "Siz X-i quraşdırmadınız. Bundan əminsinizmi?"
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
#, c-format
msgid "Preparing bootloader..."
msgstr "Açılış yükləyici hazırlanır"
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
#, c-format
msgid "Be patient, this may take a while..."
msgstr ""
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
#, fuzzy, c-format
msgid ""
"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1421,24 +1370,24 @@ msgstr ""
"Qurulum davam edəcək ancaq kompüterinizi aça bilmək üçün\n"
" BootX ya da başqa vasitədən istifadə etməlisiniz"
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
#, c-format
msgid ""
"In this security level, access to the files in the Windows partition is "
"restricted to the administrator."
msgstr ""
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr "%s sürücüsünə boş bir disket yerləşdirin"
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
#, c-format
msgid "Creating auto install floppy..."
msgstr "Avtomatik qurulum disketi hazırlanır"
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
#, c-format
msgid ""
"Some steps are not completed.\n"
@@ -1449,7 +1398,7 @@ msgstr ""
"\n"
"Həqiqətən də çıxmaq istəyirsiniz?"
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
#, c-format
msgid "Congratulations"
msgstr "Təbriklər"
@@ -1593,6 +1542,10 @@ msgid ""
"Exit"
msgstr "Çıxış"
+#, fuzzy
+#~ msgid "Downloading file %s..."
+#~ msgstr "Fayllar göndərilir..."
+
#~ msgid ""
#~ "You have selected the following server(s): %s\n"
#~ "\n"
diff --git a/perl-install/install/share/po/be.po b/perl-install/install/share/po/be.po
index 9d23f78b5..084735b7d 100644
--- a/perl-install/install/share/po/be.po
+++ b/perl-install/install/share/po/be.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: DrakX VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
"PO-Revision-Date: 2000-09-24 12:30 +0100\n"
"Last-Translator: Alexander Bokovoy <ab@avilink.net>\n"
"Language-Team: be\n"
@@ -14,31 +14,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr ""
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr ""
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr ""
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr ""
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr ""
-
#: any.pm:109
#, fuzzy, c-format
msgid "Do you have further supplementary media?"
@@ -74,92 +49,92 @@ msgstr "Сетка"
msgid "Network (NFS)"
msgstr ""
-#: any.pm:163
+#: any.pm:165
#, c-format
msgid "URL of the mirror?"
msgstr ""
-#: any.pm:169
+#: any.pm:171
#, c-format
msgid "URL must start with ftp:// or http://"
msgstr ""
-#: any.pm:180
+#: any.pm:182
#, fuzzy, c-format
msgid ""
"Contacting Mandriva Linux web site to get the list of available mirrors..."
msgstr "Сувязь з люрам для атрымання спісу даступных пакетаў"
-#: any.pm:185
+#: any.pm:187
#, fuzzy, c-format
msgid ""
"Failed contacting Mandriva Linux web site to get the list of available "
"mirrors"
msgstr "Сувязь з люрам для атрымання спісу даступных пакетаў"
-#: any.pm:195
+#: any.pm:197
#, c-format
msgid "Choose a mirror from which to get the packages"
msgstr "Выбар люстра для атрымання пакетаў"
-#: any.pm:225
+#: any.pm:227
#, c-format
msgid "NFS setup"
msgstr ""
-#: any.pm:226
+#: any.pm:228
#, c-format
msgid "Please enter the hostname and directory of your NFS media"
msgstr ""
-#: any.pm:230
+#: any.pm:232
#, c-format
msgid "Hostname missing"
msgstr ""
-#: any.pm:231
+#: any.pm:233
#, c-format
msgid "Directory must begin with \"/\""
msgstr ""
-#: any.pm:235
+#: any.pm:237
#, c-format
msgid "Hostname of the NFS mount ?"
msgstr ""
-#: any.pm:236
+#: any.pm:238
#, c-format
msgid "Directory"
msgstr "Каталёг"
-#: any.pm:258
+#: any.pm:260
#, c-format
msgid "Supplementary"
msgstr ""
-#: any.pm:293
+#: any.pm:295
#, fuzzy, c-format
msgid ""
"Can't find a package list file on this mirror. Make sure the location is "
"correct."
msgstr "Не знойздены праграмы\n"
-#: any.pm:328
+#: any.pm:334
#, fuzzy, c-format
msgid "Looking at packages already installed..."
msgstr "Вы не можаце адмяніць вылучэнне гэтага пакету. Ён ужо ўсталяваны"
-#: any.pm:362
+#: any.pm:368
#, c-format
msgid "Finding packages to upgrade..."
msgstr "Пошук пакетаў для абнаўлення"
-#: any.pm:381
+#: any.pm:387
#, c-format
msgid "Removing packages prior to upgrade..."
msgstr ""
-#: any.pm:402
+#: any.pm:408
#, c-format
msgid ""
"You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -171,18 +146,18 @@ msgid ""
"please reboot your system and upgrade using the Mandriva update applet."
msgstr ""
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
#, c-format
msgid "Reboot"
msgstr "Перазагрузка"
-#: any.pm:407
+#: any.pm:413
#, c-format
msgid "Proceed"
msgstr ""
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -191,72 +166,72 @@ msgid ""
"Do you really want to remove these packages?\n"
msgstr ""
-#: any.pm:815
+#: any.pm:821
#, c-format
msgid "Error reading file %s"
msgstr "Памылка чытання файлу %s"
-#: any.pm:1022
+#: any.pm:1028
#, fuzzy, c-format
msgid "The following disk(s) were renamed:"
msgstr "Наступныя пакеты будуць даданы да сістэмы"
-#: any.pm:1024
+#: any.pm:1030
#, c-format
msgid "%s (previously named as %s)"
msgstr ""
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "HTTP"
msgstr ""
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "FTP"
msgstr "FTP"
-#: any.pm:1081
+#: any.pm:1087
#, fuzzy, c-format
msgid "NFS"
msgstr "ФС"
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
#, c-format
msgid "Network"
msgstr "Сетка"
-#: any.pm:1104
+#: any.pm:1110
#, fuzzy, c-format
msgid "Please choose a media"
msgstr "Калі ласка выбярыце відарыс відэа"
-#: any.pm:1120
+#: any.pm:1126
#, fuzzy, c-format
msgid "File already exists. Overwrite it?"
msgstr "Файл ужо йснуе. Перапісаць?"
-#: any.pm:1124
+#: any.pm:1130
#, c-format
msgid "Permission denied"
msgstr "Адмоўлена ў доступе"
-#: any.pm:1172
+#: any.pm:1178
#, fuzzy, c-format
msgid "Bad NFS name"
msgstr "Бяз назвы"
-#: any.pm:1193
+#: any.pm:1199
#, fuzzy, c-format
msgid "Bad media %s"
msgstr "Загружаецца файл %s"
-#: any.pm:1236
+#: any.pm:1242
#, fuzzy, c-format
msgid "Can not make screenshots before partitioning"
msgstr "Дадаць раздзел немагчыма"
-#: any.pm:1244
+#: any.pm:1250
#, c-format
msgid "Screenshots will be available after install in %s"
msgstr ""
@@ -267,11 +242,15 @@ msgid "Installation"
msgstr "Усталёўваем"
#: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
#, c-format
msgid "Configuration"
msgstr "Канфігурацыя"
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
#: install2.pm:168
#, c-format
msgid "You must also format %s"
@@ -296,22 +275,22 @@ msgstr "Далучэнне да сеткі"
msgid "Bringing down the network"
msgstr "Адлучэнне ад сеткі"
-#: media.pm:402
+#: media.pm:399
#, c-format
msgid "Please wait, retrieving file"
msgstr ""
-#: media.pm:734
-#, fuzzy, c-format
-msgid "Downloading file %s..."
-msgstr "Вызначэнне прыладаў..."
+#: media.pm:718
+#, c-format
+msgid "unable to add medium"
+msgstr ""
-#: media.pm:822
+#: media.pm:758
#, c-format
msgid "Copying some packages on disks for future use"
msgstr ""
-#: media.pm:875
+#: media.pm:811
#, fuzzy, c-format
msgid "Copying in progress"
msgstr "Стварэньне меню ўжо запушчана"
@@ -353,27 +332,27 @@ msgstr ""
msgid "An error occurred:"
msgstr "Адбылася памылка"
-#: pkgs.pm:776
+#: pkgs.pm:780
#, fuzzy, c-format
msgid "%d installation transactions failed"
msgstr "Усталяванне SILO"
-#: pkgs.pm:777
+#: pkgs.pm:781
#, fuzzy, c-format
msgid "Installation of packages failed:"
msgstr "Усталяванне пакету %s"
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
#, fuzzy, c-format
msgid "Workstation"
msgstr "Канфігурацыя"
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
#, fuzzy, c-format
msgid "Office Workstation"
msgstr "Працоўныя мейсцы"
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
#, c-format
msgid ""
"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -382,7 +361,7 @@ msgstr ""
"Офісныя праграмы: працэсары словаў (OpenOffice.org Writer, Kword), "
"электроныя табліцы, аглядальнікі pdf-файлаў, і г.д."
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
#, c-format
msgid ""
"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -391,243 +370,225 @@ msgstr ""
"Офісныя праграмы: працэсары словаў (kword, abiword), электроныя табліцы, "
"аглядальнікі pdf-файлаў, і г.д."
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
#, fuzzy, c-format
msgid "Game station"
msgstr "Аўтэнтыфікацыя"
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
#, c-format
msgid "Amusement programs: arcade, boards, strategy, etc"
msgstr "Забаўляльныя праграмы: аркады, стратэгіі і г.д."
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
#, fuzzy, c-format
msgid "Multimedia station"
msgstr "Мульцімедыя"
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
#, c-format
msgid "Sound and video playing/editing programs"
msgstr "Рэдактары і прайгравальнікі гуку і відэа"
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
#, fuzzy, c-format
msgid "Internet station"
msgstr "Інтэрнэт"
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
#, c-format
msgid ""
"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
"Web"
msgstr ""
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
#, fuzzy, c-format
msgid "Network Computer (client)"
msgstr "Сеткавы прынтэр (TCP/Socket)"
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
#, c-format
msgid "Clients for different protocols including ssh"
msgstr ""
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
#, fuzzy, c-format
msgid "Tools to ease the configuration of your computer"
msgstr "Ці жадаеце пратэсціраваць настройкі?"
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
#, c-format
msgid "Console Tools"
msgstr "Кансольныя інструментальныя сродкі"
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
#, c-format
msgid "Editors, shells, file tools, terminals"
msgstr "Рэдактары, абалонкі, тэрміналы"
#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
#, c-format
msgid "Development"
msgstr "Распрацоўка"
#: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
#, c-format
msgid "C and C++ development libraries, programs and include files"
msgstr "Бібліятэкі і праграмы для распрацоўкі на С і С++"
#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
#, c-format
msgid "Documentation"
msgstr "Дакумэнтацыя"
#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
#, c-format
msgid "Books and Howto's on Linux and Free Software"
msgstr "нігі і Howto па Linux і Free Software"
#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
#, c-format
msgid "LSB"
msgstr ""
#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
#, c-format
msgid "Linux Standard Base. Third party applications support"
msgstr ""
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
#, fuzzy, c-format
msgid "Web Server"
msgstr "Сервак"
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
#, fuzzy, c-format
msgid "Apache"
msgstr "Шлях:"
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
#, fuzzy, c-format
msgid "Groupware"
msgstr "Групы"
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
#, fuzzy, c-format
msgid "Kolab Server"
msgstr "NIS сэервер:"
#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
#, fuzzy, c-format
msgid "Firewall/Router"
msgstr "Рэстарт"
#: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
#, fuzzy, c-format
msgid "Internet gateway"
msgstr "Інтэрнэт"
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
#, fuzzy, c-format
msgid "Mail/News"
msgstr "/Файл/_Стварыць"
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
#, c-format
msgid "Postfix mail server, Inn news server"
msgstr ""
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
#, fuzzy, c-format
msgid "Directory Server"
msgstr "Каталог %s Так"
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
#, fuzzy, c-format
msgid "FTP Server"
msgstr "NIS сэервер:"
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
#, c-format
msgid "ProFTPd"
msgstr ""
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
#, c-format
msgid "DNS/NIS"
msgstr ""
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
#, fuzzy, c-format
msgid "Domain Name and Network Information Server"
msgstr "Імя дамену"
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
#, fuzzy, c-format
msgid "File and Printer Sharing Server"
msgstr "Сервер друку"
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
#, fuzzy, c-format
msgid "NFS Server, Samba server"
msgstr "X сэервер"
#: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
#, c-format
msgid "Database"
msgstr "База даньняў"
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
#, c-format
msgid "PostgreSQL and MySQL Database Server"
msgstr ""
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
#, c-format
msgid "Web/FTP"
msgstr ""
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
#, c-format
msgid "Apache, Pro-ftpd"
msgstr ""
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
#, c-format
msgid "Mail"
msgstr "Пошта"
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
#, c-format
msgid "Postfix mail server"
msgstr ""
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
#, c-format
msgid "PostgreSQL or MySQL database server"
msgstr ""
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
#, fuzzy, c-format
msgid "Network Computer server"
msgstr "Сеткавыя інтэрфэйсы"
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
#, c-format
msgid "NFS server, SMB server, Proxy server, ssh server"
msgstr ""
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
#, fuzzy, c-format
msgid "Graphical Environment"
msgstr "Абалонка"
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
#, fuzzy, c-format
msgid "KDE Workstation"
msgstr "Канфігурацыя"
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
#, c-format
msgid ""
"The K Desktop Environment, the basic graphical environment with a collection "
@@ -636,12 +597,12 @@ msgstr ""
"The K Desktop Environment - асноўнае графічнае асяродзе з калекцыяй "
"інструментальных сродкаў"
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
#, fuzzy, c-format
msgid "GNOME Workstation"
msgstr "Інфармацыя аб памяці"
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
#, c-format
msgid ""
"A graphical environment with user-friendly set of applications and desktop "
@@ -650,7 +611,7 @@ msgstr ""
"Графічнае асяродзе са зручным дзеля выкарыстання наборам прыкладанняў і "
"інструментальных сродкаў"
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
#, fuzzy, c-format
msgid "LXDE Desktop"
msgstr "Працоўны стол"
@@ -664,54 +625,52 @@ msgstr ""
"Графічнае асяродзе са зручным дзеля выкарыстання наборам прыкладанняў і "
"інструментальных сродкаў"
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
#, c-format
msgid "Other Graphical Desktops"
msgstr "Іншыя графічныя Працоўныя сталы"
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
#, c-format
msgid "Window Maker, Enlightenment, Fvwm, etc"
msgstr ""
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
#, c-format
msgid "Utilities"
msgstr "Карыснасьці"
#: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
#, fuzzy, c-format
msgid "SSH Server"
msgstr "NIS сэервер:"
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
#, fuzzy, c-format
msgid "Webmin"
msgstr "Прылады"
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
#, fuzzy, c-format
msgid "Webmin Remote Configuration Server"
msgstr "Сістэмнае адміністраваньне"
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
#, fuzzy, c-format
msgid "Network Utilities/Monitoring"
msgstr "Канфігурацыя сеткі"
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
#, c-format
msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
msgstr ""
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
#, fuzzy, c-format
msgid "Mandriva Wizards"
msgstr "Цэнтар кіраваньня"
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
#, fuzzy, c-format
msgid "Wizards to configure server"
msgstr "Немагчыма выдаліць \"%s\": %s."
@@ -811,17 +770,17 @@ msgstr ""
msgid "Click on images in order to see a bigger preview"
msgstr ""
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
#, c-format
msgid "Package Group Selection"
msgstr "Выбар групы пакетаў"
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
#, c-format
msgid "Individual package selection"
msgstr "Асабісты выбар пакетаў"
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
#, c-format
msgid "Total size: %d / %d MB"
msgstr "Агульны памер: %d / %d Мб"
@@ -939,12 +898,12 @@ msgstr "Ахоўнік экрану"
msgid "Software Management"
msgstr "Мэнэджэр сэрвісаў"
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
#, c-format
msgid "Choose the packages you want to install"
msgstr "Выбар пакетаў для ўсталявання"
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
#, c-format
msgid "Installing"
msgstr "Усталёўваем"
@@ -971,7 +930,7 @@ msgid_plural "%d packages"
msgstr[0] "%d пакетаў"
msgstr[1] "%d пакетаў"
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
#, c-format
msgid "Summary"
msgstr "Агульныя зьвесткі"
@@ -981,7 +940,7 @@ msgstr "Агульныя зьвесткі"
msgid "Configure"
msgstr "Настройка"
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
#, fuzzy, c-format
msgid "not configured"
msgstr "Настроіць панэль"
@@ -991,14 +950,14 @@ msgstr "Настроіць панэль"
msgid "Media Selection"
msgstr "Выбар групы пакетаў"
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
#, c-format
msgid ""
"The following installation media have been found.\n"
"If you want to skip some of them, you can unselect them now."
msgstr ""
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
#, c-format
msgid ""
"You have the option to copy the contents of the CDs onto the hard drive "
@@ -1007,7 +966,7 @@ msgid ""
"available once the system is fully installed."
msgstr ""
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
#, c-format
msgid "Copy whole CDs"
msgstr ""
@@ -1027,59 +986,49 @@ msgstr "Калі ласка, абярыце тып клавіятуры"
msgid "Here is the full list of available keyboards:"
msgstr ""
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
#, fuzzy, c-format
msgid "Install/Upgrade"
msgstr "Усталёўваем"
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
#, c-format
msgid "Is this an install or an upgrade?"
msgstr ""
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
#, fuzzy, c-format
msgid ""
"_: This is a noun:\n"
"Install"
msgstr "Усталёўка"
-#: steps_interactive.pm:147
-#, c-format
-msgid "Upgrade %s"
-msgstr ""
-
#: steps_interactive.pm:151
#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
+msgid "Upgrade %s"
msgstr ""
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
#, c-format
msgid "Encryption key for %s"
msgstr ""
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
#, c-format
msgid "Cancel installation, reboot system"
msgstr ""
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
#, fuzzy, c-format
msgid "New Installation"
msgstr "Усталёўваем"
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
#, c-format
msgid "Upgrade previous installation (not recommended)"
msgstr ""
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
#, c-format
msgid ""
"Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1091,24 +1040,24 @@ msgid ""
"Installation\"."
msgstr ""
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "IDE"
msgstr "IDE"
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "Configuring IDE"
msgstr "Настройка IDE"
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
#, c-format
msgid ""
"No free space for 1MB bootstrap! Install will continue, but to boot your "
"system, you'll need to create the bootstrap partition in DiskDrake"
msgstr ""
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
#, c-format
msgid ""
"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1116,7 +1065,7 @@ msgid ""
"DiskDrake"
msgstr ""
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
#, fuzzy, c-format
msgid ""
"Change your Cd-Rom!\n"
@@ -1131,153 +1080,153 @@ msgstr ""
"Калі вы не маеце яго, націсніце Адмяніць, каб адмяніць усталяванне з гэтага "
"Cd."
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
#, c-format
msgid "Looking for available packages..."
msgstr "Прагляд даступных пакетаў"
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
#, c-format
msgid ""
"Your system does not have enough space left for installation or upgrade (%"
"dMB > %dMB)"
msgstr ""
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
#, c-format
msgid ""
"Please choose load or save package selection.\n"
"The format is the same as auto_install generated files."
msgstr ""
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Load"
msgstr "Загрузка"
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Save"
msgstr "Захаваць"
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
#, fuzzy, c-format
msgid "Bad file"
msgstr "Загрузка файла"
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
#, fuzzy, c-format
msgid "KDE"
msgstr "IDE"
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
#, c-format
msgid "GNOME"
msgstr "GNOME"
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
#, fuzzy, c-format
msgid "Desktop Selection"
msgstr "Выбар групы пакетаў"
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
#, c-format
msgid "You can choose your workstation desktop profile."
msgstr ""
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
#, c-format
msgid "Selected size is larger than available space"
msgstr ""
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
#, c-format
msgid "Type of install"
msgstr ""
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
#, c-format
msgid ""
"You have not selected any group of packages.\n"
"Please choose the minimal installation you want:"
msgstr ""
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
#, c-format
msgid "With X"
msgstr ""
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
#, c-format
msgid "With basic documentation (recommended!)"
msgstr ""
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
#, c-format
msgid "Truly minimal install (especially no urpmi)"
msgstr ""
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
#, c-format
msgid "Preparing installation"
msgstr "Падрыхтоўка ўсталяваньня"
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
#, c-format
msgid "Installing package %s"
msgstr "Усталяванне пакету %s"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "There was an error ordering packages:"
msgstr "Атрымалася памылка ўпарадкавання пакетаў:"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "Go on anyway?"
msgstr "Усё роўна працягваць?"
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
#, c-format
msgid "Retry"
msgstr ""
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
#, c-format
msgid "Skip this package"
msgstr ""
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
#, c-format
msgid "Skip all packages from medium \"%s\""
msgstr ""
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
#, fuzzy, c-format
msgid "Go back to media and packages selection"
msgstr "Асабісты выбар пакетаў"
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
#, fuzzy, c-format
msgid "There was an error installing package %s."
msgstr "Атрымалася памылка ўпарадкавання пакетаў:"
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
#, c-format
msgid "Post-install configuration"
msgstr "Настройка пасля ўсталявання"
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
#, c-format
msgid "Please ensure the Update Modules media is in drive %s"
msgstr ""
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
#, fuzzy, c-format
msgid "Updates"
msgstr "Аднавіць"
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
#, c-format
msgid ""
"You now have the opportunity to download updated packages. These packages\n"
@@ -1290,95 +1239,95 @@ msgid ""
"Do you want to install the updates?"
msgstr ""
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
#, c-format
msgid "%s on %s"
msgstr "%s на %s"
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
#, c-format
msgid "Hardware"
msgstr "Абсталяваньне"
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
#, fuzzy, c-format
msgid "Sound card"
msgstr "Праграма гуказапісу"
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
#, fuzzy, c-format
msgid "Do you have an ISA sound card?"
msgstr "Ці ёсць у вас іншы?"
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
#, c-format
msgid ""
"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
"card"
msgstr ""
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
#, c-format
msgid "No sound card detected. Try \"harddrake\" after installation"
msgstr ""
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
#, fuzzy, c-format
msgid "Graphical interface"
msgstr "Запуск X пры старце сістэмы"
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
#, fuzzy, c-format
msgid "Network & Internet"
msgstr "Сеткавы інтэрфейс"
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
#, fuzzy, c-format
msgid "Proxies"
msgstr "Проксі"
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
#, fuzzy, c-format
msgid "configured"
msgstr "Настроіць панэль"
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
#, c-format
msgid "Security Level"
msgstr "Узровень бясьпекі"
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
#, c-format
msgid "Firewall"
msgstr ""
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "activated"
msgstr ""
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "disabled"
msgstr "выключаны"
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
#, fuzzy, c-format
msgid "You have not configured X. Are you sure you really want this?"
msgstr "Меню не было захавана. Ці сапраўды вы жадаеце выйсці?"
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
#, c-format
msgid "Preparing bootloader..."
msgstr "Падрыхтоўка загрузчыка"
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
#, c-format
msgid "Be patient, this may take a while..."
msgstr ""
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
#, c-format
msgid ""
"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1387,24 +1336,24 @@ msgid ""
"root fs is: root=%s"
msgstr ""
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
#, c-format
msgid ""
"In this security level, access to the files in the Windows partition is "
"restricted to the administrator."
msgstr ""
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr "Устаўце дыскету ў дыскавод %s"
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
#, c-format
msgid "Creating auto install floppy..."
msgstr "Стварэнне дыскеты для ўсталявання"
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
#, c-format
msgid ""
"Some steps are not completed.\n"
@@ -1414,7 +1363,7 @@ msgstr ""
"Некаторыя крокі не завершаны.\n"
"Вы сапраўды жадаеце выйсці зараз?"
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
#, fuzzy, c-format
msgid "Congratulations"
msgstr "Прыміце віншаванні!"
@@ -1559,6 +1508,10 @@ msgid ""
msgstr "Выход"
#, fuzzy
+#~ msgid "Downloading file %s..."
+#~ msgstr "Вызначэнне прыладаў..."
+
+#, fuzzy
#~ msgid "IceWm Desktop"
#~ msgstr "Працоўны стол"
diff --git a/perl-install/install/share/po/bg.po b/perl-install/install/share/po/bg.po
index 28eaf5885..878164a88 100644
--- a/perl-install/install/share/po/bg.po
+++ b/perl-install/install/share/po/bg.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: DrakX-bg\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
"PO-Revision-Date: 2009-03-20 23:42+0200\n"
"Last-Translator: Kolio Kolev <kolio_kolev@biotronica.net>\n"
"Language-Team: Bulgarian <Mandriva User Group - Bulgaria <mandriva-"
@@ -22,31 +22,6 @@ msgstr ""
"X-Generator: Lokalize 0.3\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr ""
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr ""
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr ""
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr ""
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr ""
-
#: any.pm:109
#, fuzzy, c-format
msgid "Do you have further supplementary media?"
@@ -82,17 +57,17 @@ msgstr "Мрежа %s"
msgid "Network (NFS)"
msgstr ""
-#: any.pm:163
+#: any.pm:165
#, c-format
msgid "URL of the mirror?"
msgstr ""
-#: any.pm:169
+#: any.pm:171
#, c-format
msgid "URL must start with ftp:// or http://"
msgstr ""
-#: any.pm:180
+#: any.pm:182
#, c-format
msgid ""
"Contacting Mandriva Linux web site to get the list of available mirrors..."
@@ -100,7 +75,7 @@ msgstr ""
"Свързване с Mandriva Linux web сайт за получаване на списъка с налични "
"огледални сървъри..."
-#: any.pm:185
+#: any.pm:187
#, fuzzy, c-format
msgid ""
"Failed contacting Mandriva Linux web site to get the list of available "
@@ -109,69 +84,69 @@ msgstr ""
"Свързване с Mandriva Linux web сайт за получаване на списъка с налични "
"огледални сървъри..."
-#: any.pm:195
+#: any.pm:197
#, c-format
msgid "Choose a mirror from which to get the packages"
msgstr "Изберете огледален сървър,от който да получите пакетите"
-#: any.pm:225
+#: any.pm:227
#, c-format
msgid "NFS setup"
msgstr ""
-#: any.pm:226
+#: any.pm:228
#, c-format
msgid "Please enter the hostname and directory of your NFS media"
msgstr ""
-#: any.pm:230
+#: any.pm:232
#, c-format
msgid "Hostname missing"
msgstr ""
-#: any.pm:231
+#: any.pm:233
#, c-format
msgid "Directory must begin with \"/\""
msgstr ""
-#: any.pm:235
+#: any.pm:237
#, c-format
msgid "Hostname of the NFS mount ?"
msgstr ""
-#: any.pm:236
+#: any.pm:238
#, c-format
msgid "Directory"
msgstr "Директория"
-#: any.pm:258
+#: any.pm:260
#, c-format
msgid "Supplementary"
msgstr ""
-#: any.pm:293
+#: any.pm:295
#, fuzzy, c-format
msgid ""
"Can't find a package list file on this mirror. Make sure the location is "
"correct."
msgstr "Не мога да намеря %s на %s"
-#: any.pm:328
+#: any.pm:334
#, c-format
msgid "Looking at packages already installed..."
msgstr "Търси във вече инсталираните пакети..."
-#: any.pm:362
+#: any.pm:368
#, c-format
msgid "Finding packages to upgrade..."
msgstr "Търся пакети за обновяване"
-#: any.pm:381
+#: any.pm:387
#, c-format
msgid "Removing packages prior to upgrade..."
msgstr ""
-#: any.pm:402
+#: any.pm:408
#, c-format
msgid ""
"You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -183,18 +158,18 @@ msgid ""
"please reboot your system and upgrade using the Mandriva update applet."
msgstr ""
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
#, c-format
msgid "Reboot"
msgstr "Престартира"
-#: any.pm:407
+#: any.pm:413
#, c-format
msgid "Proceed"
msgstr ""
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -208,72 +183,72 @@ msgstr ""
"\n"
"Действително ли искате да изтриете тези пакети?\n"
-#: any.pm:815
+#: any.pm:821
#, c-format
msgid "Error reading file %s"
msgstr "Грешка при четенето на файла %s"
-#: any.pm:1022
+#: any.pm:1028
#, fuzzy, c-format
msgid "The following disk(s) were renamed:"
msgstr "Следните пакети ще трябва да се инсталират:\n"
-#: any.pm:1024
+#: any.pm:1030
#, c-format
msgid "%s (previously named as %s)"
msgstr ""
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "HTTP"
msgstr "HTTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "FTP"
msgstr "FTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "NFS"
msgstr "NFS"
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
#, c-format
msgid "Network"
msgstr "Мрежа"
-#: any.pm:1104
+#: any.pm:1110
#, fuzzy, c-format
msgid "Please choose a media"
msgstr "Моля изберете"
-#: any.pm:1120
+#: any.pm:1126
#, fuzzy, c-format
msgid "File already exists. Overwrite it?"
msgstr "Файлът съществува. Да бъде ли презаписан?"
-#: any.pm:1124
+#: any.pm:1130
#, c-format
msgid "Permission denied"
msgstr "Лисват права"
-#: any.pm:1172
+#: any.pm:1178
#, c-format
msgid "Bad NFS name"
msgstr ""
-#: any.pm:1193
+#: any.pm:1199
#, fuzzy, c-format
msgid "Bad media %s"
msgstr "добавен източник %s"
-#: any.pm:1236
+#: any.pm:1242
#, c-format
msgid "Can not make screenshots before partitioning"
msgstr "Не мога да направя моментна \"снимка\" преди разделянето на диска "
-#: any.pm:1244
+#: any.pm:1250
#, c-format
msgid "Screenshots will be available after install in %s"
msgstr "Снимки ще бъдат налични след инсталиране в %s"
@@ -284,11 +259,15 @@ msgid "Installation"
msgstr "Инсталирам"
#: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
#, c-format
msgid "Configuration"
msgstr "Настройка"
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
#: install2.pm:168
#, c-format
msgid "You must also format %s"
@@ -314,22 +293,22 @@ msgstr "Включвам мрежата"
msgid "Bringing down the network"
msgstr "Изключване на мрежата"
-#: media.pm:402
+#: media.pm:399
#, c-format
msgid "Please wait, retrieving file"
msgstr ""
-#: media.pm:734
-#, fuzzy, c-format
-msgid "Downloading file %s..."
-msgstr "Изпращам файлове..."
+#: media.pm:718
+#, c-format
+msgid "unable to add medium"
+msgstr ""
-#: media.pm:822
+#: media.pm:758
#, c-format
msgid "Copying some packages on disks for future use"
msgstr ""
-#: media.pm:875
+#: media.pm:811
#, fuzzy, c-format
msgid "Copying in progress"
msgstr "Откриване в прогрес"
@@ -371,27 +350,27 @@ msgstr ""
msgid "An error occurred:"
msgstr "Появи се грешка"
-#: pkgs.pm:776
+#: pkgs.pm:780
#, c-format
msgid "%d installation transactions failed"
msgstr "%d инсталационни транзакции пропаднаха"
-#: pkgs.pm:777
+#: pkgs.pm:781
#, fuzzy, c-format
msgid "Installation of packages failed:"
msgstr "Инсталиране на пакета %s"
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
#, c-format
msgid "Workstation"
msgstr "Работна станция"
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
#, c-format
msgid "Office Workstation"
msgstr "Офисна работна станция"
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
#, c-format
msgid ""
"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -400,7 +379,7 @@ msgstr ""
"Офис програми: word-процесори (OpenOffice.org Writer, Kword), таблици "
"(OpenOffice.org Calc, Kspread), преглед на PDF, и т.н."
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
#, c-format
msgid ""
"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -409,32 +388,32 @@ msgstr ""
"Офис програми: word-процесори (kword, abiword), таблици (kspread, gnumeric), "
"преглед на PDF, и т.н."
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
#, c-format
msgid "Game station"
msgstr "Игрална станция"
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
#, c-format
msgid "Amusement programs: arcade, boards, strategy, etc"
msgstr "Забавни програми: аркадни игри, игри на маса, стратегии и т.н."
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
#, c-format
msgid "Multimedia station"
msgstr "Мутимедийна станция"
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
#, c-format
msgid "Sound and video playing/editing programs"
msgstr "Програми за пускане/поправяне на звук и видео"
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
#, c-format
msgid "Internet station"
msgstr "Интернет станция"
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
#, fuzzy, c-format
msgid ""
"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -443,211 +422,193 @@ msgstr ""
"Набор от инструменти за четене и изпращане на поща и новини (pine, mutt, "
"tin..) и за обикаляне из Мрежата"
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
#, c-format
msgid "Network Computer (client)"
msgstr "Мрежов компютър (клиент)"
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
#, c-format
msgid "Clients for different protocols including ssh"
msgstr "Клиенти за различни протоколи включително SSH"
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
#, c-format
msgid "Tools to ease the configuration of your computer"
msgstr "Инструменти за улесняване настройката на компютъра ви"
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
#, c-format
msgid "Console Tools"
msgstr "Конзолни инструменти"
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
#, c-format
msgid "Editors, shells, file tools, terminals"
msgstr "Редактори, шелове, файлови инстрименти, терминали"
#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
#, c-format
msgid "Development"
msgstr "Разработка"
#: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
#, c-format
msgid "C and C++ development libraries, programs and include files"
msgstr "Библиотеки за разработка на C и C++, програми и include файлове"
#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
#, c-format
msgid "Documentation"
msgstr "Документация"
#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
#, c-format
msgid "Books and Howto's on Linux and Free Software"
msgstr "Книги и HOTWO-та за Linux и свободния софтуер"
#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
#, c-format
msgid "LSB"
msgstr ""
#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
#, c-format
msgid "Linux Standard Base. Third party applications support"
msgstr ""
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
#, c-format
msgid "Web Server"
msgstr "Web Сървър"
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
#, c-format
msgid "Apache"
msgstr "Apache"
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
#, c-format
msgid "Groupware"
msgstr "Групуер"
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
#, c-format
msgid "Kolab Server"
msgstr "Kolab Сървър"
#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
#, c-format
msgid "Firewall/Router"
msgstr "Сървър, Firewall/Рутер"
#: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
#, c-format
msgid "Internet gateway"
msgstr "Интернет gateway"
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
#, fuzzy, c-format
msgid "Mail/News"
msgstr "/Файл/_Нов"
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
#, fuzzy, c-format
msgid "Postfix mail server, Inn news server"
msgstr "Postfix пощенски сървър"
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
#, c-format
msgid "Directory Server"
msgstr "Сървър с директории"
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
#, c-format
msgid "FTP Server"
msgstr "FTP сървър"
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
#, c-format
msgid "ProFTPd"
msgstr ""
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
#, fuzzy, c-format
msgid "DNS/NIS"
msgstr "FND/NIS"
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
#, c-format
msgid "Domain Name and Network Information Server"
msgstr "Име на домейн и Мрежов Информационен Сървър"
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
#, fuzzy, c-format
msgid "File and Printer Sharing Server"
msgstr "Сървър на принтера"
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
#, fuzzy, c-format
msgid "NFS Server, Samba server"
msgstr "Samba Сървър"
#: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
#, c-format
msgid "Database"
msgstr "Сървър, Бази-данни"
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
#, fuzzy, c-format
msgid "PostgreSQL and MySQL Database Server"
msgstr "PostgreSQL или MySQL сървър за бази-данни"
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
#, c-format
msgid "Web/FTP"
msgstr "Сървър, Web/FTP"
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
#, c-format
msgid "Apache, Pro-ftpd"
msgstr "Apache и Pro-ftpd"
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
#, c-format
msgid "Mail"
msgstr "Е-поща"
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
#, c-format
msgid "Postfix mail server"
msgstr "Postfix пощенски сървър"
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
#, c-format
msgid "PostgreSQL or MySQL database server"
msgstr "PostgreSQL или MySQL сървър за бази-данни"
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
#, c-format
msgid "Network Computer server"
msgstr "Мрежов компютър, сървър"
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
#, c-format
msgid "NFS server, SMB server, Proxy server, ssh server"
msgstr "NFS сървър, SMB сървър, Proxy сървър, SSH сървър"
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
#, c-format
msgid "Graphical Environment"
msgstr "Графична среда"
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
#, c-format
msgid "KDE Workstation"
msgstr "KDE работна станция"
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
#, c-format
msgid ""
"The K Desktop Environment, the basic graphical environment with a collection "
@@ -656,12 +617,12 @@ msgstr ""
"The K Desktop Environment, проста среда с колекция от придружаващи "
"инструменти"
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
#, c-format
msgid "GNOME Workstation"
msgstr "Gnome работна станция"
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
#, c-format
msgid ""
"A graphical environment with user-friendly set of applications and desktop "
@@ -669,7 +630,7 @@ msgid ""
msgstr ""
"Графична среда с потребителски набор от приложения и desktop инструменти"
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
#, fuzzy, c-format
msgid "LXDE Desktop"
msgstr "настолен компютър"
@@ -682,54 +643,52 @@ msgid ""
msgstr ""
"Графична среда с потребителски набор от приложения и desktop инструменти"
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
#, c-format
msgid "Other Graphical Desktops"
msgstr "Други графични desktop-и"
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
#, fuzzy, c-format
msgid "Window Maker, Enlightenment, Fvwm, etc"
msgstr "Icewm, Window Maker, Enlightenment, Fvwm и т.н."
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
#, c-format
msgid "Utilities"
msgstr "Помощни програми"
#: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
#, c-format
msgid "SSH Server"
msgstr "SSH Сървър"
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
#, fuzzy, c-format
msgid "Webmin"
msgstr "Webmin Обслужване"
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
#, fuzzy, c-format
msgid "Webmin Remote Configuration Server"
msgstr "Конфигурация на Терминален Сървър в Mandriva Linux"
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
#, fuzzy, c-format
msgid "Network Utilities/Monitoring"
msgstr "Мониторинг на мрежата"
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
#, c-format
msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
msgstr ""
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
#, fuzzy, c-format
msgid "Mandriva Wizards"
msgstr "Контролен център на Mandriva Linux"
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
#, fuzzy, c-format
msgid "Wizards to configure server"
msgstr "ННеуспешна настройка на принтер \"%s\"!"
@@ -829,17 +788,17 @@ msgstr ""
msgid "Click on images in order to see a bigger preview"
msgstr ""
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
#, c-format
msgid "Package Group Selection"
msgstr "Избор на група пакети"
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
#, c-format
msgid "Individual package selection"
msgstr "Избиране на пакети един по един"
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
#, c-format
msgid "Total size: %d / %d MB"
msgstr "Обща големина: %d / %d MB"
@@ -958,12 +917,12 @@ msgstr "Миминална инсталация"
msgid "Software Management"
msgstr "Управление на софтуер"
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
#, c-format
msgid "Choose the packages you want to install"
msgstr "Изберете пакетите, които искате да инсталирате"
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
#, c-format
msgid "Installing"
msgstr "Инсталирам"
@@ -990,7 +949,7 @@ msgid_plural "%d packages"
msgstr[0] "%d пакета"
msgstr[1] "%d пакета"
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
#, c-format
msgid "Summary"
msgstr "Обобщение"
@@ -1000,7 +959,7 @@ msgstr "Обобщение"
msgid "Configure"
msgstr "Настройка"
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
#, c-format
msgid "not configured"
msgstr "не е конфигуриран"
@@ -1010,14 +969,14 @@ msgstr "не е конфигуриран"
msgid "Media Selection"
msgstr "Избор на група пакети"
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
#, c-format
msgid ""
"The following installation media have been found.\n"
"If you want to skip some of them, you can unselect them now."
msgstr ""
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
#, c-format
msgid ""
"You have the option to copy the contents of the CDs onto the hard drive "
@@ -1026,7 +985,7 @@ msgid ""
"available once the system is fully installed."
msgstr ""
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
#, c-format
msgid "Copy whole CDs"
msgstr ""
@@ -1046,59 +1005,49 @@ msgstr "Моля, изберете подреждане на клавиатур
msgid "Here is the full list of available keyboards:"
msgstr "Ето пълен списък на достръпните страни"
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
#, c-format
msgid "Install/Upgrade"
msgstr "Инсталирай/Обнови"
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
#, c-format
msgid "Is this an install or an upgrade?"
msgstr "Това нова инсталация ли е или обновяване ?"
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
#, fuzzy, c-format
msgid ""
"_: This is a noun:\n"
"Install"
msgstr "Инсталирай"
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
#, c-format
msgid "Upgrade %s"
msgstr "Обновява %s"
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
#, c-format
msgid "Encryption key for %s"
msgstr "Ключ за криптиране на %s"
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
#, c-format
msgid "Cancel installation, reboot system"
msgstr ""
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
#, fuzzy, c-format
msgid "New Installation"
msgstr "Инсталирам"
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
#, c-format
msgid "Upgrade previous installation (not recommended)"
msgstr ""
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
#, c-format
msgid ""
"Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1110,17 +1059,17 @@ msgid ""
"Installation\"."
msgstr ""
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "IDE"
msgstr "IDE"
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "Configuring IDE"
msgstr "Настройка на IDE"
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
#, c-format
msgid ""
"No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1130,7 +1079,7 @@ msgstr ""
"за да стартирате системата си, ще трябва да създадете стартиращо поле в "
"DiskDrake"
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
#, fuzzy, c-format
msgid ""
"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1141,7 +1090,7 @@ msgstr ""
"за да стартирате системата си, ще трябва да създадете стартиращо поле в "
"DiskDrake"
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
#, fuzzy, c-format
msgid ""
"Change your Cd-Rom!\n"
@@ -1156,19 +1105,19 @@ msgstr ""
"Ако го нямате, натиснете Отмяна, за да избегнете инсталирането от този CD-"
"ROM."
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
#, c-format
msgid "Looking for available packages..."
msgstr "Търся налични пакети..."
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
#, c-format
msgid ""
"Your system does not have enough space left for installation or upgrade (%"
"dMB > %dMB)"
msgstr ""
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
#, fuzzy, c-format
msgid ""
"Please choose load or save package selection.\n"
@@ -1177,52 +1126,52 @@ msgstr ""
"Може изберете зареждане или запис на избора на пакети на флопи.\n"
"Форматът е същият като auto_install генерираните дискети."
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Load"
msgstr "Натовареност"
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Save"
msgstr "Запазва"
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
#, fuzzy, c-format
msgid "Bad file"
msgstr "Зареждане на файл"
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
#, fuzzy, c-format
msgid "KDE"
msgstr "IDE"
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
#, c-format
msgid "GNOME"
msgstr "GNOME"
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
#, fuzzy, c-format
msgid "Desktop Selection"
msgstr "Избор на група пакети"
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
#, c-format
msgid "You can choose your workstation desktop profile."
msgstr ""
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
#, c-format
msgid "Selected size is larger than available space"
msgstr "Избраната големина е по-голяма от достъпното пространство"
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
#, c-format
msgid "Type of install"
msgstr "Тип инсталация"
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
#, c-format
msgid ""
"You have not selected any group of packages.\n"
@@ -1231,82 +1180,82 @@ msgstr ""
"Вие не сте избрали никаква група от пакети.\n"
"Моля, изберете минималната инсталация кояти искате:"
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
#, c-format
msgid "With X"
msgstr "С X"
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
#, c-format
msgid "With basic documentation (recommended!)"
msgstr "С базова документация (препоръчва се!)"
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
#, c-format
msgid "Truly minimal install (especially no urpmi)"
msgstr "Наистина минимална инсталация (особенно без urpmi)"
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
#, c-format
msgid "Preparing installation"
msgstr "Подготвям инсталацията"
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
#, c-format
msgid "Installing package %s"
msgstr "Инсталиране на пакета %s"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "There was an error ordering packages:"
msgstr "Появи се грешка при поръчването на пакетите:"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "Go on anyway?"
msgstr "Да продължа ли все пак ?"
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
#, c-format
msgid "Retry"
msgstr ""
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
#, c-format
msgid "Skip this package"
msgstr ""
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
#, c-format
msgid "Skip all packages from medium \"%s\""
msgstr ""
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
#, fuzzy, c-format
msgid "Go back to media and packages selection"
msgstr "Запази избор на пакети"
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
#, fuzzy, c-format
msgid "There was an error installing package %s."
msgstr "Появи се грешка при инсталиране на пакетите:"
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
#, c-format
msgid "Post-install configuration"
msgstr "След инсталационна настройка"
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
#, c-format
msgid "Please ensure the Update Modules media is in drive %s"
msgstr ""
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
#, c-format
msgid "Updates"
msgstr "Обновяване"
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
#, c-format
msgid ""
"You now have the opportunity to download updated packages. These packages\n"
@@ -1319,28 +1268,28 @@ msgid ""
"Do you want to install the updates?"
msgstr ""
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
#, c-format
msgid "%s on %s"
msgstr "%s на %s"
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
#, c-format
msgid "Hardware"
msgstr "Хардуер"
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
#, c-format
msgid "Sound card"
msgstr "Звукова карта"
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
#, c-format
msgid "Do you have an ISA sound card?"
msgstr "Имате ли ISA звукова карта?"
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
#, fuzzy, c-format
msgid ""
"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1349,67 +1298,67 @@ msgstr ""
"Изпълнете \"sndconfig\" след инсталация за да конфигурирате вашата звукова "
"карта"
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
#, c-format
msgid "No sound card detected. Try \"harddrake\" after installation"
msgstr "Няма открита звукова карта. Опитайте \"harddrake\" след инсталацията"
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
#, c-format
msgid "Graphical interface"
msgstr "Графичен интерфайс"
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
#, c-format
msgid "Network & Internet"
msgstr "Мрежа и интернет"
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
#, fuzzy, c-format
msgid "Proxies"
msgstr "Профил "
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
#, fuzzy, c-format
msgid "configured"
msgstr "пренастройка"
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
#, c-format
msgid "Security Level"
msgstr "Ниво на защита"
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
#, c-format
msgid "Firewall"
msgstr "Защитна стена"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "activated"
msgstr "активирано"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "disabled"
msgstr "изключен"
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
#, c-format
msgid "You have not configured X. Are you sure you really want this?"
msgstr "Вие не сте конфигурирали X. Сигурни ли сте, че искате това?"
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
#, c-format
msgid "Preparing bootloader..."
msgstr "Подготовка на bootloader"
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
#, c-format
msgid "Be patient, this may take a while..."
msgstr ""
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
#, fuzzy, c-format
msgid ""
"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1422,24 +1371,24 @@ msgstr ""
"Инсталацията ще продължи, но ще трябва\n"
"да иползвате BootX, за да стартирате машината си"
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
#, c-format
msgid ""
"In this security level, access to the files in the Windows partition is "
"restricted to the administrator."
msgstr ""
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr "Сложете празна дискета в устройство %s"
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
#, c-format
msgid "Creating auto install floppy..."
msgstr "Подготвям дискета с автоматична инсталация"
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
#, c-format
msgid ""
"Some steps are not completed.\n"
@@ -1450,7 +1399,7 @@ msgstr ""
"\n"
"Наистина ли искате да излезете сега ?"
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
#, c-format
msgid "Congratulations"
msgstr "Поздравления"
@@ -1594,6 +1543,10 @@ msgid ""
"Exit"
msgstr "Излез"
+#, fuzzy
+#~ msgid "Downloading file %s..."
+#~ msgstr "Изпращам файлове..."
+
#~ msgid ""
#~ "You have selected the following server(s): %s\n"
#~ "\n"
diff --git a/perl-install/install/share/po/bn.po b/perl-install/install/share/po/bn.po
index f73fb02dc..05b18cf9e 100644
--- a/perl-install/install/share/po/bn.po
+++ b/perl-install/install/share/po/bn.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: DrakX HEAD\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
"PO-Revision-Date: 2007-02-19 00:44+0600\n"
"Last-Translator: Tisa Nafisa <tisa_nafisa@yahoo.com>\n"
"Language-Team: Bangla <mdk-translation@bengalinux.org>\n"
@@ -19,31 +19,6 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr ""
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr ""
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr ""
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr ""
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr ""
-
#: any.pm:109
#, c-format
msgid "Do you have further supplementary media?"
@@ -83,92 +58,92 @@ msgstr "নেটওয়ার্ক (FTP)"
msgid "Network (NFS)"
msgstr "নেটওয়ার্ক (NFS)"
-#: any.pm:163
+#: any.pm:165
#, c-format
msgid "URL of the mirror?"
msgstr "mirror এর ইউ-আর-এল?"
-#: any.pm:169
+#: any.pm:171
#, c-format
msgid "URL must start with ftp:// or http://"
msgstr "ইউআরএল অবশ্যই ftp:// অথবা http:// দিয়ে শুরু হবে"
-#: any.pm:180
+#: any.pm:182
#, c-format
msgid ""
"Contacting Mandriva Linux web site to get the list of available mirrors..."
msgstr "উপস্থিত মিররের তালিকার জন্য Mandriva Linux-এ সংযুক্ত করা হচ্ছে..."
-#: any.pm:185
+#: any.pm:187
#, c-format
msgid ""
"Failed contacting Mandriva Linux web site to get the list of available "
"mirrors"
msgstr "উপস্থিত মিররের তালিকার জন্য Mandriva Linux-এ যোগাযোগ করতে ব্যর্থ হয়েছে..."
-#: any.pm:195
+#: any.pm:197
#, c-format
msgid "Choose a mirror from which to get the packages"
msgstr "আপনি একটি মিরর পছন্দ করুন যেখান থেকে প্যাকেজগুলি নেবেন"
-#: any.pm:225
+#: any.pm:227
#, c-format
msgid "NFS setup"
msgstr "NFS সেটআপ"
-#: any.pm:226
+#: any.pm:228
#, c-format
msgid "Please enter the hostname and directory of your NFS media"
msgstr "অনুগ্রহ করে আপনার NFS মিডিয়ার হোস্টনাম এবং ডিরেক্টরী প্রবেশ করান"
-#: any.pm:230
+#: any.pm:232
#, c-format
msgid "Hostname missing"
msgstr "হোস্টনাম পাওয়া যাচ্ছে না"
-#: any.pm:231
+#: any.pm:233
#, c-format
msgid "Directory must begin with \"/\""
msgstr "ডিরেক্টরী অবশ্যই \"/\" দিয়ে শুরু হবে"
-#: any.pm:235
+#: any.pm:237
#, c-format
msgid "Hostname of the NFS mount ?"
msgstr "NFS মাউন্টের জন্য হোস্টনাম ?"
-#: any.pm:236
+#: any.pm:238
#, c-format
msgid "Directory"
msgstr "ডিরেক্টরি"
-#: any.pm:258
+#: any.pm:260
#, c-format
msgid "Supplementary"
msgstr "সম্পুরক"
-#: any.pm:293
+#: any.pm:295
#, c-format
msgid ""
"Can't find a package list file on this mirror. Make sure the location is "
"correct."
msgstr "এই mirror এ কোন hdlist ফাইল পাওয়া যাচ্ছে না"
-#: any.pm:328
+#: any.pm:334
#, c-format
msgid "Looking at packages already installed..."
msgstr "যে সমস্থ প্যাকেজ ইনস্টল হয়ে আছে সেগুলি পর্যবেক্ষন করা হচ্ছে..."
-#: any.pm:362
+#: any.pm:368
#, c-format
msgid "Finding packages to upgrade..."
msgstr "আপগ্রেড করার জন্য প্যাকেজ খোঁজা হচ্ছে..."
-#: any.pm:381
+#: any.pm:387
#, c-format
msgid "Removing packages prior to upgrade..."
msgstr "আপগ্রেডের পূর্বে প্যাকেজ মুছে ফেলা হচ্ছে..."
-#: any.pm:402
+#: any.pm:408
#, c-format
msgid ""
"You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -180,18 +155,18 @@ msgid ""
"please reboot your system and upgrade using the Mandriva update applet."
msgstr ""
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
#, c-format
msgid "Reboot"
msgstr "রিবুট"
-#: any.pm:407
+#: any.pm:413
#, c-format
msgid "Proceed"
msgstr ""
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -204,72 +179,72 @@ msgstr ""
"\n"
"আপনি কি আসলেই এই প্যাকেজগুলো মুছে ফেলতে চান?\n"
-#: any.pm:815
+#: any.pm:821
#, c-format
msgid "Error reading file %s"
msgstr "%s ফাইল পড়াতে ত্রুটি"
-#: any.pm:1022
+#: any.pm:1028
#, c-format
msgid "The following disk(s) were renamed:"
msgstr "নিম্নলিখিত ডিস্কগুলো নামান্তর করা হয়েছে:"
-#: any.pm:1024
+#: any.pm:1030
#, c-format
msgid "%s (previously named as %s)"
msgstr "%s (পূর্বের নাম %s)"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "HTTP"
msgstr "এইচ-টি-টি-পি"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "FTP"
msgstr "এফ-টি-পি"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "NFS"
msgstr "NFS"
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
#, c-format
msgid "Network"
msgstr "নেটওয়ার্ক"
-#: any.pm:1104
+#: any.pm:1110
#, c-format
msgid "Please choose a media"
msgstr "অনুগ্রহ করে একটি মিডিয়া নির্বাচন করুন"
-#: any.pm:1120
+#: any.pm:1126
#, c-format
msgid "File already exists. Overwrite it?"
msgstr "এই ফাইলটি আগে থেকেই আছে। করব?"
-#: any.pm:1124
+#: any.pm:1130
#, c-format
msgid "Permission denied"
msgstr "অনুমতি প্রদান করা হয়নি"
-#: any.pm:1172
+#: any.pm:1178
#, c-format
msgid "Bad NFS name"
msgstr "ত্রুটিপূর্ণ NFS নাম"
-#: any.pm:1193
+#: any.pm:1199
#, c-format
msgid "Bad media %s"
msgstr "অগ্রহণযোগ্য মিডিয়া %s"
-#: any.pm:1236
+#: any.pm:1242
#, c-format
msgid "Can not make screenshots before partitioning"
msgstr "পার্টিশন করার আগে স্ক্রিনশট তৈরী করা যায়নি"
-#: any.pm:1244
+#: any.pm:1250
#, c-format
msgid "Screenshots will be available after install in %s"
msgstr "%s -এ ইনস্টল করার পরে স্ক্রিনশট পাওয়া যাবে"
@@ -280,11 +255,15 @@ msgid "Installation"
msgstr " ইনস্টলেশন"
#: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
#, c-format
msgid "Configuration"
msgstr "কনফিগারেশন"
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
#: install2.pm:168
#, c-format
msgid "You must also format %s"
@@ -309,22 +288,22 @@ msgstr "নেটওয়ার্ককে চালু করা হচ্ছে
msgid "Bringing down the network"
msgstr "নেটওয়ার্ককে বন্ধ করা হচ্ছে"
-#: media.pm:402
+#: media.pm:399
#, c-format
msgid "Please wait, retrieving file"
msgstr ""
-#: media.pm:734
+#: media.pm:718
#, c-format
-msgid "Downloading file %s..."
-msgstr "%s ফাইল ডাউনলোড করা হচ্ছে..."
+msgid "unable to add medium"
+msgstr ""
-#: media.pm:822
+#: media.pm:758
#, c-format
msgid "Copying some packages on disks for future use"
msgstr "ভবিষ্যতে ব্যবহারের জন্য ডিস্কে কিছু প্যাকেজ কপি করা হচ্ছে"
-#: media.pm:875
+#: media.pm:811
#, c-format
msgid "Copying in progress"
msgstr "কপি সম্পন্ন হচ্ছে"
@@ -366,27 +345,27 @@ msgstr ""
msgid "An error occurred:"
msgstr "একটি ত্রুটি সম্পাদিত হয়েছে"
-#: pkgs.pm:776
+#: pkgs.pm:780
#, fuzzy, c-format
msgid "%d installation transactions failed"
msgstr "ইনস্টলেশন বিফল হয়েছে"
-#: pkgs.pm:777
+#: pkgs.pm:781
#, fuzzy, c-format
msgid "Installation of packages failed:"
msgstr "%s প্যাকেজ সমূহ ইনস্টল করা হচ্ছে"
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
#, c-format
msgid "Workstation"
msgstr "ওয়ার্কষ্টেশন"
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
#, c-format
msgid "Office Workstation"
msgstr "অফিস ওয়ার্কষ্টেশন"
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
#, c-format
msgid ""
"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -395,7 +374,7 @@ msgstr ""
"অফিস প্রোগ্রামসমূহ: ওয়ার্ডপ্রসেসর (OpenOffice.org Writer, Kword), স্প্রেডসিট "
"(OpenOffice.org Calc, Kspread), PDF ফাইল প্রদর্শক ইত্যাদী"
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
#, c-format
msgid ""
"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -404,32 +383,32 @@ msgstr ""
"অফিস প্রোগ্রামসমূহ: ওয়ার্ডপ্রসেসর (kword, abiword), স্প্রেডসিট (kspread, gnumeric), "
"PDF ফাইল প্রদর্শক ইত্যাদী"
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
#, c-format
msgid "Game station"
msgstr "গেশ ষ্টেশন"
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
#, c-format
msgid "Amusement programs: arcade, boards, strategy, etc"
msgstr "উদ্দীপনামূলক প্রোগ্রামসমূহ: আর্কেড, বোর্ড, স্ট্রেটেজি, ইত্যাদি"
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
#, c-format
msgid "Multimedia station"
msgstr "মাল্টিমিডিয়া ষ্টেশন"
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
#, c-format
msgid "Sound and video playing/editing programs"
msgstr "সাউন্ড এবং ভিডিও দেখার/এডিট করার প্রোগ্রামসমূহ"
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
#, c-format
msgid "Internet station"
msgstr "ইন্টারনেট ষ্টেশন"
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
#, c-format
msgid ""
"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -437,223 +416,205 @@ msgid ""
msgstr ""
"মেইল আদানপ্রদান, খবর পড়া এবং ওয়েব ব্রাউজিং (mutt, tin..) এর জন্য কিছু টুলের সেট"
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
#, c-format
msgid "Network Computer (client)"
msgstr "নেটওয়ার্ক কম্পিউটার (ক্লাইন্ট)"
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
#, c-format
msgid "Clients for different protocols including ssh"
msgstr "SSH সহ বিভিন্ন প্রোটকলের জন্য ক্লাইন্টসমূহ"
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
#, c-format
msgid "Tools to ease the configuration of your computer"
msgstr "আপনার কম্পিউটারের কনফিগারেশন সহজ করার জন্য কিছু টুল"
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
#, c-format
msgid "Console Tools"
msgstr "কনসল টুল"
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
#, c-format
msgid "Editors, shells, file tools, terminals"
msgstr "এডিটর, শেল, ফাইল টুল, টার্মিনাল সমূহ"
#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
#, c-format
msgid "Development"
msgstr "ডেভলপমেন্ট"
#: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
#, c-format
msgid "C and C++ development libraries, programs and include files"
msgstr "C এবং C++ ডেভলপমেন্টের লাইব্রেরী, প্রগ্রাম এবং include ফাইলসমূহ"
#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
#, c-format
msgid "Documentation"
msgstr "ডকুমেন্টেশন"
#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
#, c-format
msgid "Books and Howto's on Linux and Free Software"
msgstr "লিনাক্স এবং ফ্রী সফটওয়ার সংক্রান্ত বই ও হাউটু (HOWTO)"
#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
#, c-format
msgid "LSB"
msgstr "LSB"
#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
#, c-format
msgid "Linux Standard Base. Third party applications support"
msgstr "লিনাক্সের সাধারণ আধার। তৃতীয়পক্ষ এপ্লিকেশন সমূহের সাপোর্ট"
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
#, c-format
msgid "Web Server"
msgstr "ওয়েব সার্ভার"
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
#, c-format
msgid "Apache"
msgstr "এ্যপাচি"
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
#, c-format
msgid "Groupware"
msgstr "গ্রুপওয়্যার"
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
#, c-format
msgid "Kolab Server"
msgstr "কোলাব সার্ভার"
#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
#, c-format
msgid "Firewall/Router"
msgstr "ফায়ারওয়াল/রাউটার"
#: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
#, c-format
msgid "Internet gateway"
msgstr "ইন্টারনেট গেটওয়ে"
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
#, c-format
msgid "Mail/News"
msgstr "মেইল/সংবাদ"
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
#, c-format
msgid "Postfix mail server, Inn news server"
msgstr "Postfix মেইল সার্ভার, Inn সংবাদ সার্ভার"
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
#, c-format
msgid "Directory Server"
msgstr "ডিরেক্টরি সার্ভার"
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
#, c-format
msgid "FTP Server"
msgstr "FTP সার্ভার"
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
#, c-format
msgid "ProFTPd"
msgstr "ProFTPd"
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
#, c-format
msgid "DNS/NIS"
msgstr "ডিএনএস/এনআইএস"
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
#, c-format
msgid "Domain Name and Network Information Server"
msgstr "ডোমেইন নেম এবং নেটওয়ার্ক ইনফরমেশন সার্ভার"
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
#, c-format
msgid "File and Printer Sharing Server"
msgstr "ফাইল এবং প্রিন্টার শেয়ারিং সার্ভার"
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
#, c-format
msgid "NFS Server, Samba server"
msgstr "NFS সার্ভার, Samba সার্ভার"
#: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
#, c-format
msgid "Database"
msgstr "ডেটাবেস"
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
#, c-format
msgid "PostgreSQL and MySQL Database Server"
msgstr "PostgreSQL অথবা MySQL ডেটাবেস সার্ভার"
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
#, c-format
msgid "Web/FTP"
msgstr "ওয়েব/FTP"
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
#, c-format
msgid "Apache, Pro-ftpd"
msgstr "এ্যপাচি, Pro-ftpd"
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
#, c-format
msgid "Mail"
msgstr "মেইল"
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
#, c-format
msgid "Postfix mail server"
msgstr "Postfix মেইল সার্ভার"
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
#, c-format
msgid "PostgreSQL or MySQL database server"
msgstr "PostgreSQL অথবা MySQL ডেটাবেস সার্ভার"
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
#, c-format
msgid "Network Computer server"
msgstr "নেটওয়ার্ক কম্পিউটার সার্ভার"
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
#, c-format
msgid "NFS server, SMB server, Proxy server, ssh server"
msgstr "NFS সার্ভার, SMB সার্ভার, Proxy সার্ভার, ssh সার্ভার"
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
#, c-format
msgid "Graphical Environment"
msgstr "গ্রাফিকাল পরিবেশ"
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
#, c-format
msgid "KDE Workstation"
msgstr "KDE ওয়ার্কষ্টেশন"
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
#, c-format
msgid ""
"The K Desktop Environment, the basic graphical environment with a collection "
"of accompanying tools"
msgstr "K ডেক্সটপ, কিছু সহযোগীমূলক টুলের সমন্বয়ে একটি সাধারণ গ্রাফিকাল পরিবেশ"
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
#, c-format
msgid "GNOME Workstation"
msgstr "গুহনোম ওয়ার্কষ্টেশন"
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
#, c-format
msgid ""
"A graphical environment with user-friendly set of applications and desktop "
@@ -661,7 +622,7 @@ msgid ""
msgstr ""
"ব্যবহারকারীর বন্ধুসূলভ কিছু এপ্লিকেশন এবং ডোক্সটপ টুলের সমন্বয়ে একটি গ্রাফিকাল পরিবেশ"
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
#, fuzzy, c-format
msgid "LXDE Desktop"
msgstr "IceWm ডেস্কটপ"
@@ -674,54 +635,52 @@ msgid ""
msgstr ""
"ব্যবহারকারীর বন্ধুসূলভ কিছু এপ্লিকেশন এবং ডোক্সটপ টুলের সমন্বয়ে একটি গ্রাফিকাল পরিবেশ"
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
#, c-format
msgid "Other Graphical Desktops"
msgstr "অন্যান্য গ্রাফিকাল ডেক্সটপ"
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
#, c-format
msgid "Window Maker, Enlightenment, Fvwm, etc"
msgstr "Window Maker, Enlightenment, Fvwm, ইত্যাদি"
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
#, c-format
msgid "Utilities"
msgstr "ইউটিলিটিসমূহ"
#: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
#, c-format
msgid "SSH Server"
msgstr "SSH সার্ভিস"
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
#, c-format
msgid "Webmin"
msgstr "ওয়েবমিন"
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
#, c-format
msgid "Webmin Remote Configuration Server"
msgstr "ওয়েবমিন দূরবর্তী কনফিগারেশন সার্ভার"
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
#, c-format
msgid "Network Utilities/Monitoring"
msgstr "নেটওয়ার্ক ইউটিলিটিসমূহ/পর্যবেক্ষণ"
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
#, c-format
msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
msgstr "পর্যবেক্ষণ টুলসমূহ, হিসাবরক্ষণ প্রসেস করে, tcpdump, nmap, ..."
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
#, c-format
msgid "Mandriva Wizards"
msgstr "Mandriva উইজার্ডসমূহ"
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
#, c-format
msgid "Wizards to configure server"
msgstr "সার্ভার কনফিগার করার জন্য উইজার্ডসমূহ"
@@ -823,17 +782,17 @@ msgstr ""
msgid "Click on images in order to see a bigger preview"
msgstr ""
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
#, c-format
msgid "Package Group Selection"
msgstr "প্যাকেজ গ্রুপ নির্বাচন"
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
#, c-format
msgid "Individual package selection"
msgstr "আলাদাভাবে প্যাকেজ নির্বাচন"
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
#, c-format
msgid "Total size: %d / %d MB"
msgstr "মোট সাইজ: %d / %d এমবি"
@@ -953,12 +912,12 @@ msgstr "সর্বনিম্ন ইনস্টল"
msgid "Software Management"
msgstr "সফটওয়্যার ম্যানেজমেন্ট"
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
#, c-format
msgid "Choose the packages you want to install"
msgstr "আপনি যেই প্যাকেজগুলি ইনস্টল করতে চান তা পছন্দ করুন"
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
#, c-format
msgid "Installing"
msgstr "ইনস্টলেশন"
@@ -985,7 +944,7 @@ msgid_plural "%d packages"
msgstr[0] "%d প্যাকেজ সমূহ"
msgstr[1] "%d প্যাকেজ সমূহ"
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
#, c-format
msgid "Summary"
msgstr "সারাংশ"
@@ -995,7 +954,7 @@ msgstr "সারাংশ"
msgid "Configure"
msgstr "কনফিগার"
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
#, c-format
msgid "not configured"
msgstr "কনফিগার করা হয়নি"
@@ -1005,7 +964,7 @@ msgstr "কনফিগার করা হয়নি"
msgid "Media Selection"
msgstr "প্যাকেজ গ্রুপ নির্বাচন"
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
#, c-format
msgid ""
"The following installation media have been found.\n"
@@ -1014,7 +973,7 @@ msgstr ""
"নিম্নলিখিত ইনস্টলেশন মিডিয়া পাওয়া গেছে।\n"
"যদি আপনি এগুলোর মধ্যকার কিছু এড়িয়ে যেতে চান, তাহলে এখন সেগুলোকে অনির্বাচিত করুন।"
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
#, c-format
msgid ""
"You have the option to copy the contents of the CDs onto the hard drive "
@@ -1026,7 +985,7 @@ msgstr ""
" এরপর হার্ডডিস্ক থেকে ইনস্টলেশন চলতে থাকবে এবং সিস্টেম সম্পূর্ন ইনস্টলেশনের পরও "
"প্যাকেজগুলো রয়ে যাবে।"
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
#, c-format
msgid "Copy whole CDs"
msgstr "CD গুলো সম্পুর্ন কপি করো "
@@ -1046,59 +1005,49 @@ msgstr "অনুগ্রহ করে আপনার কীবোর্ড
msgid "Here is the full list of available keyboards:"
msgstr "এখানে উপস্থিত সমস্ত কীবোর্ডের তালিকা রয়োছে"
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
#, c-format
msgid "Install/Upgrade"
msgstr "ইনস্টল/আপগ্রড"
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
#, c-format
msgid "Is this an install or an upgrade?"
msgstr "এটা কি একটি ইনস্টলেশন না আপগ্রেড?"
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
#, fuzzy, c-format
msgid ""
"_: This is a noun:\n"
"Install"
msgstr "ইনস্টল"
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
#, c-format
msgid "Upgrade %s"
msgstr "%s আপগ্রড করো"
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
#, c-format
msgid "Encryption key for %s"
msgstr "%s -এর জন্য এনক্রিপশন কী"
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
#, c-format
msgid "Cancel installation, reboot system"
msgstr ""
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
#, fuzzy, c-format
msgid "New Installation"
msgstr " ইনস্টলেশন"
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
#, c-format
msgid "Upgrade previous installation (not recommended)"
msgstr ""
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
#, c-format
msgid ""
"Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1110,17 +1059,17 @@ msgid ""
"Installation\"."
msgstr ""
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "IDE"
msgstr "IDE"
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "Configuring IDE"
msgstr "IDE কনফিগারেশন চলছে"
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
#, c-format
msgid ""
"No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1129,7 +1078,7 @@ msgstr ""
"১ মেগাবাইটের bootstrap এর জন্য খালি জায়গা নেই! ইনস্টল অগ্রসর হবে, কিন্তু আপনার "
"সিস্টেম বুট করার জন্য, আপনাকে DiskDrake থেকে bootstrap পার্টিশন তৈরী করতে হবে"
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
#, c-format
msgid ""
"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1139,7 +1088,7 @@ msgstr ""
"আপনাকে একটি PPC PReP Boot বুটস্ট্র্যাপ তৈরী করতে হবে! ইনস্টলেশন অগ্রসর হবে, তবে "
"আপনার সিস্টেম বুট করার জন্য, DiskDrake এর বুটস্ট্র্যাপ পার্টিশনটি প্রয়োজন"
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
#, c-format
msgid ""
"Change your Cd-Rom!\n"
@@ -1152,12 +1101,12 @@ msgstr ""
"ঠিক আছে চাপুন।\n"
"যদি সেটা আপনার না থাকে, এই সিডিরম থেকে ইনস্টলেশন এড়িয়ে যেতে বাতিল চাপুন।"
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
#, c-format
msgid "Looking for available packages..."
msgstr "বরাদ্দকৃত প্যাকেজসমূহ খোঁজা হচ্ছে..."
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
#, c-format
msgid ""
"Your system does not have enough space left for installation or upgrade (%"
@@ -1166,7 +1115,7 @@ msgstr ""
"ইনস্টলেশন অথবা সাম্প্রতিকীকরনের জন্য আপনার সিস্টেমে যথেষ্ট পরিমান জায়গা খালি নেই (%"
"dএমবি > %dএমবি)"
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
#, c-format
msgid ""
"Please choose load or save package selection.\n"
@@ -1175,52 +1124,52 @@ msgstr ""
"অনুগ্রহ করে প্যাকেজ নির্বাচন লোড বা সংরক্ষণ বাছাই করুন।\n"
"এই ফরম্যাটটি auto_install দ্বারা তৈরী ফাইলসমূহের মত।"
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Load"
msgstr "চাপ"
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Save"
msgstr "সংরক্ষণ"
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
#, c-format
msgid "Bad file"
msgstr "অগ্রহণযোগ্য ফাইল"
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
#, fuzzy, c-format
msgid "KDE"
msgstr "IDE"
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
#, c-format
msgid "GNOME"
msgstr "গুনোম"
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
#, fuzzy, c-format
msgid "Desktop Selection"
msgstr "প্যাকেজ গ্রুপ নির্বাচন"
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
#, c-format
msgid "You can choose your workstation desktop profile."
msgstr ""
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
#, c-format
msgid "Selected size is larger than available space"
msgstr "উপস্থিত জায়গার চাইতে নির্বাচিত সাইজটি অনেক বড়"
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
#, c-format
msgid "Type of install"
msgstr "ইনস্টলের ধরণ"
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
#, c-format
msgid ""
"You have not selected any group of packages.\n"
@@ -1229,82 +1178,82 @@ msgstr ""
"আপনি প্যাকেজের কোন গ্রুপ নির্বাচন করেননি।\n"
"অনুগ্রহ করে আপনি যে ক্ষুদ্রাকৃতির ইনস্টলেশন চান তা পছন্দ করুন:"
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
#, c-format
msgid "With X"
msgstr "X-এর সাথে"
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
#, c-format
msgid "With basic documentation (recommended!)"
msgstr "সাধারন নির্দেশিকার সাথে (পরামর্শ দেয়া হচ্ছে!)"
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
#, c-format
msgid "Truly minimal install (especially no urpmi)"
msgstr "এক্কেবারেই ক্ষুদ্র ইনস্টলেশন (বিশেষ করে কোন urpmi ছাড়া)"
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
#, c-format
msgid "Preparing installation"
msgstr "ইনস্টলেশনের প্রস্তুতি চলছে"
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
#, c-format
msgid "Installing package %s"
msgstr "%s প্যাকেজ সমূহ ইনস্টল করা হচ্ছে"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "There was an error ordering packages:"
msgstr "প্যাকেজগুলো বিন্যস্ত করতে গিয়ে একটি ভুল ছিল:"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "Go on anyway?"
msgstr "তবুও যাব?"
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
#, c-format
msgid "Retry"
msgstr "পুনরায় চেষ্টা করো"
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
#, c-format
msgid "Skip this package"
msgstr "এই প্যাকেজটি এড়িয়ে যাও"
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
#, c-format
msgid "Skip all packages from medium \"%s\""
msgstr "\"%s\" মাধ্যমের সব প্যাকেজ এড়িয়ে যাও"
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
#, c-format
msgid "Go back to media and packages selection"
msgstr "মিডিয়া এবং প্যাকেজের নির্বাচন এ ফিরে যাও"
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
#, c-format
msgid "There was an error installing package %s."
msgstr "%s প্যাকেজ ইনস্টল করতে সমস্যা হয়েছে।"
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
#, c-format
msgid "Post-install configuration"
msgstr "ইনস্টলের পরের কনফিগারেশন"
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
#, c-format
msgid "Please ensure the Update Modules media is in drive %s"
msgstr "অনুগ্রহ করে নিশ্চিত করুন যে সাম্প্রতিক মডিউলগুলো %s ড্রাইভ এ আছে"
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
#, c-format
msgid "Updates"
msgstr "আপডেট"
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
#, c-format
msgid ""
"You now have the opportunity to download updated packages. These packages\n"
@@ -1325,28 +1274,28 @@ msgstr ""
"\n"
"আপনি কি ইনস্টল আপডেট করতে চান?"
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
#, c-format
msgid "%s on %s"
msgstr "%s -এ %s"
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
#, c-format
msgid "Hardware"
msgstr "হার্ডওয়্যার"
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
#, c-format
msgid "Sound card"
msgstr "সাউন্ডকার্ড"
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
#, c-format
msgid "Do you have an ISA sound card?"
msgstr "আপনার কি একটি ISA সাউন্ড কার্ড আছে?"
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
#, c-format
msgid ""
"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1355,67 +1304,67 @@ msgstr ""
"ইনস্টল শেষ হবার পরে সাউন্ড কার্ড কনফিগার করার জন্য \"alsaconf\" অথবা \"sndconfig"
"\" চালাও"
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
#, c-format
msgid "No sound card detected. Try \"harddrake\" after installation"
msgstr "কোন সাউন্ডকার্ড সনাক্ত হয়নি, ইনস্টলের পরে \"harddrake\" দিয়ে চেষ্টা করুন"
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
#, c-format
msgid "Graphical interface"
msgstr "গ্রাফিকাল ইন্টারফেস"
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
#, c-format
msgid "Network & Internet"
msgstr "নেটওয়ার্ট এবং ইন্টারনেট"
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
#, c-format
msgid "Proxies"
msgstr "প্রক্সিসমূহ"
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
#, c-format
msgid "configured"
msgstr "কনফিগার করা হয়েছে"
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
#, c-format
msgid "Security Level"
msgstr "সিকউরিটি লেভেল"
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
#, c-format
msgid "Firewall"
msgstr "ফায়ারওয়াল"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "activated"
msgstr "সক্রিয় হয়েছে"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "disabled"
msgstr "অকার্যকর করা হয়েছে"
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
#, c-format
msgid "You have not configured X. Are you sure you really want this?"
msgstr "আপনি X কনফিগার করেননি। আপনি কি নিশ্চিত এরকমটি চান?"
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
#, c-format
msgid "Preparing bootloader..."
msgstr "Bootloader প্রস্তুত করা হচ্ছে..."
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
#, c-format
msgid "Be patient, this may take a while..."
msgstr ""
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
#, c-format
msgid ""
"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1428,7 +1377,7 @@ msgstr ""
"BootX বা অন্য কোন কিছু ব্যবহার করতে হবে। root fs এর জন্য কার্নেল প্রেরিত মান হবে: "
"root=%s"
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
#, c-format
msgid ""
"In this security level, access to the files in the Windows partition is "
@@ -1436,17 +1385,17 @@ msgid ""
msgstr ""
"এই নিরাপত্তা লেভেলে, উইন্ডোজ পার্টিশনের ফাইলে প্রবেশ শুধুমাত্র অ্যাডমিনিস্ট্রেটরের আছে।"
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr "%s ড্রাইভে একটি ফাঁকা ফ্লপি ঢোকান"
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
#, c-format
msgid "Creating auto install floppy..."
msgstr "সয়ং ইনস্টল ফ্লপি তৈরী করা হচ্ছে..."
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
#, c-format
msgid ""
"Some steps are not completed.\n"
@@ -1457,7 +1406,7 @@ msgstr ""
"\n"
"আপনি কি এখন বের হতে চান?"
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
#, c-format
msgid "Congratulations"
msgstr "স্বাগতম"
@@ -1601,6 +1550,9 @@ msgid ""
"Exit"
msgstr "বাহির"
+#~ msgid "Downloading file %s..."
+#~ msgstr "%s ফাইল ডাউনলোড করা হচ্ছে..."
+
#~ msgid ""
#~ "You have selected the following server(s): %s\n"
#~ "\n"
diff --git a/perl-install/install/share/po/br.po b/perl-install/install/share/po/br.po
index 8a38e87ec..cdaa1bae4 100644
--- a/perl-install/install/share/po/br.po
+++ b/perl-install/install/share/po/br.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: DrakX 10.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
"PO-Revision-Date: 2009-03-30 15:55+0200\n"
"Last-Translator: Thierry Vignaud <tvignaud@mandriva.com>\n"
"Language-Team: Brezhoneg <ofisk@wanadoo.fr>\n"
@@ -16,31 +16,6 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1;plural=0\n"
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr ""
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr ""
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr ""
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr ""
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr ""
-
#: any.pm:109
#, c-format
msgid "Do you have further supplementary media?"
@@ -76,17 +51,17 @@ msgstr "Rouedad (FTP)"
msgid "Network (NFS)"
msgstr "Rouedad (NFS)"
-#: any.pm:163
+#: any.pm:165
#, c-format
msgid "URL of the mirror?"
msgstr "URL ar melezour ?"
-#: any.pm:169
+#: any.pm:171
#, c-format
msgid "URL must start with ftp:// or http://"
msgstr "Dao en deus an URL kregiñ gant ftp:// pe http://"
-#: any.pm:180
+#: any.pm:182
#, c-format
msgid ""
"Contacting Mandriva Linux web site to get the list of available mirrors..."
@@ -94,7 +69,7 @@ msgstr ""
"O taremprediñ al lec'hienn Mandriva Linux evit kaout roll ar melezouroù "
"hegerz ..."
-#: any.pm:185
+#: any.pm:187
#, c-format
msgid ""
"Failed contacting Mandriva Linux web site to get the list of available "
@@ -103,47 +78,47 @@ msgstr ""
"Sac'het en ur taremprediñ al lec'hienn Mandriva Linux evit kaout roll ar "
"melezouroù hegerz "
-#: any.pm:195
+#: any.pm:197
#, c-format
msgid "Choose a mirror from which to get the packages"
msgstr "Dibabit ur melezour da dapout ar pakadoù diwarnañ"
-#: any.pm:225
+#: any.pm:227
#, c-format
msgid "NFS setup"
msgstr "Kefluniadur NFS"
-#: any.pm:226
+#: any.pm:228
#, c-format
msgid "Please enter the hostname and directory of your NFS media"
msgstr "Roit anv ostiz ha renkell ho media NFS"
-#: any.pm:230
+#: any.pm:232
#, c-format
msgid "Hostname missing"
msgstr "Mank ar ra anv an ostiz"
-#: any.pm:231
+#: any.pm:233
#, c-format
msgid "Directory must begin with \"/\""
msgstr ""
-#: any.pm:235
+#: any.pm:237
#, c-format
msgid "Hostname of the NFS mount ?"
msgstr "Anv ostiz ar marc'hañ NFS ?"
-#: any.pm:236
+#: any.pm:238
#, c-format
msgid "Directory"
msgstr "Renkell"
-#: any.pm:258
+#: any.pm:260
#, c-format
msgid "Supplementary"
msgstr "A-gresk"
-#: any.pm:293
+#: any.pm:295
#, c-format
msgid ""
"Can't find a package list file on this mirror. Make sure the location is "
@@ -152,22 +127,22 @@ msgstr ""
"Ne m'eus ket kavout ur roll pakadoù e-barzh ar melezour-mañ. Kit da wiriañ "
"al lec'hiadur-mañ zo mad."
-#: any.pm:328
+#: any.pm:334
#, c-format
msgid "Looking at packages already installed..."
msgstr "O kavout pakadoù zo staliet eo ..."
-#: any.pm:362
+#: any.pm:368
#, c-format
msgid "Finding packages to upgrade..."
msgstr "O kavout pakadoù da vremanaat ..."
-#: any.pm:381
+#: any.pm:387
#, c-format
msgid "Removing packages prior to upgrade..."
msgstr "O zilemel ar pakadoù a-raok bremanaat ..."
-#: any.pm:402
+#: any.pm:408
#, c-format
msgid ""
"You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -179,18 +154,18 @@ msgid ""
"please reboot your system and upgrade using the Mandriva update applet."
msgstr ""
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
#, c-format
msgid "Reboot"
msgstr "Adlañsañ"
-#: any.pm:407
+#: any.pm:413
#, c-format
msgid "Proceed"
msgstr ""
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -204,72 +179,72 @@ msgstr ""
"\n"
"Ha fellout a ra deoc'h da vat lemel anezho ?\n"
-#: any.pm:815
+#: any.pm:821
#, c-format
msgid "Error reading file %s"
msgstr "Fazi en ur lenn ar restr %s"
-#: any.pm:1022
+#: any.pm:1028
#, c-format
msgid "The following disk(s) were renamed:"
msgstr "Adenvelet e oa ar bladenn/pladennoù-mañ :"
-#: any.pm:1024
+#: any.pm:1030
#, c-format
msgid "%s (previously named as %s)"
msgstr "%s (a vez graet %s dioutañ diaraok)"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "HTTP"
msgstr "HTTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "FTP"
msgstr "FTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "NFS"
msgstr "NFS"
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
#, c-format
msgid "Network"
msgstr "Rouedad"
-#: any.pm:1104
+#: any.pm:1110
#, c-format
msgid "Please choose a media"
msgstr "Dibabit ur vedia, mar plij"
-#: any.pm:1120
+#: any.pm:1126
#, c-format
msgid "File already exists. Overwrite it?"
msgstr "Ar restr zo endeo. Rasklañ anezhañ ?"
-#: any.pm:1124
+#: any.pm:1130
#, c-format
msgid "Permission denied"
msgstr "Aotre nac'het"
-#: any.pm:1172
+#: any.pm:1178
#, c-format
msgid "Bad NFS name"
msgstr "N'eo ket un anv NFS mat"
-#: any.pm:1193
+#: any.pm:1199
#, c-format
msgid "Bad media %s"
msgstr "N'eo ket mat ar vedia %s"
-#: any.pm:1236
+#: any.pm:1242
#, c-format
msgid "Can not make screenshots before partitioning"
msgstr "N'hellan ket sevel skrammpakeroù a-raok parzhañ"
-#: any.pm:1244
+#: any.pm:1250
#, c-format
msgid "Screenshots will be available after install in %s"
msgstr "Skrammpakeroù a vo bet kavet goude staliañ e %s"
@@ -280,11 +255,15 @@ msgid "Installation"
msgstr "O staliañ"
#: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
#, c-format
msgid "Configuration"
msgstr "Kefluniadur"
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
#: install2.pm:168
#, c-format
msgid "You must also format %s"
@@ -307,22 +286,22 @@ msgstr "O lañsañ ar rouedad"
msgid "Bringing down the network"
msgstr "O tizenaouiñ ar rouedad"
-#: media.pm:402
+#: media.pm:399
#, c-format
msgid "Please wait, retrieving file"
msgstr "Gortozit mar plij, o tigas ar restr"
-#: media.pm:734
+#: media.pm:718
#, c-format
-msgid "Downloading file %s..."
-msgstr "Oc'h enkargañ ar restr %s ..."
+msgid "unable to add medium"
+msgstr ""
-#: media.pm:822
+#: media.pm:758
#, c-format
msgid "Copying some packages on disks for future use"
msgstr "Oc'h eilañ ur bern pakad hag a vo bet implijet diwezhatoc'h"
-#: media.pm:875
+#: media.pm:811
#, c-format
msgid "Copying in progress"
msgstr "Oc'h eilañ"
@@ -366,27 +345,27 @@ msgstr ""
msgid "An error occurred:"
msgstr "Ur fazi zo bet :"
-#: pkgs.pm:776
+#: pkgs.pm:780
#, c-format
msgid "%d installation transactions failed"
msgstr "%d gra zo bet sac'het"
-#: pkgs.pm:777
+#: pkgs.pm:781
#, c-format
msgid "Installation of packages failed:"
msgstr "Sac'het et bet staliañ ar pakadoù :"
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
#, c-format
msgid "Workstation"
msgstr "Post labour"
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
#, c-format
msgid "Office Workstation"
msgstr "Post labour burevek"
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
#, c-format
msgid ""
"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -395,7 +374,7 @@ msgstr ""
"Programmoù burev : skridtreterezhioù (OpenOffice.org Writer, Kword), "
"logerioù (OpenOffice.org Calc, Kspread), gwelerien PDF, ..."
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
#, c-format
msgid ""
"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -404,262 +383,244 @@ msgstr ""
"Programmoù burev : skridtreterezhioù (kword, abiword), logerioù (kspread, "
"gnumeric), gwelerien PDF, ..."
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
#, c-format
msgid "Game station"
msgstr "Arsav c'hoarioù"
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
#, c-format
msgid "Amusement programs: arcade, boards, strategy, etc"
msgstr ""
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
#, c-format
msgid "Multimedia station"
msgstr "Arsav liesvedia"
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
#, c-format
msgid "Sound and video playing/editing programs"
msgstr "Programmoù evit seniñ/aozañ tonioù ha videoù"
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
#, c-format
msgid "Internet station"
msgstr "Arsav internet"
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
#, c-format
msgid ""
"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
"Web"
msgstr ""
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
#, c-format
msgid "Network Computer (client)"
msgstr "Urzhiataer rouedad (kliant)"
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
#, c-format
msgid "Clients for different protocols including ssh"
msgstr "Pratikoù evit meur a gomennad (da skouer ssh)"
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
#, c-format
msgid "Tools to ease the configuration of your computer"
msgstr "Ostilhoù evit kefluniañ hoc'h urzhiataer dre aes"
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
#, c-format
msgid "Console Tools"
msgstr "Ostilhoù letrin"
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
#, c-format
msgid "Editors, shells, file tools, terminals"
msgstr "Aozerien, shelloù, ostilhoù restr, termenelloù"
#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
#, c-format
msgid "Development"
msgstr "Diorren"
#: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
#, c-format
msgid "C and C++ development libraries, programs and include files"
msgstr ""
#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
#, c-format
msgid "Documentation"
msgstr "Teuliadur"
#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
#, c-format
msgid "Books and Howto's on Linux and Free Software"
msgstr ""
#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
#, c-format
msgid "LSB"
msgstr "LSB"
#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
#, c-format
msgid "Linux Standard Base. Third party applications support"
msgstr ""
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
#, c-format
msgid "Web Server"
msgstr "Servijer Web"
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
#, c-format
msgid "Apache"
msgstr "Apache"
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
#, c-format
msgid "Groupware"
msgstr "Strollant"
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
#, c-format
msgid "Kolab Server"
msgstr "Servijer Kolab"
#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
#, c-format
msgid "Firewall/Router"
msgstr "Moger tan/Henter"
#: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
#, c-format
msgid "Internet gateway"
msgstr "Dreuzell an Internet"
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
#, c-format
msgid "Mail/News"
msgstr "Posteloù/keleier"
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
#, c-format
msgid "Postfix mail server, Inn news server"
msgstr "Servijer posteloù Postfix, servijer keleier Inn"
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
#, c-format
msgid "Directory Server"
msgstr "Levr-bloaz"
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
#, c-format
msgid "FTP Server"
msgstr "Servijer FTP"
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
#, c-format
msgid "ProFTPd"
msgstr "ProFTPd"
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
#, c-format
msgid "DNS/NIS"
msgstr "DNS/NIS"
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
#, c-format
msgid "Domain Name and Network Information Server"
msgstr "Servijer DNS ha NIS"
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
#, c-format
msgid "File and Printer Sharing Server"
msgstr "Servijer rennañ restroù ha moullerez"
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
#, c-format
msgid "NFS Server, Samba server"
msgstr "Servijer NFS, servijer Samba"
#: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
#, c-format
msgid "Database"
msgstr "Stlennvon"
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
#, c-format
msgid "PostgreSQL and MySQL Database Server"
msgstr "Servijer stlennvon PostgreSQL ha MySQL"
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
#, c-format
msgid "Web/FTP"
msgstr "Web/FTP"
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
#, c-format
msgid "Apache, Pro-ftpd"
msgstr "Apache, Pro-ftpd"
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
#, c-format
msgid "Mail"
msgstr "Post"
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
#, c-format
msgid "Postfix mail server"
msgstr "Servijer postel Postfix"
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
#, c-format
msgid "PostgreSQL or MySQL database server"
msgstr "Servijer stlennvon PostgreSQL pe MySQL"
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
#, c-format
msgid "Network Computer server"
msgstr "Servijer rouedad"
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
#, c-format
msgid "NFS server, SMB server, Proxy server, ssh server"
msgstr "Servijer NFS, servijer SMB, servijer proksi, servijer SSH"
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
#, c-format
msgid "Graphical Environment"
msgstr "Endeo grafikel"
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
#, c-format
msgid "KDE Workstation"
msgstr "Post burevek KDE"
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
#, c-format
msgid ""
"The K Desktop Environment, the basic graphical environment with a collection "
"of accompanying tools"
msgstr "An Endro Burev K gant he ostilhoù"
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
#, c-format
msgid "GNOME Workstation"
msgstr "Post burevek GNOME"
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
#, c-format
msgid ""
"A graphical environment with user-friendly set of applications and desktop "
"tools"
msgstr ""
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
#, c-format
msgid "LXDE Desktop"
msgstr "Burev LXDE"
@@ -671,54 +632,52 @@ msgid ""
"applications and desktop tools"
msgstr ""
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
#, c-format
msgid "Other Graphical Desktops"
msgstr "Burevioù c'hrafek all"
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
#, c-format
msgid "Window Maker, Enlightenment, Fvwm, etc"
msgstr "Window Maker, Enlightenment, Fvwm, etc"
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
#, c-format
msgid "Utilities"
msgstr "Mavegoù"
#: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
#, c-format
msgid "SSH Server"
msgstr "Servijer SSH"
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
#, c-format
msgid "Webmin"
msgstr "Webmin"
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
#, c-format
msgid "Webmin Remote Configuration Server"
msgstr "Servijer Webmin ar gefluniadur a-bell"
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
#, c-format
msgid "Network Utilities/Monitoring"
msgstr "Ostilhoù ar rouedad/diwall"
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
#, c-format
msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
msgstr ""
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
#, c-format
msgid "Mandriva Wizards"
msgstr "Skozelerien Mandriva"
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
#, c-format
msgid "Wizards to configure server"
msgstr "Skozelerien evit kefluniañ ar servijer"
@@ -810,17 +769,17 @@ msgstr "Setu ur rakwell eus burev « %s »."
msgid "Click on images in order to see a bigger preview"
msgstr ""
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
#, c-format
msgid "Package Group Selection"
msgstr "Diuzadenn strollad pakadoù"
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
#, c-format
msgid "Individual package selection"
msgstr "Diuz pakadoù unan hag unan"
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
#, c-format
msgid "Total size: %d / %d MB"
msgstr "Ment hollek : %d / %d Mo"
@@ -939,12 +898,12 @@ msgstr "Staliadur bihan"
msgid "Software Management"
msgstr "Merañ ar pakadoù"
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
#, c-format
msgid "Choose the packages you want to install"
msgstr "Dibabit ar pakadoù a vennit staliañ"
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
#, c-format
msgid "Installing"
msgstr "O staliañ"
@@ -970,7 +929,7 @@ msgid "%d package"
msgid_plural "%d packages"
msgstr[0] "%d pakad"
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
#, c-format
msgid "Summary"
msgstr "Evit diverriñ"
@@ -980,7 +939,7 @@ msgstr "Evit diverriñ"
msgid "Configure"
msgstr "Kefluniañ"
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
#, c-format
msgid "not configured"
msgstr "n'eo ket kefluniet"
@@ -990,14 +949,14 @@ msgstr "n'eo ket kefluniet"
msgid "Media Selection"
msgstr "Diuzadenn ar media"
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
#, c-format
msgid ""
"The following installation media have been found.\n"
"If you want to skip some of them, you can unselect them now."
msgstr ""
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
#, c-format
msgid ""
"You have the option to copy the contents of the CDs onto the hard drive "
@@ -1006,7 +965,7 @@ msgid ""
"available once the system is fully installed."
msgstr ""
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
#, c-format
msgid "Copy whole CDs"
msgstr "Eilañ tout an CDoù"
@@ -1026,59 +985,49 @@ msgstr "Dibabit reizhadur ho stokellaoueg mar plij"
msgid "Here is the full list of available keyboards:"
msgstr "Setu eo listenn leun ar stokellaoueg :"
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
#, c-format
msgid "Install/Upgrade"
msgstr "Staliañ/Bremanaat"
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
#, c-format
msgid "Is this an install or an upgrade?"
msgstr "Hag ur staliadur pe ur bremanadur eo ?"
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
#, c-format
msgid ""
"_: This is a noun:\n"
"Install"
msgstr "Staliadur"
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
#, c-format
msgid "Upgrade %s"
msgstr "Bremanaat %s"
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
#, c-format
msgid "Encryption key for %s"
msgstr "Alc'hwez enrinegadur evit %s"
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
#, c-format
msgid "Cancel installation, reboot system"
msgstr ""
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
#, c-format
msgid "New Installation"
msgstr "Staliadur nevez"
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
#, c-format
msgid "Upgrade previous installation (not recommended)"
msgstr ""
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
#, c-format
msgid ""
"Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1090,24 +1039,24 @@ msgid ""
"Installation\"."
msgstr ""
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "IDE"
msgstr "IDE"
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "Configuring IDE"
msgstr "Kefluniañ IDE"
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
#, c-format
msgid ""
"No free space for 1MB bootstrap! Install will continue, but to boot your "
"system, you'll need to create the bootstrap partition in DiskDrake"
msgstr ""
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
#, c-format
msgid ""
"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1115,7 +1064,7 @@ msgid ""
"DiskDrake"
msgstr ""
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
#, c-format
msgid ""
"Change your Cd-Rom!\n"
@@ -1129,19 +1078,19 @@ msgstr ""
"eo da c'houde.\n"
"Ma n'emañ ket ganeoc'h gwaskit Nullañ evit chom hep staliañ ar Cd-Rom-se."
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
#, c-format
msgid "Looking for available packages..."
msgstr "O klask ar pakadoù hegerz ..."
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
#, c-format
msgid ""
"Your system does not have enough space left for installation or upgrade (%"
"dMB > %dMB)"
msgstr ""
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
#, c-format
msgid ""
"Please choose load or save package selection.\n"
@@ -1150,52 +1099,52 @@ msgstr ""
"Dibabit kargañ pe enrollañ choazh ar pakadoù mar plij.\n"
"Ar furmad zo hini ar restroù auto_install."
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Load"
msgstr "Kargañ"
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Save"
msgstr "Enrollañ"
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
#, c-format
msgid "Bad file"
msgstr "N'eo ket mat ar restr"
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
#, c-format
msgid "KDE"
msgstr "KDE"
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
#, c-format
msgid "GNOME"
msgstr "GNOME"
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
#, c-format
msgid "Desktop Selection"
msgstr "Dibab ar burev"
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
#, c-format
msgid "You can choose your workstation desktop profile."
msgstr ""
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
#, c-format
msgid "Selected size is larger than available space"
msgstr "Brasoc'h eo ment dibabet evit egor dieub"
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
#, c-format
msgid "Type of install"
msgstr "Seurt ar staliadur"
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
#, c-format
msgid ""
"You have not selected any group of packages.\n"
@@ -1204,82 +1153,82 @@ msgstr ""
"N'eus ket strollad pakadoù dibabet ebet.\n"
"Dibabit ar staliañ vihanañ e fell deoc'h implij mar plij :"
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
#, c-format
msgid "With X"
msgstr "Gant X"
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
#, c-format
msgid "With basic documentation (recommended!)"
msgstr "Gant un teuliadur bihan (kuzuliet !)"
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
#, c-format
msgid "Truly minimal install (especially no urpmi)"
msgstr "Staliadur bihan gwir (n'eus urpmi ebet)"
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
#, c-format
msgid "Preparing installation"
msgstr "O prientiñ ar staliadur"
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
#, c-format
msgid "Installing package %s"
msgstr "O staliañ ar pakad %s"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "There was an error ordering packages:"
msgstr "Ur fazi zo bet en ur rummañ pakadoù :"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "Go on anyway?"
msgstr "Kenderc'hel evelato ?"
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
#, c-format
msgid "Retry"
msgstr "Adklask"
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
#, c-format
msgid "Skip this package"
msgstr "Tremen e-biou ar pakad-mañ"
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
#, c-format
msgid "Skip all packages from medium \"%s\""
msgstr "Tremen e-biou pep pakad eud ar vedium « %s »"
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
#, c-format
msgid "Go back to media and packages selection"
msgstr "Distro da ziuzadenn ar pakadoù hag ar media"
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
#, c-format
msgid "There was an error installing package %s."
msgstr "Ur fazi zo bet en ur staliañ ar pakad %s."
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
#, c-format
msgid "Post-install configuration"
msgstr "Kefluniadur goude staliañ"
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
#, c-format
msgid "Please ensure the Update Modules media is in drive %s"
msgstr ""
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
#, c-format
msgid "Updates"
msgstr "Bremañaat"
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
#, c-format
msgid ""
"You now have the opportunity to download updated packages. These packages\n"
@@ -1299,28 +1248,28 @@ msgstr ""
"\n"
"Mennout a rit staliañ anezho ?"
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
#, c-format
msgid "%s on %s"
msgstr "%s war %s"
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
#, c-format
msgid "Hardware"
msgstr "Periantel"
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
#, c-format
msgid "Sound card"
msgstr "Kartenn gwelet"
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
#, c-format
msgid "Do you have an ISA sound card?"
msgstr "Hag ur gartenn gwelet ISA hoc'h eus ?"
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
#, c-format
msgid ""
"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1329,68 +1278,68 @@ msgstr ""
"Seveniñ « alsaconf » pe « sndconfig » goude staliañ evit kefluniañ ho kartenn "
"klevet"
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
#, c-format
msgid "No sound card detected. Try \"harddrake\" after installation"
msgstr ""
"N'eus kartenn gwelet kavet ebet. Kargañ « harddrake » goude ar staliadur"
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
#, c-format
msgid "Graphical interface"
msgstr "Ketal kevregañ"
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
#, c-format
msgid "Network & Internet"
msgstr "Rouedad hag Internet"
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
#, c-format
msgid "Proxies"
msgstr "Proksioù"
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
#, c-format
msgid "configured"
msgstr "kefluniet"
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
#, c-format
msgid "Security Level"
msgstr "Live an surentez"
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
#, c-format
msgid "Firewall"
msgstr "Moger tan"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "activated"
msgstr "bevaatet"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "disabled"
msgstr "diweredekaet"
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
#, c-format
msgid "You have not configured X. Are you sure you really want this?"
msgstr "N'eo ket kefluniet X. Ha fellout a ra deoc'h da vat ober an dra-mañ ?"
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
#, c-format
msgid "Preparing bootloader..."
msgstr "O prientiñ ar c'harger loc'hañ ..."
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
#, c-format
msgid "Be patient, this may take a while..."
msgstr ""
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
#, c-format
msgid ""
"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1399,24 +1348,24 @@ msgid ""
"root fs is: root=%s"
msgstr ""
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
#, c-format
msgid ""
"In this security level, access to the files in the Windows partition is "
"restricted to the administrator."
msgstr ""
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr "Lakait ur bladennig gwerc'h el lenner %s"
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
#, c-format
msgid "Creating auto install floppy..."
msgstr "O krouiñ ur bladennig staliañ emgefreek ..."
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
#, c-format
msgid ""
"Some steps are not completed.\n"
@@ -1427,7 +1376,7 @@ msgstr ""
"\n"
"Mennout a rit kuitaat da vat bremañ ?"
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
#, c-format
msgid "Congratulations"
msgstr "Brav"
@@ -1571,6 +1520,9 @@ msgid ""
"Exit"
msgstr "Kuitaat"
+#~ msgid "Downloading file %s..."
+#~ msgstr "Oc'h enkargañ ar restr %s ..."
+
#~ msgid "IceWm Desktop"
#~ msgstr "Burev IceWm"
diff --git a/perl-install/install/share/po/bs.po b/perl-install/install/share/po/bs.po
index 7fbe3f7bc..c89351c50 100644
--- a/perl-install/install/share/po/bs.po
+++ b/perl-install/install/share/po/bs.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: bs\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
"PO-Revision-Date: 2006-09-16 10:33+0200\n"
"Last-Translator: Vedran Ljubovic <vljubovic@smartnet.ba>\n"
"Language-Team: Bosnian <lokal@linux.org.ba>\n"
@@ -21,31 +21,6 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr ""
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr ""
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr ""
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr ""
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr ""
-
#: any.pm:109
#, c-format
msgid "Do you have further supplementary media?"
@@ -85,17 +60,17 @@ msgstr "Mreža (FTP)"
msgid "Network (NFS)"
msgstr "Mreža (NFS)"
-#: any.pm:163
+#: any.pm:165
#, c-format
msgid "URL of the mirror?"
msgstr "URL mirrora?"
-#: any.pm:169
+#: any.pm:171
#, c-format
msgid "URL must start with ftp:// or http://"
msgstr "URL mora počinjati sa ftp:// ili http://"
-#: any.pm:180
+#: any.pm:182
#, c-format
msgid ""
"Contacting Mandriva Linux web site to get the list of available mirrors..."
@@ -103,7 +78,7 @@ msgstr ""
"Kontaktiram Mandriva Linux web stranicu da bih saznao listu dostupnih "
"mirrora..."
-#: any.pm:185
+#: any.pm:187
#, c-format
msgid ""
"Failed contacting Mandriva Linux web site to get the list of available "
@@ -112,47 +87,47 @@ msgstr ""
"Nisam uspio kontaktirati Mandriva Linux web stranicu radi liste dostupnih "
"mirrora"
-#: any.pm:195
+#: any.pm:197
#, c-format
msgid "Choose a mirror from which to get the packages"
msgstr "Izaberite mirror sa kojeg će biti dobavljeni paketi"
-#: any.pm:225
+#: any.pm:227
#, c-format
msgid "NFS setup"
msgstr "Podešavanje NFS-a"
-#: any.pm:226
+#: any.pm:228
#, c-format
msgid "Please enter the hostname and directory of your NFS media"
msgstr "Molim unesite ime računara i direktorij vašeg NFS medija"
-#: any.pm:230
+#: any.pm:232
#, c-format
msgid "Hostname missing"
msgstr ""
-#: any.pm:231
+#: any.pm:233
#, c-format
msgid "Directory must begin with \"/\""
msgstr ""
-#: any.pm:235
+#: any.pm:237
#, c-format
msgid "Hostname of the NFS mount ?"
msgstr "Ime računara sa NFS serverom?"
-#: any.pm:236
+#: any.pm:238
#, c-format
msgid "Directory"
msgstr "Direktorij"
-#: any.pm:258
+#: any.pm:260
#, c-format
msgid "Supplementary"
msgstr ""
-#: any.pm:293
+#: any.pm:295
#, c-format
msgid ""
"Can't find a package list file on this mirror. Make sure the location is "
@@ -161,22 +136,22 @@ msgstr ""
"Ne mogu pronaći hdlist datoteku na ovom mirroru. Provjerite da li je "
"lokacija ispravna."
-#: any.pm:328
+#: any.pm:334
#, c-format
msgid "Looking at packages already installed..."
msgstr "Tražim već instalirane pakete..."
-#: any.pm:362
+#: any.pm:368
#, c-format
msgid "Finding packages to upgrade..."
msgstr "Pronalazim pakete za unaprjeđenje..."
-#: any.pm:381
+#: any.pm:387
#, c-format
msgid "Removing packages prior to upgrade..."
msgstr "Uklanjam pakete prije unaprjeđenja..."
-#: any.pm:402
+#: any.pm:408
#, c-format
msgid ""
"You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -188,18 +163,18 @@ msgid ""
"please reboot your system and upgrade using the Mandriva update applet."
msgstr ""
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
#, c-format
msgid "Reboot"
msgstr "Restartuj"
-#: any.pm:407
+#: any.pm:413
#, c-format
msgid "Proceed"
msgstr ""
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -213,72 +188,72 @@ msgstr ""
"\n"
"Želite li zaista deinstalirati ove pakete?\n"
-#: any.pm:815
+#: any.pm:821
#, c-format
msgid "Error reading file %s"
msgstr "Greška u čitanju datoteke %s"
-#: any.pm:1022
+#: any.pm:1028
#, c-format
msgid "The following disk(s) were renamed:"
msgstr "Sljedeći diskovi su preimenovani:"
-#: any.pm:1024
+#: any.pm:1030
#, c-format
msgid "%s (previously named as %s)"
msgstr "%s (ranije pod imenom %s)"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "HTTP"
msgstr "HTTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "FTP"
msgstr "FTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "NFS"
msgstr "NFS"
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
#, c-format
msgid "Network"
msgstr "Mreža"
-#: any.pm:1104
+#: any.pm:1110
#, c-format
msgid "Please choose a media"
msgstr "Molim izaberite medij"
-#: any.pm:1120
+#: any.pm:1126
#, c-format
msgid "File already exists. Overwrite it?"
msgstr "Datoteka već postoji. Želite li pisati preko nje?"
-#: any.pm:1124
+#: any.pm:1130
#, c-format
msgid "Permission denied"
msgstr "Nemate dozvolu"
-#: any.pm:1172
+#: any.pm:1178
#, c-format
msgid "Bad NFS name"
msgstr "Neispravan NFS naziv"
-#: any.pm:1193
+#: any.pm:1199
#, c-format
msgid "Bad media %s"
msgstr "Neispravan medij %s"
-#: any.pm:1236
+#: any.pm:1242
#, c-format
msgid "Can not make screenshots before partitioning"
msgstr "Ne mogu napraviti snimak ekrana prije particioniranja"
-#: any.pm:1244
+#: any.pm:1250
#, c-format
msgid "Screenshots will be available after install in %s"
msgstr "Snimanje ekrana će biti dostupno nakon što instalirate u %s"
@@ -289,11 +264,15 @@ msgid "Installation"
msgstr "Instalacija"
#: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
#, c-format
msgid "Configuration"
msgstr "Podešavanje"
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
#: install2.pm:168
#, c-format
msgid "You must also format %s"
@@ -319,22 +298,22 @@ msgstr "Pokrećem mrežu"
msgid "Bringing down the network"
msgstr "Zaustavljam mrežu"
-#: media.pm:402
+#: media.pm:399
#, c-format
msgid "Please wait, retrieving file"
msgstr ""
-#: media.pm:734
+#: media.pm:718
#, c-format
-msgid "Downloading file %s..."
-msgstr "Preuzimam datoteku %s..."
+msgid "unable to add medium"
+msgstr ""
-#: media.pm:822
+#: media.pm:758
#, c-format
msgid "Copying some packages on disks for future use"
msgstr "Kopiram neke pakete na disk radi buduće upotrebe"
-#: media.pm:875
+#: media.pm:811
#, c-format
msgid "Copying in progress"
msgstr "Kopiranje u toku"
@@ -376,27 +355,27 @@ msgstr ""
msgid "An error occurred:"
msgstr "Došlo je do greške"
-#: pkgs.pm:776
+#: pkgs.pm:780
#, fuzzy, c-format
msgid "%d installation transactions failed"
msgstr "Instalacija nije uspjela"
-#: pkgs.pm:777
+#: pkgs.pm:781
#, fuzzy, c-format
msgid "Installation of packages failed:"
msgstr "Instaliram paket %s"
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
#, c-format
msgid "Workstation"
msgstr "Radna stanica"
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
#, c-format
msgid "Office Workstation"
msgstr "Uredska radna stanica"
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
#, c-format
msgid ""
"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -405,7 +384,7 @@ msgstr ""
"Uredski programi: obrada teksta (OpenOffice.org Write, KWord), tablični "
"proračun (OpenOffice.org Calc, KSpread), PDF preglednici itd."
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
#, c-format
msgid ""
"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -414,32 +393,32 @@ msgstr ""
"Uredski programi: obrada teksta (kword, abiword), tablični alati (kspread, "
"gnumeric), pdf preglednici itd."
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
#, c-format
msgid "Game station"
msgstr "Stanica za igru"
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
#, c-format
msgid "Amusement programs: arcade, boards, strategy, etc"
msgstr "Zabavni programi: arkadne igre, stolne igre, strategije itd."
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
#, c-format
msgid "Multimedia station"
msgstr "Multimedijalna stanica"
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
#, c-format
msgid "Sound and video playing/editing programs"
msgstr "Programi za pregled i editovanje zvuka i videa"
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
#, c-format
msgid "Internet station"
msgstr "Internet stanica"
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
#, c-format
msgid ""
"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -448,211 +427,193 @@ msgstr ""
"Skup alata za čitanje i slanje pošte i news-a (mutt, tin...) i pregledanje "
"Weba"
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
#, c-format
msgid "Network Computer (client)"
msgstr "Mrežni računar (klijent)"
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
#, c-format
msgid "Clients for different protocols including ssh"
msgstr "Klijenti za razne protokole uključujući ssh"
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
#, c-format
msgid "Tools to ease the configuration of your computer"
msgstr "Alati za lakše podešavanje računara"
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
#, c-format
msgid "Console Tools"
msgstr "Alati za konzolu"
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
#, c-format
msgid "Editors, shells, file tools, terminals"
msgstr "Editori, shellovi, alati za datoteke, terminali"
#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
#, c-format
msgid "Development"
msgstr "Programiranje"
#: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
#, c-format
msgid "C and C++ development libraries, programs and include files"
msgstr "C i C++ biblioteke, programi i include datoteke"
#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
#, c-format
msgid "Documentation"
msgstr "Dokumentacija"
#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
#, c-format
msgid "Books and Howto's on Linux and Free Software"
msgstr "Knjige i howto-i na temu Linuxa i slobodnog softvera"
#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
#, c-format
msgid "LSB"
msgstr "LSB"
#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
#, c-format
msgid "Linux Standard Base. Third party applications support"
msgstr "Linux Standard Base. Podrška za programe trećih lica"
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
#, c-format
msgid "Web Server"
msgstr "Web server"
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
#, c-format
msgid "Apache"
msgstr "Apache"
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
#, c-format
msgid "Groupware"
msgstr "Groupware"
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
#, c-format
msgid "Kolab Server"
msgstr "Kolab server"
#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
#, c-format
msgid "Firewall/Router"
msgstr "Firewall/Router"
#: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
#, c-format
msgid "Internet gateway"
msgstr "Internet gateway"
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
#, c-format
msgid "Mail/News"
msgstr "Mail/News"
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
#, c-format
msgid "Postfix mail server, Inn news server"
msgstr "Postfix mail server, Inn news server"
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
#, c-format
msgid "Directory Server"
msgstr "Imenički server"
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
#, c-format
msgid "FTP Server"
msgstr "FTP server"
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
#, c-format
msgid "ProFTPd"
msgstr "ProFTPd"
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
#, c-format
msgid "DNS/NIS"
msgstr "DNS/NIS"
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
#, c-format
msgid "Domain Name and Network Information Server"
msgstr "Serveri domenskih imena i mrežnih informacija"
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
#, c-format
msgid "File and Printer Sharing Server"
msgstr "Server za dijeljenje datoteka i štampača"
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
#, c-format
msgid "NFS Server, Samba server"
msgstr "NFS server, Samba server"
#: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
#, c-format
msgid "Database"
msgstr "Baze podataka"
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
#, c-format
msgid "PostgreSQL and MySQL Database Server"
msgstr "Server PostgreSQL ili MySQL baze podataka"
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
#, c-format
msgid "Web/FTP"
msgstr "Web/FTP"
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
#, c-format
msgid "Apache, Pro-ftpd"
msgstr "Apache, Pro-ftpd"
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
#, c-format
msgid "Mail"
msgstr "Mail"
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
#, c-format
msgid "Postfix mail server"
msgstr "Postfix mail server"
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
#, c-format
msgid "PostgreSQL or MySQL database server"
msgstr "PostgreSQL ili MySQL baza podataka"
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
#, c-format
msgid "Network Computer server"
msgstr "Mrežni server"
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
#, c-format
msgid "NFS server, SMB server, Proxy server, ssh server"
msgstr "NFS server, SMB server, Proxy server, ssh server"
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
#, c-format
msgid "Graphical Environment"
msgstr "Grafičko okruženje"
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
#, c-format
msgid "KDE Workstation"
msgstr "KDE radna stanica"
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
#, c-format
msgid ""
"The K Desktop Environment, the basic graphical environment with a collection "
@@ -660,12 +621,12 @@ msgid ""
msgstr ""
"K Desktop Environment, osnovno grafičko okruženje sa izborom pratećih alata"
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
#, c-format
msgid "GNOME Workstation"
msgstr "GNOME radna stanica"
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
#, c-format
msgid ""
"A graphical environment with user-friendly set of applications and desktop "
@@ -674,7 +635,7 @@ msgstr ""
"Grafička okolina sa skupom korisnički orjentisanih programa i alata za radnu "
"površinu"
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
#, fuzzy, c-format
msgid "LXDE Desktop"
msgstr "IceWm okruženje"
@@ -688,54 +649,52 @@ msgstr ""
"Grafička okolina sa skupom korisnički orjentisanih programa i alata za radnu "
"površinu"
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
#, c-format
msgid "Other Graphical Desktops"
msgstr "Ostale grafičke okoline"
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
#, c-format
msgid "Window Maker, Enlightenment, Fvwm, etc"
msgstr "Window Maker, Enlightenment, Fvwm itd."
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
#, c-format
msgid "Utilities"
msgstr "Alati"
#: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
#, c-format
msgid "SSH Server"
msgstr "SSH server"
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
#, c-format
msgid "Webmin"
msgstr "Webmin"
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
#, c-format
msgid "Webmin Remote Configuration Server"
msgstr "Webmin server za podešavanje sistema"
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
#, c-format
msgid "Network Utilities/Monitoring"
msgstr "Mrežni alati i nadzor"
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
#, c-format
msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
msgstr "Alati za nadzor, praćenje procesa, tcpdump, nmap..."
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
#, c-format
msgid "Mandriva Wizards"
msgstr "Mandriva čarobnjaci"
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
#, c-format
msgid "Wizards to configure server"
msgstr "Čarobnjaci (wizardi) za podešavanje serverâ"
@@ -835,17 +794,17 @@ msgstr ""
msgid "Click on images in order to see a bigger preview"
msgstr ""
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
#, c-format
msgid "Package Group Selection"
msgstr "Izbor grupe paketa"
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
#, c-format
msgid "Individual package selection"
msgstr "Izbor pojedinačnih paketa"
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
#, c-format
msgid "Total size: %d / %d MB"
msgstr "Ukupna veličina: %d / %d MB"
@@ -962,12 +921,12 @@ msgstr "Minimalna instalacija"
msgid "Software Management"
msgstr "Programi"
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
#, c-format
msgid "Choose the packages you want to install"
msgstr "Izaberite pakete koje želite instalirati"
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
#, c-format
msgid "Installing"
msgstr "Instaliram"
@@ -995,7 +954,7 @@ msgstr[0] "%d paketa"
msgstr[1] "%d paketa"
msgstr[2] "%d paketa"
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
#, c-format
msgid "Summary"
msgstr "Ukratko"
@@ -1005,7 +964,7 @@ msgstr "Ukratko"
msgid "Configure"
msgstr "Podesi"
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
#, c-format
msgid "not configured"
msgstr "nije podešeno"
@@ -1015,7 +974,7 @@ msgstr "nije podešeno"
msgid "Media Selection"
msgstr "Izbor grupe paketa"
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
#, c-format
msgid ""
"The following installation media have been found.\n"
@@ -1024,7 +983,7 @@ msgstr ""
"Pronađeni su sljedeći instalacioni mediji.\n"
"Ako želite preskočiti neke od njih, možete ih isključiti sada."
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
#, c-format
msgid ""
"You have the option to copy the contents of the CDs onto the hard drive "
@@ -1036,7 +995,7 @@ msgstr ""
"Zatim će instalacija biti nastavljena sa hard diska, a paketi će ostati "
"dostupni nakon što sistem bude instaliran."
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
#, c-format
msgid "Copy whole CDs"
msgstr "Kopiraj čitave CDove"
@@ -1056,59 +1015,49 @@ msgstr "Molim izaberite raspored vaše tastature"
msgid "Here is the full list of available keyboards:"
msgstr "Ovdje je puna lista svih dostupnih tastatura"
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
#, c-format
msgid "Install/Upgrade"
msgstr "Instaliraj/Unaprijedi"
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
#, c-format
msgid "Is this an install or an upgrade?"
msgstr "Da li je ovo instalacija ili unaprjeđenje?"
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
#, fuzzy, c-format
msgid ""
"_: This is a noun:\n"
"Install"
msgstr "Instalacija"
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
#, c-format
msgid "Upgrade %s"
msgstr "Unaprijedi %s"
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
#, c-format
msgid "Encryption key for %s"
msgstr "Ključ enkripcije za %s"
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
#, c-format
msgid "Cancel installation, reboot system"
msgstr ""
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
#, fuzzy, c-format
msgid "New Installation"
msgstr "Instalacija"
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
#, c-format
msgid "Upgrade previous installation (not recommended)"
msgstr ""
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
#, c-format
msgid ""
"Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1120,17 +1069,17 @@ msgid ""
"Installation\"."
msgstr ""
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "IDE"
msgstr "IDE"
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "Configuring IDE"
msgstr "Podešavam IDE"
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
#, c-format
msgid ""
"No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1140,7 +1089,7 @@ msgstr ""
"nastaviti, ali da biste pokrenuli vaš sistem morate kreirati bootstrap "
"particiju u DiskDrake-u"
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
#, c-format
msgid ""
"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1150,7 +1099,7 @@ msgstr ""
"Trebate napraviti PPC PReP Boot bootstrap! Instalacija će nastaviti, ali da "
"biste pokrenuli vaš sistem morate kreirati bootstrap particiju u DiskDrake-u"
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
#, c-format
msgid ""
"Change your Cd-Rom!\n"
@@ -1164,19 +1113,19 @@ msgstr ""
"Ako ga nemate, pritisnite \"Odustani\" da preskočite instalaciju sa tog CD-"
"ROMa."
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
#, c-format
msgid "Looking for available packages..."
msgstr "Tražim dostupne pakete..."
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
#, c-format
msgid ""
"Your system does not have enough space left for installation or upgrade (%"
"dMB > %dMB)"
msgstr ""
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
#, c-format
msgid ""
"Please choose load or save package selection.\n"
@@ -1185,52 +1134,52 @@ msgstr ""
"Molim izaberite da li ćete učitati ili snimiti izbor paketa.\n"
"Format je isti kao i diskete koje generiše auto_install."
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Load"
msgstr "Učitaj"
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Save"
msgstr "Snimi"
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
#, c-format
msgid "Bad file"
msgstr "Neispravna datoteka"
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
#, fuzzy, c-format
msgid "KDE"
msgstr "IDE"
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
#, c-format
msgid "GNOME"
msgstr "GNOME"
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
#, fuzzy, c-format
msgid "Desktop Selection"
msgstr "Izbor grupe paketa"
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
#, c-format
msgid "You can choose your workstation desktop profile."
msgstr ""
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
#, c-format
msgid "Selected size is larger than available space"
msgstr "Izabrana veličina je veća od slobodnog prostora"
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
#, c-format
msgid "Type of install"
msgstr "Vrsta instalacije"
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
#, c-format
msgid ""
"You have not selected any group of packages.\n"
@@ -1239,82 +1188,82 @@ msgstr ""
"Niste izabrali nijednu grupu paketa\n"
"Molim izaberite vrstu minimalne instalacije koju želite:"
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
#, c-format
msgid "With X"
msgstr "Sa grafikom"
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
#, c-format
msgid "With basic documentation (recommended!)"
msgstr "Sa osnovnom dokumentacijom (preporučeno)"
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
#, c-format
msgid "Truly minimal install (especially no urpmi)"
msgstr "Stvarno minimalna instalacija (posebno bez urpmi)"
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
#, c-format
msgid "Preparing installation"
msgstr "Pripremam instalaciju"
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
#, c-format
msgid "Installing package %s"
msgstr "Instaliram paket %s"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "There was an error ordering packages:"
msgstr "Došlo je do greške pri raspoređivanju paketa:"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "Go on anyway?"
msgstr "Da nastavim?"
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
#, c-format
msgid "Retry"
msgstr "Pokušaj ponovo"
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
#, c-format
msgid "Skip this package"
msgstr ""
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
#, c-format
msgid "Skip all packages from medium \"%s\""
msgstr ""
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
#, fuzzy, c-format
msgid "Go back to media and packages selection"
msgstr "Spasi izbor paketa"
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
#, fuzzy, c-format
msgid "There was an error installing package %s."
msgstr "Došlo je do greške kod instaliranja paketa:"
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
#, c-format
msgid "Post-install configuration"
msgstr "Post-instalacijsko podešavanje"
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
#, c-format
msgid "Please ensure the Update Modules media is in drive %s"
msgstr "Molim provjerite da je medij za ažuriranje u uređaju %s"
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
#, c-format
msgid "Updates"
msgstr "Ažuriranje"
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
#, c-format
msgid ""
"You now have the opportunity to download updated packages. These packages\n"
@@ -1335,28 +1284,28 @@ msgstr ""
"\n"
"Da li želite instalirati ažurirane pakete ?"
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
#, c-format
msgid "%s on %s"
msgstr "%s na %s"
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
#, c-format
msgid "Hardware"
msgstr "Hardware"
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
#, c-format
msgid "Sound card"
msgstr "Zvučna kartica"
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
#, c-format
msgid "Do you have an ISA sound card?"
msgstr "Imate li ISA zvučnu karticu?"
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
#, c-format
msgid ""
"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1365,68 +1314,68 @@ msgstr ""
"Pokrenite \"alsaconf\" ili \"sndconfig\" poslije instalacije kako biste "
"podesili vašu zvučnu karticu"
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
#, c-format
msgid "No sound card detected. Try \"harddrake\" after installation"
msgstr ""
"Nije otkrivena zvučna kartica. Probajte \"harddrake\" poslije instalacije"
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
#, c-format
msgid "Graphical interface"
msgstr "Grafički interfejs"
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
#, c-format
msgid "Network & Internet"
msgstr "Mreža i Internet"
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
#, c-format
msgid "Proxies"
msgstr "Proxy-ji"
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
#, c-format
msgid "configured"
msgstr "podešeno"
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
#, c-format
msgid "Security Level"
msgstr "Sigurnosni nivo"
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
#, c-format
msgid "Firewall"
msgstr "Firewall"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "activated"
msgstr "aktiviran"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "disabled"
msgstr "isključen"
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
#, c-format
msgid "You have not configured X. Are you sure you really want this?"
msgstr "Niste podesili X. Sigurno želite uraditi ovo?"
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
#, c-format
msgid "Preparing bootloader..."
msgstr "Pripremam bootloader..."
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
#, c-format
msgid "Be patient, this may take a while..."
msgstr ""
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
#, c-format
msgid ""
"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1439,7 +1388,7 @@ msgstr ""
"neki drugi način za bootanje vašeg računara. Argument kernela za root fs je: "
"root=%s"
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
#, c-format
msgid ""
"In this security level, access to the files in the Windows partition is "
@@ -1448,17 +1397,17 @@ msgstr ""
"Na ovom sigurnosnom nivou, pristup datotekama na Windows particijama je "
"dozvoljen samo administratoru."
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr "Ubacite praznu disketu u jedinicu %s"
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
#, c-format
msgid "Creating auto install floppy..."
msgstr "Pravim auto instalacijsku disketu..."
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
#, c-format
msgid ""
"Some steps are not completed.\n"
@@ -1469,7 +1418,7 @@ msgstr ""
"\n"
"Da li zaista želite izaći sada?"
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
#, c-format
msgid "Congratulations"
msgstr "Čestitamo"
@@ -1613,6 +1562,9 @@ msgid ""
"Exit"
msgstr "Izlaz"
+#~ msgid "Downloading file %s..."
+#~ msgstr "Preuzimam datoteku %s..."
+
#~ msgid ""
#~ "You have selected the following server(s): %s\n"
#~ "\n"
diff --git a/perl-install/install/share/po/ca.po b/perl-install/install/share/po/ca.po
index 6e948afd3..2623d181d 100644
--- a/perl-install/install/share/po/ca.po
+++ b/perl-install/install/share/po/ca.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ca\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
"PO-Revision-Date: 2005-09-13 23:24+0200\n"
"Last-Translator: Albert Astals Cid <astals11@terra.es>\n"
"Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
@@ -19,31 +19,6 @@ msgstr ""
"X-Generator: KBabel 1.9.1\n"
"Plural-Forms: nplurals=2; plural=n!=1;\n"
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr ""
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr ""
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr ""
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr ""
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr ""
-
#: any.pm:109
#, c-format
msgid "Do you have further supplementary media?"
@@ -79,17 +54,17 @@ msgstr "Xarxa (FTP)"
msgid "Network (NFS)"
msgstr "Xarxa (NFS)"
-#: any.pm:163
+#: any.pm:165
#, c-format
msgid "URL of the mirror?"
msgstr "URL de la rèplica?"
-#: any.pm:169
+#: any.pm:171
#, c-format
msgid "URL must start with ftp:// or http://"
msgstr ""
-#: any.pm:180
+#: any.pm:182
#, c-format
msgid ""
"Contacting Mandriva Linux web site to get the list of available mirrors..."
@@ -97,7 +72,7 @@ msgstr ""
"S'està contactant amb el servidor Mandriva Linux per obtenir la llista de "
"rèpliques disponibles..."
-#: any.pm:185
+#: any.pm:187
#, fuzzy, c-format
msgid ""
"Failed contacting Mandriva Linux web site to get the list of available "
@@ -106,69 +81,69 @@ msgstr ""
"S'està contactant amb el servidor Mandriva Linux per obtenir la llista de "
"rèpliques disponibles..."
-#: any.pm:195
+#: any.pm:197
#, c-format
msgid "Choose a mirror from which to get the packages"
msgstr "Escolliu una rèplica des de la qual aconseguir els paquets"
-#: any.pm:225
+#: any.pm:227
#, c-format
msgid "NFS setup"
msgstr ""
-#: any.pm:226
+#: any.pm:228
#, c-format
msgid "Please enter the hostname and directory of your NFS media"
msgstr ""
-#: any.pm:230
+#: any.pm:232
#, c-format
msgid "Hostname missing"
msgstr ""
-#: any.pm:231
+#: any.pm:233
#, c-format
msgid "Directory must begin with \"/\""
msgstr ""
-#: any.pm:235
+#: any.pm:237
#, c-format
msgid "Hostname of the NFS mount ?"
msgstr ""
-#: any.pm:236
+#: any.pm:238
#, c-format
msgid "Directory"
msgstr "Directori"
-#: any.pm:258
+#: any.pm:260
#, c-format
msgid "Supplementary"
msgstr ""
-#: any.pm:293
+#: any.pm:295
#, c-format
msgid ""
"Can't find a package list file on this mirror. Make sure the location is "
"correct."
msgstr "No s'ha pogut trobat el fitxer hdlist en aquest rèplica"
-#: any.pm:328
+#: any.pm:334
#, c-format
msgid "Looking at packages already installed..."
msgstr "S'estan cercant els paquets ja instal·lats..."
-#: any.pm:362
+#: any.pm:368
#, c-format
msgid "Finding packages to upgrade..."
msgstr "S'estan cercant els paquets a actualitzar"
-#: any.pm:381
+#: any.pm:387
#, c-format
msgid "Removing packages prior to upgrade..."
msgstr ""
-#: any.pm:402
+#: any.pm:408
#, c-format
msgid ""
"You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -180,18 +155,18 @@ msgid ""
"please reboot your system and upgrade using the Mandriva update applet."
msgstr ""
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
#, c-format
msgid "Reboot"
msgstr "Reinicia"
-#: any.pm:407
+#: any.pm:413
#, c-format
msgid "Proceed"
msgstr ""
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -204,72 +179,72 @@ msgstr ""
"\n"
"Voleu realment suprimir aquests paquets?\n"
-#: any.pm:815
+#: any.pm:821
#, c-format
msgid "Error reading file %s"
msgstr "S'ha produït un error en llegir el fitxer %s"
-#: any.pm:1022
+#: any.pm:1028
#, c-format
msgid "The following disk(s) were renamed:"
msgstr ""
-#: any.pm:1024
+#: any.pm:1030
#, c-format
msgid "%s (previously named as %s)"
msgstr ""
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "HTTP"
msgstr "HTTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "FTP"
msgstr "FTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "NFS"
msgstr "NFS"
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
#, c-format
msgid "Network"
msgstr "Xarxa"
-#: any.pm:1104
+#: any.pm:1110
#, fuzzy, c-format
msgid "Please choose a media"
msgstr "Si us plau escolliu"
-#: any.pm:1120
+#: any.pm:1126
#, c-format
msgid "File already exists. Overwrite it?"
msgstr "El fitxer ja existeix. El voleu sobreescriure?"
-#: any.pm:1124
+#: any.pm:1130
#, c-format
msgid "Permission denied"
msgstr "S'ha denegat el permís"
-#: any.pm:1172
+#: any.pm:1178
#, c-format
msgid "Bad NFS name"
msgstr "Nom NFS incorrecte"
-#: any.pm:1193
+#: any.pm:1199
#, fuzzy, c-format
msgid "Bad media %s"
msgstr "s'ha afegit la font %s"
-#: any.pm:1236
+#: any.pm:1242
#, c-format
msgid "Can not make screenshots before partitioning"
msgstr "No es poden fer captures de pantalla abans de fer les particions"
-#: any.pm:1244
+#: any.pm:1250
#, c-format
msgid "Screenshots will be available after install in %s"
msgstr "Les captures estaran disponibles després d'instal·lar a %s"
@@ -280,11 +255,15 @@ msgid "Installation"
msgstr "S'està instal·lant"
#: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
#, c-format
msgid "Configuration"
msgstr "Configuració"
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
#: install2.pm:168
#, c-format
msgid "You must also format %s"
@@ -309,22 +288,22 @@ msgstr "S'està activant la xarxa"
msgid "Bringing down the network"
msgstr "S'està desactivant la xarxa"
-#: media.pm:402
+#: media.pm:399
#, c-format
msgid "Please wait, retrieving file"
msgstr ""
-#: media.pm:734
+#: media.pm:718
#, c-format
-msgid "Downloading file %s..."
-msgstr "S'està descarregant el fitxer %s..."
+msgid "unable to add medium"
+msgstr ""
-#: media.pm:822
+#: media.pm:758
#, c-format
msgid "Copying some packages on disks for future use"
msgstr ""
-#: media.pm:875
+#: media.pm:811
#, c-format
msgid "Copying in progress"
msgstr "Còpia en procés"
@@ -366,27 +345,27 @@ msgstr ""
msgid "An error occurred:"
msgstr "S'ha produït un error"
-#: pkgs.pm:776
+#: pkgs.pm:780
#, fuzzy, c-format
msgid "%d installation transactions failed"
msgstr "Instal·lació fallida"
-#: pkgs.pm:777
+#: pkgs.pm:781
#, fuzzy, c-format
msgid "Installation of packages failed:"
msgstr "S'està instal·lant el paquet %s"
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
#, c-format
msgid "Workstation"
msgstr "Estació de treball"
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
#, c-format
msgid "Office Workstation"
msgstr "Estació de treball d'oficina"
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
#, c-format
msgid ""
"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -396,7 +375,7 @@ msgstr ""
"Kword), fulls de càlcul (OpenOffice.org Calc, Kspread), visualitzadors pdf, "
"etc."
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
#, c-format
msgid ""
"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -405,32 +384,32 @@ msgstr ""
"Programes d'ofimàtica: processadors de textos (kword, abiword), fulls de "
"càlcul (kspread, gnumeric), visualitzadors pdf, etc."
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
#, c-format
msgid "Game station"
msgstr "Estació de jocs"
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
#, c-format
msgid "Amusement programs: arcade, boards, strategy, etc"
msgstr "Programes d'entreteniment: acció, jocs de taula, estratègia, etc."
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
#, c-format
msgid "Multimedia station"
msgstr "Estació multimèdia"
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
#, c-format
msgid "Sound and video playing/editing programs"
msgstr "Programes de reproducció/edició de so i vídeo"
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
#, c-format
msgid "Internet station"
msgstr "Estació d'Internet"
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
#, c-format
msgid ""
"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -439,211 +418,193 @@ msgstr ""
"Conjunt d'eines per llegir i enviar correu i notícies (mutt, tin...) i per "
"navegar pel Web"
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
#, c-format
msgid "Network Computer (client)"
msgstr "Ordinador de xarxa (client)"
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
#, c-format
msgid "Clients for different protocols including ssh"
msgstr "Clients per a diferents protocols, incloent l'ssh"
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
#, c-format
msgid "Tools to ease the configuration of your computer"
msgstr "Eines per facilitar la configuració de l'ordinador"
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
#, c-format
msgid "Console Tools"
msgstr "Eines de consola"
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
#, c-format
msgid "Editors, shells, file tools, terminals"
msgstr "Editors, intèrprets d'ordres, eines de fitxer, terminals"
#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
#, c-format
msgid "Development"
msgstr "Desenvolupament"
#: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
#, c-format
msgid "C and C++ development libraries, programs and include files"
msgstr "Biblioteques de desenvolupament C i C++, programes i fitxers include"
#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
#, c-format
msgid "Documentation"
msgstr "Documentació"
#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
#, c-format
msgid "Books and Howto's on Linux and Free Software"
msgstr "Llibres i Com es fa... sobre el Linux i el programari lliure"
#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
#, c-format
msgid "LSB"
msgstr "LSB"
#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
#, c-format
msgid "Linux Standard Base. Third party applications support"
msgstr "Base Estàndard de Linux (LSB). Suport a aplicacions de tercers"
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
#, c-format
msgid "Web Server"
msgstr "Servidor Web"
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
#, c-format
msgid "Apache"
msgstr "Apache"
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
#, c-format
msgid "Groupware"
msgstr "Groupware"
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
#, c-format
msgid "Kolab Server"
msgstr "Servidor Kolab"
#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
#, c-format
msgid "Firewall/Router"
msgstr "Tallafoc/Encaminador"
#: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
#, c-format
msgid "Internet gateway"
msgstr "Passarel·la a Internet"
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
#, c-format
msgid "Mail/News"
msgstr "Correu/Notícies"
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
#, c-format
msgid "Postfix mail server, Inn news server"
msgstr "Servidor de correu Postfix, Servidor de noticies Inn"
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
#, c-format
msgid "Directory Server"
msgstr "Servidor de directori"
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
#, c-format
msgid "FTP Server"
msgstr "Servidor FTP"
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
#, c-format
msgid "ProFTPd"
msgstr "ProFTPd"
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
#, c-format
msgid "DNS/NIS"
msgstr "DNS/NIS"
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
#, c-format
msgid "Domain Name and Network Information Server"
msgstr "Servidor de Noms de Domini i d'Informació de la Xarxa (DNS/NIS)"
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
#, c-format
msgid "File and Printer Sharing Server"
msgstr "Servidor de compartició de fitxers i impressores"
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
#, c-format
msgid "NFS Server, Samba server"
msgstr "Servidor NFS, Servidor Samba"
#: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
#, c-format
msgid "Database"
msgstr "Base de dades"
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
#, c-format
msgid "PostgreSQL and MySQL Database Server"
msgstr "Servidor de bases de dades PostgreSQL i MySQL"
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
#, c-format
msgid "Web/FTP"
msgstr "Web/FTP"
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
#, c-format
msgid "Apache, Pro-ftpd"
msgstr "Apache i Pro-ftpd"
foreach (qw(printer ppd driver make model)) { #- copy some parameter, shorter that way... $printer->{currentqueue}{$_} = $printer::main::thedb{$printer->{DBENTRY}}{$_}; } $newdriver = 1; } # Use the "printer" and not the "foomatic" field to identify a Foomatic # queue because in a new queue "foomatic" is not set yet. if ($printer->{currentqueue}{printer} || # We have a Foomatic queue $printer->{currentqueue}{ppd}) { # We have a PPD queue if ($printer->{currentqueue}{printer}) { # Foomatic queue? # In case of a new queue "foomatic" was not set yet $printer->{currentqueue}{foomatic} = 1; $printer->{currentqueue}{ppd} = undef; } elsif ($printer->{currentqueue}{ppd}) { # PPD queue? # If we had a Foomatic queue before, unmark the flag and # initialize the "printer" and "driver" fields $printer->{currentqueue}{foomatic} = 0; $printer->{currentqueue}{printer} = undef; $printer->{currentqueue}{driver} = "PPD"; } # Now get the options for this printer/driver combo if ($printer->{configured}{$queue} && ($printer->{configured}{$queue}{queuedata}{foomatic} || $printer->{configured}{$queue}{queuedata}{ppd})) { if (!$newdriver) { # The user did not change the printer/driver $printer->{ARGS} = $printer->{configured}{$queue}{args}; } elsif ($printer->{currentqueue}{foomatic}) { # The queue was already configured with Foomatic ... # ... and the user has chosen another printer/driver $printer->{ARGS} = printer::main::read_foomatic_options($printer); } elsif ($printer->{currentqueue}{ppd}) { # ... and the user has chosen another printer/driver $printer->{ARGS} = printer::main::read_ppd_options($printer); } } else { # The queue was not configured with Foomatic before # Set some special options $printer->{SPECIAL_OPTIONS} = ''; # Default page size depending on the country/language # (US/Canada -> Letter, Others -> A4) my $pagesize; if ($printer->{PAPERSIZE}) { $printer->{SPECIAL_OPTIONS} .= " -o PageSize=$printer->{PAPERSIZE}"; } elsif (($pagesize = $in->{locale}{country}) || ($pagesize = $ENV{LC_PAPER}) || ($pagesize = $in->{locale}{lang}) || ($pagesize = $ENV{LANG}) || ($pagesize = $ENV{LANGUAGE}) || ($pagesize = $ENV{LC_ALL})) { if ($pagesize =~ /US/ || $pagesize =~ /CA/) { $pagesize = "Letter"; } else { $pagesize = "A4"; } $printer->{SPECIAL_OPTIONS} .= " -o PageSize=$pagesize"; } # Do not embed the following messages in the add-printer # wizard. local $::isWizard = 0; # oki4drv driver -> OKI winprinter which needs the # oki4daemon to work if ($printer->{currentqueue}{driver} eq 'oki4drv') { if ($printer->{currentqueue}{connect} !~ m!^(parallel|file):/dev/lp0$!) { $::noX || $in->ask_warn(N("OKI winprinter configuration"), N("You are configuring an OKI laser winprinter. These printers\nuse a very special communication protocol and therefore they work only when connected to the first parallel port. When your printer is connected to another port or to a print server box please connect the printer to the first parallel port before you print a test page. Otherwise the printer will not work. Your connection type setting will be ignored by the driver.")); } $printer->{currentqueue}{connect} = 'file:/dev/null'; # Start the oki4daemon services::start_service_on_boot('oki4daemon'); printer::services::start('oki4daemon'); # Set permissions my $h = { cups => sub { set_permissions('/dev/oki4drv', '660', 'lp', 'sys') }, pdq => sub { set_permissions('/dev/oki4drv', '666') } }; my $s = $h->{$printer->{SPOOLER}} ||= sub { set_permissions('/dev/oki4drv', '660', 'lp', 'lp') }; &$s; } elsif ($printer->{currentqueue}{driver} eq 'lexmarkinkjet') { # Set "Port" option my $opt = $lexmarkinkjet_options{$printer->{currentqueue}{connect}}; if ($opt) { $printer->{SPECIAL_OPTIONS} .= $opt; } else { $::noX || $in->ask_warn(N("Lexmark inkjet configuration"), N("The inkjet printer drivers provided by Lexmark only support local printers, no printers on remote machines or print server boxes. Please connect your printer to a local port or configure it on the machine where it is connected to.")); return 0; } # Set device permissions if ($printer->{currentqueue}{connect} =~ /^\s*(file|parallel|usb):(\S*)\s*$/) { if ($printer->{SPOOLER} eq 'cups') { set_permissions($2, '660', 'lp', 'sys'); } elsif ($printer->{SPOOLER} eq 'pdq') { set_permissions($2, '666'); } else { set_permissions($2, '660', 'lp', 'lp'); } } # This is needed to have the device not blocked by the # spooler backend. $printer->{currentqueue}{connect} = 'file:/dev/null'; #install packages my $drivertype = $printer->{currentqueue}{model}; if ($drivertype eq 'Z22') { $drivertype = 'Z32' } if ($drivertype eq 'Z23') { $drivertype = 'Z33' } $drivertype = lc($drivertype); if (!files_exist("/usr/local/lexmark/$drivertype/$drivertype")) { eval { $::noX or $in->do_pkgs->install("lexmark-drivers-$drivertype") }; } if (!files_exist("/usr/local/lexmark/$drivertype/$drivertype")) { # Driver installation failed, probably we do not have # the commercial CDs $::noX || $in->ask_warn(N("Lexmark inkjet configuration"), N("To be able to print with your Lexmark inkjet and this configuration, you need the inkjet printer drivers provided by Lexmark (http://www.lexmark.com/). Click on the \"Drivers\" link. Then choose your model and afterwards \"Linux\" as operating system. The drivers come as RPM packages or shell scripts with interactive graphical installation. You do not need to do this configuration by the graphical frontends. Cancel directly after the license agreement. Then print printhead alignment pages with \"lexmarkmaintain\" and adjust the head alignment settings with this program.")); } } elsif ($printer->{currentqueue}{driver} eq 'drv_x125') { # Set "Device" option my $opt = $drv_x125_options{$printer->{currentqueue}{connect}}; if ($opt) { $printer->{SPECIAL_OPTIONS} .= $opt; } else { $::noX || $in->ask_warn(N("Lexmark X125 configuration"), N("The driver for this printer only supports printers locally connected via USB, no printers on remote machines or print server boxes. Please connect your printer to a local USB port or configure it on the machine where it is connected to.")); return 0; } # Set device permissions if ($printer->{currentqueue}{connect} =~ /^\s*(file|parallel|usb):(\S*)\s*$/) { if ($printer->{SPOOLER} eq 'cups') { set_permissions($2, '660', 'lp', 'sys'); } elsif ($printer->{SPOOLER} eq 'pdq') { set_permissions($2, '666'); } else { set_permissions($2, '660', 'lp', 'lp'); } } # This is needed to have the device not blocked by the # spooler backend. $printer->{currentqueue}{connect} = 'file:/dev/null'; } elsif ($printer->{currentqueue}{driver} eq 'ml85p') { # Check whether printer is on first parallel port if ($printer->{currentqueue}{connect} !~ m!^\s*(parallel|file):/dev/(lp|printers/)0\s*$!) { $::noX || $in->ask_warn(N("Samsung ML/QL-85G configuration"), N("The driver for this printer only supports printers locally connected on the first parallel port, no printers on remote machines or print server boxes or on other parallel ports. Please connect your printer to the first parallel port or configure it on the machine where it is connected to.")); return 0; } # Set driver executable permissions if ($printer->{SPOOLER} eq 'cups') { set_permissions('/usr/bin/ml85p', '4750', 'root', 'sys'); } elsif ($printer->{SPOOLER} eq 'pdq') { set_permissions('/usr/bin/ml85p', '4755', 'root', 'sys'); } else { set_permissions('/usr/bin/ml85p', '4750', 'root', 'lp'); } # This is needed to have the device not blocked by the # spooler backend. $printer->{currentqueue}{connect} = 'file:/dev/null'; } elsif (($printer->{currentqueue}{driver} =~ m!^\s*lbp[46]60\s*$!) || ($printer->{currentqueue}{ppd} && ($printer->{currentqueue}{ppd} =~ m!Canon-LBP-[46]60-lbp[46]60.ppd!))) { # Check whether printer is on first parallel port if ($printer->{currentqueue}{connect} !~ m!^\s*(parallel|file):/dev/(lp|printers/)0\s*$!) { $::noX || $in->ask_warn(N("Canon LBP-460/660 configuration"), N("The driver for this printer only supports printers locally connected on the first parallel port, no printers on remote machines or print server boxes or on other parallel ports. Please connect your printer to the first parallel port or configure it on the machine where it is connected to.")); return 0; } # Set driver executable permissions if ($printer->{SPOOLER} eq 'cups') { set_permissions('/usr/bin/lbp660', '4750', 'root', 'sys'); } elsif ($printer->{SPOOLER} eq 'pdq') { set_permissions('/usr/bin/lbp660', '4755', 'root', 'sys'); } else { set_permissions('/usr/bin/lbp660', '4750', 'root', 'lp'); } # This is needed to have the device not blocked by the # spooler backend. $printer->{currentqueue}{connect} = 'file:/dev/null'; } elsif (($printer->{currentqueue}{driver} =~ m!^\s*capt\s*$!) || ($printer->{currentqueue}{ppd} && ($printer->{currentqueue}{ppd} =~ m!Canon-LBP-\d*-capt.ppd!))) { # Check whether printer is on USB if ($printer->{currentqueue}{connect} !~ m!^\s*(usb):!) { $::noX || $in->ask_warn(N("Canon LBP-810/1120 (CAPT) configuration"), N("The driver for this printer only supports printers locally connected via USB, no printers on remote machines or print server boxes or on the parallel port. Please connect your printer to the USB or configure it on the machine where it is directly connected to.")); return 0; } # This is needed to have the device not blocked by the # spooler backend. $printer->{currentqueue}{connect} = 'file:/dev/null'; } elsif ($printer->{currentqueue}{printer} eq 'HP-LaserJet_1000') { $in->ask_warn(N("Firmware-Upload for HP LaserJet 1000"), $hp1000fwtext); } if ($printer->{currentqueue}{foomatic}) { # Foomatic queue? $printer->{ARGS} = printer::main::read_foomatic_options($printer); } elsif ($printer->{currentqueue}{ppd}) { # PPD queue? $printer->{ARGS} = printer::main::read_ppd_options($printer); } delete($printer->{SPECIAL_OPTIONS}); } } 1; } sub unhexify { # Replace hex notation for unprintable characters in PPD files # by the actual characters ex: "<0A>" --> chr(hex("0A")) # Taken from Foomatic my ($input) = @_; my $output = ""; my $hexmode = 0; my $firstdigit = ""; for (my $i = 0; $i < length($input); $i++) { my $c = substr($input, $i, 1); if ($hexmode) { if ($c eq ">") { # End of hex string $hexmode = 0; } elsif ($c =~ /^[0-9a-fA-F]$/) { # Hexadecimal digit, two of them give a character if ($firstdigit ne "") { $output .= chr(hex("$firstdigit$c")); $firstdigit = ""; } else { $firstdigit = $c; } } } else { if ($c eq "<") { # Beginning of hex string $hexmode = 1; } else { # Normal character $output .= $c; } } } return $output; } sub setup_options { my ($printer, $in) = @_; local $::isEmbedded = 0; my @simple_options = ("PageSize", # Media properties "MediaType", "Form", "InputSlot", # Trays "Tray", "OutBin", "OutputBin", "FaceUp", "FaceDown", "Collate", "Manual", "ManualFeed", "Manualfeed", "ManualFeeder", "Feeder", "Duplex", # Double-sided printing "Binding", "Tumble", "DoubleSided", "Resolution", # Resolution/Quality "GSResolution", "HWResolution", "JCLResolution", "Quality", "PrintQuality", "PrintoutQuality", "QualityType", "ImageType", "stpImageType", "EconoMode", "JCLEconoMode", "FastRes", "JCLFastRes", "InkType", # Colour/Gray/BW, 4-ink/6-ink "stpInkType", "Mode", "OutputMode", "OutputType", "ColorMode", "ColorModel", "PrintingMode", "Monochrome", "BlackOnly", "Grayscale", "GrayScale", "Colour", "Color", "Gamma", # Lighter/Darker "GammaCorrection", "GammaGeneral", "MasterGamma", "StpGamma", "stpGamma", "EconoMode", # Ink/Toner saving "Economode", "TonerSaving", "JCLEconomode", "HPNup", # Other useful options "InstalledMemory", # Laser printer hardware config "Option1", "Option2", "Option3", "Option4", "Option5", "Option6", "Option7", "Option8", "Option9", "Option10", "Option11", "Option12", "Option13", "Option14", "Option15", "Option16", "Option17", "Option18", "Option19", "Option20", "Option21", "Option22", "Option23", "Option24", "Option25", "Option26", "Option27", "Option28", "Option29", "Option30" ); # $in->set_help('setupOptions') if $::isInstall; if ($printer->{currentqueue}{printer} || # We have a Foomatic queue $printer->{currentqueue}{ppd}) { # We have a CUPS+PPD queue # Set up the widgets for the option dialog my $helptext = N("Printer default settings You should make sure that the page size and the ink type/printing mode (if available) and also the hardware configuration of laser printers (memory, duplex unit, extra trays) are set correctly. Note that with a very high printout quality/resolution printing can get substantially slower."); my @widgets; my @userinputs; my @choicelists; my @shortchoicelists; my $i; my @oldgroup = ("", ""); for ($i = 0; $i <= $#{$printer->{ARGS}}; $i++) { # Do not show hidden options (member options of a forced # composite option) next if $printer->{ARGS}[$i]{hidden}; my $optshortdefault = $printer->{ARGS}[$i]{default}; # Should the option only show when the "Advanced" button was # clicked? my $advanced = ((defined($printer->{ARGS}[$i]{group}) && $printer->{ARGS}[$i]{group} !~ /^(|General|.*install.*)$/i) || (!($printer->{ARGS}[$i]{group}) && !member($printer->{ARGS}[$i]{name}, @simple_options)) ? 1 : 0); # Group header if ($printer->{ARGS}[$i]{group} ne $oldgroup[$advanced]) { my $_level = $#{$printer->{ARGS}[$i]{grouptrans}}; $oldgroup[$advanced] = $printer->{ARGS}[$i]{group}; if ($printer->{ARGS}[$i]{group}) { push(@widgets, { val => unhexify(join(" / ", @{$printer->{ARGS}[$i]{grouptrans}})), advanced => $advanced }); } } if ($printer->{ARGS}[$i]{type} eq 'enum') { # enumerated option $choicelists[$i] = []; $shortchoicelists[$i] = []; foreach my $choice (@{$printer->{ARGS}[$i]{vals}}) { push(@{$choicelists[$i]}, unhexify($choice->{comment})); push(@{$shortchoicelists[$i]}, $choice->{value}); if ($choice->{value} eq $optshortdefault) { $userinputs[$i] = unhexify($choice->{comment}); } } push(@widgets, { label => unhexify($printer->{ARGS}[$i]{comment}), val => \$userinputs[$i], not_edit => 1, list => \@{$choicelists[$i]}, sort => 0, advanced => $advanced, help => $helptext }) if $printer->{ARGS}[$i]{name} ne 'PageRegion'; } elsif ($printer->{ARGS}[$i]{type} eq 'bool') { # boolean option $choicelists[$i] = [(unhexify($printer->{ARGS}[$i]{comment_true}) || unhexify($printer->{ARGS}[$i]{name}) || "Yes"), (unhexify($printer->{ARGS}[$i]{comment_false}) || unhexify($printer->{ARGS}[$i]{name_false}) || "No")]; $shortchoicelists[$i] = []; my $numdefault = ($optshortdefault =~ m!^\s*(true|on|yes|1)\s*$!i ? "1" : "0"); $userinputs[$i] = $choicelists[$i][1-$numdefault]; push(@widgets, { label => unhexify($printer->{ARGS}[$i]{comment}), val => \$userinputs[$i], not_edit => 1, list => \@{$choicelists[$i]}, sort => 0, advanced => $advanced, help => $helptext }); } else { # numerical option $choicelists[$i] = []; $shortchoicelists[$i] = []; $userinputs[$i] = $optshortdefault; push(@widgets, { label => unhexify($printer->{ARGS}[$i]{comment}) . " ($printer->{ARGS}[$i]{min}... " . "$printer->{ARGS}[$i]{max})", #type => 'range', #min => $printer->{ARGS}[$i]{min}, #max => $printer->{ARGS}[$i]{max}, val => \$userinputs[$i], advanced => $advanced, help => $helptext }); } } # Show the options dialog. The call-back function does a # range check of the numerical options. my $windowtitle = "$printer->{currentqueue}{make} $printer->{currentqueue}{model}"; if ($printer->{expert}) { my $driver; if ($driver = $printer->{currentqueue}{driver}) { if ($printer->{currentqueue}{foomatic}) { if ($driver eq 'Postscript') { $driver = "PostScript"; } else { $driver = "GhostScript + $driver"; } } elsif ($printer->{currentqueue}{ppd}) { if ($printer->{DBENTRY}) { $driver = $1 if $printer->{DBENTRY} =~ /^[^\|]*\|[^\|]*\|(.*)$/; } else { $driver = printer::main::get_descr_from_ppd($printer); if ($driver =~ /^[^\|]*\|[^\|]*$/) { # No driver info $driver = "PPD"; } else { $driver = $1 if $driver =~ /^[^\|]*\|[^\|]*\|(.*)$/; } } } } if ($driver) { $windowtitle .= ", $driver"; } } # Do not show the options setup dialog when installing a new printer # in recommended mode without "Manual configuration" turned on. if ((!$printer->{NEW} || $printer->{expert} || $printer->{MANUAL}) && !$printer->{noninteractive}) { return 0 if !$in->ask_from( $windowtitle, N("Printer default settings"), \@widgets, complete => sub { my $i; for ($i = 0; $i <= $#{$printer->{ARGS}}; $i++) { if ($printer->{ARGS}[$i]{type} eq 'int' || $printer->{ARGS}[$i]{type} eq 'float') { if ($printer->{ARGS}[$i]{type} eq 'int' && $userinputs[$i] !~ /^[\-\+]?[0-9]+$/) { $in->ask_warn(N("Error"), N("Option %s must be an integer number!", unhexify($printer->{ARGS}[$i]{comment}))); return 1, $i; } if ($printer->{ARGS}[$i]{type} eq 'float' && $userinputs[$i] !~ /^[\-\+]?[0-9\.]+$/) { $in->ask_warn(N("Error"), N("Option %s must be a number!", unhexify($printer->{ARGS}[$i]{comment}))); return 1, $i; } if ($userinputs[$i] < $printer->{ARGS}[$i]{min} || $userinputs[$i] > $printer->{ARGS}[$i]{max}) { $in->ask_warn(N("Error"), N("Option %s out of range!", unhexify($printer->{ARGS}[$i]{comment}))); return 1, $i; } } } return 0; }); } # Read out the user's choices and generate the appropriate command # line arguments @{$printer->{currentqueue}{options}} = (); for ($i = 0; $i <= $#{$printer->{ARGS}}; $i++) { # We did not show hidden options, so we do not have user input # to add to the option list next if $printer->{ARGS}[$i]{hidden}; push(@{$printer->{currentqueue}{options}}, "-o"); if ($printer->{ARGS}[$i]{type} eq 'enum') { # enumerated option my $j; for ($j = 0; $j <= $#{$choicelists[$i]}; $j++) { if ($choicelists[$i][$j] eq $userinputs[$i]) { $printer->{ARGS}[$i]{default} = $shortchoicelists[$i][$j]; push(@{$printer->{currentqueue}{options}}, $printer->{ARGS}[$i]{name} . "=" . $shortchoicelists[$i][$j]); } } } elsif ($printer->{ARGS}[$i]{type} eq 'bool') { # boolean option my $v = ($choicelists[$i][0] eq $userinputs[$i] ? "1" : "0"); $printer->{ARGS}[$i]{default} = $v; push(@{$printer->{currentqueue}{options}}, $printer->{ARGS}[$i]{name} . "=" . $v); } else { # numerical option $printer->{ARGS}[$i]{default} = $userinputs[$i]; push(@{$printer->{currentqueue}{options}}, $printer->{ARGS}[$i]{name} . "=" . $userinputs[$i]); } } } 1; } sub setasdefault { my ($printer, $in) = @_; local $::isEmbedded = 0; # $in->set_help('setupAsDefault') if $::isInstall; if ($printer->{DEFAULT} eq '' || # We have no default printer, # so set the current one as default $in->ask_yesorno(N("Printerdrake"), N("Do you want to set this printer (\"%s\")\nas the default printer?", $printer->{QUEUE}), 0)) { # Ask the user $printer->{DEFAULT} = $printer->{QUEUE}; printer::default::set_printer($printer); } } sub print_testpages { my ($printer, $in, $upNetwork) = @_; local $::isEmbedded = 0; # $in->set_help('printTestPages') if $::isInstall; # print test pages my $res2 = 0; my %options = (alta4 => 0, altletter => 0, ascii => 0, photo => 0, standard => 1); my %old_options = (alta4 => 0, altletter => 0, ascii => 0, photo => 0, standard => 1); my $oldres2 = 0; my $res1 = $in->ask_from_( { title => N("Test pages"), messages => N("Please select the test pages you want to print. Note: the photo test page can take a rather long time to get printed and on laser printers with too low memory it can even not come out. In most cases it is enough to print the standard test page."), cancel => (!$printer->{NEW} ? N("Cancel") : ($::isWizard ? N("Previous") : N("No test pages"))), ok => ($::isWizard ? N("Next") : N("Print")), callbacks => { changed => sub { if ($oldres2 ne $res2) { if ($res2) { foreach my $opt (keys %options) { $options{$opt} = 0; $old_options{$opt} = 0; } } $oldres2 = $res2; } foreach my $opt (keys %options) { if ($old_options{$opt} ne $options{$opt}) { if ($options{$opt}) { $res2 = 0; $oldres2 = 0; } $old_options{$opt} = $options{$opt}; } } return 0; } } }, [ { text => N("Standard test page"), type => 'bool', val => \$options{standard} }, if_($printer->{expert}, { text => N("Alternative test page (Letter)"), type => 'bool', val => \$options{altletter} }), if_($printer->{expert}, { text => N("Alternative test page (A4)"), type => 'bool', val => \$options{alta4} }), { text => N("Photo test page"), type => 'bool', val => \$options{photo} }, #{ text => N("Plain text test page"), type => 'bool', # val => \$options{ascii} } #if_($::isWizard, # ({ val => "__________" }, # { text => N("Do not print any test page"), type => 'bool', # val => \$res2 })) ]); $res2 = 1 if !($options{standard} || $options{altletter} || $options{alta4} || $options{photo} || $options{ascii}); if ($res1 && !$res2) { my @lpq_output; { my $_w = $in->wait_message(N("Printerdrake"), N("Printing test page(s)...")); $upNetwork and do { &$upNetwork(); undef $upNetwork; sleep(1) }; my $stdtestpage = "/usr/share/printer-testpages/testprint.ps"; my $altlttestpage = "/usr/share/printer-testpages/testpage.ps"; my $alta4testpage = "/usr/share/printer-testpages/testpage-a4.ps"; my $phototestpage = "/usr/share/printer-testpages/photo-testpage.jpg"; my $asciitestpage = "/usr/share/printer-testpages/testpage.asc"; my @testpages; # Install the filter to convert the photo test page to PS if ($printer->{SPOOLER} ne "cups" && $options{photo} && !$::testing && !files_exist('/usr/bin/convert')) { $in->do_pkgs->install('ImageMagick') or do { # Do not embed this message in the add-printer # wizard. local $::isWizard = 0; $in->ask_warn(N("Warning"), N("Could not install the %s package!", "ImageMagick") . " " . N("Skipping photo test page.")); $options{photo} = 0; }; } # set up list of pages to print $options{standard} and push @testpages, $stdtestpage; $options{altletter} and push @testpages, $altlttestpage; $options{alta4} and push @testpages, $alta4testpage; $options{photo} and push @testpages, $phototestpage; $options{ascii} and push @testpages, $asciitestpage; # Nothing to print return 1 if $#testpages < 0; # print the stuff @lpq_output = printer::main::print_pages($printer, @testpages); } my $dialogtext; if (@lpq_output) { $dialogtext = N("Test page(s) have been sent to the printer. It may take some time before the printer starts. Printing status:\n%s\n\n", @lpq_output); } else { $dialogtext = N("Test page(s) have been sent to the printer. It may take some time before the printer starts.\n"); } if ($printer->{NEW} == 0) { # Do not embed the following messages in the add-printer # wizard. local $::isWizard = 0; $in->ask_warn(N("Printerdrake"),$dialogtext); return 1; } else { $in->ask_yesorno(N("Printerdrake"), $dialogtext . N("Did it work properly?"), 1) and return 1; } } else { return($::isWizard ? $res1 : 1); } return 2; } sub printer_help { my ($printer, $in) = @_; local $::isEmbedded = 0; my $spooler = $printer->{SPOOLER}; $spooler = "cups" if $spooler eq "rcups"; my $queue = $printer->{QUEUE}; my $default = $printer->{DEFAULT}; my $raw = 0; my $cupsremote = 0; my $hplip = ""; my $scanning = ""; my $photocard = ""; my $hp11000fw = ""; if ($printer->{configured}{$queue}) { if ($printer->{configured}{$queue}{queuedata}{model} eq "Unknown model" || $printer->{configured}{$queue}{queuedata}{model} eq N("Raw printer")) { $raw = 1; } # Information about extra functions of HP printers enabled by HPLIP $hplip = hplip_help( $printer->{configured}{$queue}{queuedata}{make} . " " . $printer->{configured}{$queue}{queuedata}{model}, $printer->{configured}{$queue}{queuedata}{connect}); if ($hplip) { $hplip = "\n\n$hplip\n\n"; } # Information about scanning with HP's multi-function devices $scanning = scanner_help( $printer->{configured}{$queue}{queuedata}{make} . " " . $printer->{configured}{$queue}{queuedata}{model}, $printer->{configured}{$queue}{queuedata}{connect}); if ($scanning) { $scanning = "\n\n$scanning\n\n"; } # Information about photo card access with HP's multi-function devices $photocard = photocard_help( $printer->{configured}{$queue}{queuedata}{make} . " " . $printer->{configured}{$queue}{queuedata}{model}, $printer->{configured}{$queue}{queuedata}{connect}); if ($photocard) { $photocard = "\n\n$photocard\n\n"; } if ($printer->{configured}{$queue}{queuedata}{printer} eq 'HP-LaserJet_1000') { $hp11000fw = "\n\n$hp1000fwtext\n"; } } else { $cupsremote = 1; } my $dialogtext; if ($spooler eq "cups") { $dialogtext = N("To print a file from the command line (terminal window) you can either use the command \"%s <file>\" or a graphical printing tool: \"xpp <file>\" or \"kprinter <file>\". The graphical tools allow you to choose the printer and to modify the option settings easily. ", ($queue ne $default ? "lpr -P $queue" : "lpr")) . N("These commands you can also use in the \"Printing command\" field of the printing dialogs of many applications, but here do not supply the file name because the file to print is provided by the application. ") . (!$raw ? N(" The \"%s\" command also allows to modify the option settings for a particular printing job. Simply add the desired settings to the command line, e. g. \"%s <file>\". ", "lpr", ($queue ne $default ? "lpr -P $queue -o option=setting -o switch" : "lpr -o option=setting -o switch")) . (!$cupsremote ? N("To know about the options available for the current printer read either the list shown below or click on the \"Print option list\" button.%s%s%s ", $hplip, $scanning . $photocard, $hp11000fw) . printer::main::help_output($printer, 'cups') : $hplip . $scanning . $photocard . $hp11000fw . N("Here is a list of the available printing options for the current printer: ") . printer::main::help_output($printer, 'cups')) : $hplip . $scanning . $photocard . $hp11000fw); } elsif ($spooler eq "lprng") { $dialogtext = N("To print a file from the command line (terminal window) use the command \"%s <file>\". ", ($queue ne $default ? "lpr -P $queue" : "lpr")) . N("This command you can also use in the \"Printing command\" field of the printing dialogs of many applications. But here do not supply the file name because the file to print is provided by the application. ") . (!$raw ? N(" The \"%s\" command also allows to modify the option settings for a particular printing job. Simply add the desired settings to the command line, e. g. \"%s <file>\". ", "lpr", ($queue ne $default ? "lpr -P $queue -Z option=setting -Z switch" : "lpr -Z option=setting -Z switch")) . N("To get a list of the options available for the current printer click on the \"Print option list\" button.") . $hplip . $scanning . $photocard . $hp11000fw : $hplip . $scanning . $photocard . $hp11000fw); } elsif ($spooler eq "lpd") { $dialogtext = N("To print a file from the command line (terminal window) use the command \"%s <file>\". ", ($queue ne $default ? "lpr -P $queue" : "lpr")) . N("This command you can also use in the \"Printing command\" field of the printing dialogs of many applications. But here do not supply the file name because the file to print is provided by the application. ") . (!$raw ? N(" The \"%s\" command also allows to modify the option settings for a particular printing job. Simply add the desired settings to the command line, e. g. \"%s <file>\". ", "lpr", ($queue ne $default ? "lpr -P $queue -o option=setting -o switch" : "lpr -o option=setting -o switch")) . N("To get a list of the options available for the current printer click on the \"Print option list\" button.") . $hplip . $scanning . $photocard . $hp11000fw : $hplip . $scanning . $photocard . $hp11000fw); } elsif ($spooler eq "pdq") { $dialogtext = N("To print a file from the command line (terminal window) use the command \"%s <file>\" or \"%s <file>\". ", ($queue ne $default ? "pdq -P $queue" : "pdq"), ($queue ne $default ? "lpr -P $queue" : "lpr")) . N("This command you can also use in the \"Printing command\" field of the printing dialogs of many applications. But here do not supply the file name because the file to print is provided by the application. ") . N("You can also use the graphical interface \"xpdq\" for setting options and handling printing jobs. If you are using KDE as desktop environment you have a \"panic button\", an icon on the desktop, labeled with \"STOP Printer!\", which stops all print jobs immediately when you click it. This is for example useful for paper jams. ") . (!$raw ? N(" The \"%s\" and \"%s\" commands also allow to modify the option settings for a particular printing job. Simply add the desired settings to the command line, e. g. \"%s <file>\". ", "pdq", "lpr", ($queue ne $default ? "pdq -P $queue -aoption=setting -oswitch" : "pdq -aoption=setting -oswitch")) . N("To know about the options available for the current printer read either the list shown below or click on the \"Print option list\" button.%s%s%s ", $hplip, $scanning . $photocard, $hp11000fw) . printer::main::help_output($printer, 'pdq') : $hplip . $scanning . $photocard . $hp11000fw); } my $windowtitle = ($scanning ? ($photocard ? N("Printing/Scanning/Photo Cards on \"%s\"", $queue) : N("Printing/Scanning on \"%s\"", $queue)) : ($photocard ? N("Printing/Photo Card Access on \"%s\"", $queue) : ($hplip ? N("Using/Maintaining the printer \"%s\"", $queue) : N("Printing on the printer \"%s\"", $queue)))); if (!$raw && !$cupsremote) { my $choice; while ($choice ne N("Close")) { $choice = $in->ask_from_list_( $windowtitle, $dialogtext, [ N("Print option list"), N("Close") ], N("Close")); if ($choice ne N("Close")) { my $_w = $in->wait_message(N("Printerdrake"), N("Printing test page(s)...")); printer::main::print_optionlist($printer); } } } else { $in->ask_warn($windowtitle, $dialogtext); } } sub hplip_help { my ($makemodel, $deviceuri, $hplipentry) = @_; return "" if (!$hplipentry && $deviceuri !~ m!^hp:/!); if (!$hplipentry) { $hplipentry = printer::main::hplip_device_entry_from_uri($deviceuri); return "" if !$hplipentry; } my $text = N("Your %s is set up with HP's HPLIP driver software. This way many special features of your printer are supported.\n\n", $makemodel); if ($hplipentry->{scan}) { $text .= N("The scanner in your printer can be used with the usual SANE software, for example Kooka or XSane (Both in the Multimedia/Graphics menu). "); $text .= N("Run Scannerdrake (Hardware/Scanner in Mandriva Linux Control Center) to share your scanner on the network.\n\n"); } if (($hplipentry->{card} == 2) && ($deviceuri =~ m!/usb/!i)) { $text .= N("The memory card readers in your printer can be accessed like a usual USB mass storage device. "); $text .= N("After inserting a card a hard disk icon to access the card should appear on your desktop.\n\n"); } elsif ($hplipentry->{card} > 0) { $text .= N("The memory card readers in your printer can be accessed using HP's Printer Toolbox (Menu: System/Monitoring/HP Printer Toolbox) clicking the \"Access Photo Cards...\" button on the \"Functions\" tab. "); $text .= N("Note that this is very slow, reading the pictures from the camera or a USB card reader is usually faster.\n\n"); } $text .= N("HP's Printer Toolbox (Menu: System/Monitoring/HP Printer Toolbox) offers a lot of status monitoring and maintenance functions for your %s:\n\n", $makemodel); $text .= N(" - Ink level/status info\n") if $hplipentry->{status}; $text .= N(" - Ink nozzle cleaning\n") if $hplipentry->{clean}; $text .= N(" - Print head alignment\n") if $hplipentry->{align}; $text .= N(" - Color calibration\n") if $hplipentry->{colorcal}; $text .= "\n"; return $text; } sub scanner_help { my ($makemodel, $deviceuri) = @_; if ($deviceuri =~ m!^ptal://?(.*?)$!) { my $ptaldevice = $1; if ($makemodel !~ /HP\s+PhotoSmart/i && $makemodel !~ /HP\s+LaserJet\s+2200/i && $makemodel !~ /HP\s+(DeskJet|dj)\s*450/i) { # Models with built-in scanner return N("Your multi-function device was configured automatically to be able to scan. Now you can scan with \"scanimage\" (\"scanimage -d hp:%s\" to specify the scanner when you have more than one) from the command line or with the graphical interfaces \"xscanimage\" or \"xsane\". If you are using the GIMP, you can also scan by choosing the appropriate point in the \"File\"/\"Acquire\" menu. Call also \"man scanimage\" on the command line to get more information. You do not need to run \"scannerdrake\" for setting up scanning on this device, you only need to use \"scannerdrake\" if you want to share the scanner on the network.", $ptaldevice); } else { # Scanner-less models return ""; } } } sub photocard_help { my ($makemodel, $deviceuri) = @_; if ($deviceuri =~ m!^ptal://?(.*?)$!) { my $ptaldevice = $1; if (($makemodel =~ /HP\s+PhotoSmart/i || $makemodel =~ /HP\s+PSC\s*9[05]0/i || $makemodel =~ /HP\s+PSC\s*13[15]\d/i || $makemodel =~ /HP\s+PSC\s*161\d/i || $makemodel =~ /HP\s+PSC\s*2\d\d\d/i || $makemodel =~ /HP\s+OfficeJet\s+D\s*1[45]5/i || $makemodel =~ /HP\s+OfficeJet\s+71[34]0/i || $makemodel =~ /HP\s+OfficeJet\s+91\d\d/i || $makemodel =~ /HP\s+(DeskJet|dj)\s*450/i) && $makemodel !~ /HP\s+PhotoSmart\s+7150/i) { # Models with built-in photo card drives return N("Your printer was configured automatically to give you access to the photo card drives from your PC. Now you can access your photo cards using the graphical program \"MtoolsFM\" (Menu: \"Applications\" -> \"File tools\" -> \"MTools File Manager\") or the command line utilities \"mtools\" (enter \"man mtools\" on the command line for more info). You find the card's file system under the drive letter \"p:\", or subsequent drive letters when you have more than one HP printer with photo card drives. In \"MtoolsFM\" you can switch between drive letters with the field at the upper-right corners of the file lists.", $ptaldevice); } else { # Photo-card-drive-less models return ""; } } } sub copy_queues_from { my ($printer, $in, $oldspooler) = @_; local $::isEmbedded = 0; # $in->set_help('copyQueues') if $::isInstall; my $newspooler = $printer->{SPOOLER}; my @oldqueues; my @queueentries; my @queuesselected; my $newspoolerstr; my $oldspoolerstr; my $noninteractive = 0; { my $_w = $in->wait_message(N("Printerdrake"), N("Reading printer data...")); @oldqueues = printer::main::get_copiable_queues($oldspooler, $newspooler); @oldqueues = sort(@oldqueues); $newspoolerstr = $printer::data::spoolers{$newspooler}{short_name}; $oldspoolerstr = $printer::data::spoolers{$oldspooler}{short_name}; foreach (@oldqueues) { push @queuesselected, 1; push @queueentries, { text => $_, type => 'bool', val => \$queuesselected[-1] }; } # LPRng and LPD use the same config files, therefore one sees the # queues of LPD when one uses LPRng and vice versa, but these queues # do not work. So automatically transfer all queues when switching # between LPD and LPRng. if ($oldspooler =~ /^lp/ && $newspooler =~ /^lp/) { $noninteractive = 1; } } if ($noninteractive || $in->ask_from_( { title => N("Transfer printer configuration"), messages => N("You can copy the printer configuration which you have done for the spooler %s to %s, your current spooler. All the configuration data (printer name, description, location, connection type, and default option settings) is overtaken, but jobs will not be transferred. Not all queues can be transferred due to the following reasons: ", $oldspoolerstr, $newspoolerstr) . ($newspooler eq "cups" ? N("CUPS does not support printers on Novell servers or printers sending the data into a free-formed command. ") : ($newspooler eq "pdq" ? N("PDQ only supports local printers, remote LPD printers, and Socket/TCP printers. ") : N("LPD and LPRng do not support IPP printers. "))) . N("In addition, queues not created with this program or \"foomatic-configure\" cannot be transferred.") . if_($oldspooler eq "cups", N(" Also printers configured with the PPD files provided by their manufacturers or with native CUPS drivers cannot be transferred.")) . N(" Mark the printers which you want to transfer and click \"Transfer\"."), cancel => N("Do not transfer printers"), ok => N("Transfer") }, \@queueentries )) { my $queuecopied = 0; foreach (@oldqueues) { if (shift(@queuesselected)) { my $oldqueue = $_; my $newqueue = $_; if (!$printer->{configured}{$newqueue} || $noninteractive || $in->ask_from_( { title => N("Transfer printer configuration"), messages => N("A printer named \"%s\" already exists under %s. Click \"Transfer\" to overwrite it. You can also type a new name or skip this printer.", $newqueue, $newspoolerstr), ok => N("Transfer"), cancel => N("Skip"), callbacks => { complete => sub { unless ($newqueue =~ /^\w+$/) { $in->ask_warn(N("Error"), N("Name of printer should contain only letters, numbers and the underscore")); return 1, 0; } if ($printer->{configured}{$newqueue} && $newqueue ne $oldqueue && !$in->ask_yesorno(N("Warning"), N("The printer \"%s\" already exists,\ndo you really want to overwrite its configuration?", $newqueue), 0)) { return 1, 0; # Let the user correct the name } return 0; } } }, [{label => N("New printer name"),val => \$newqueue }])) { { my $_w = $in->wait_message(N("Printerdrake"), N("Transferring %s...", $oldqueue)); printer::main::copy_foomatic_queue($printer, $oldqueue, $oldspooler, $newqueue) and $queuecopied = 1; } if ($oldqueue eq $printer->{DEFAULT}) { # Make the former default printer the new default # printer if the user does not reject if ($noninteractive || $in->ask_yesorno( N("Transfer printer configuration"), N("You have transferred your former default printer (\"%s\"), Should it be also the default printer under the new printing system %s?", $oldqueue, $newspoolerstr), 1)) { $printer->{DEFAULT} = $newqueue; printer::default::set_printer($printer); } } } } } if ($queuecopied) { my $_w = $in->wait_message(N("Printerdrake"), N("Refreshing printer data...")); printer::main::read_configured_queues($printer); } } } sub start_network { my ($in, $upNetwork) = @_; local $::isEmbedded = 0; my $_w = $in->wait_message(N("Printerdrake"), N("Starting network...")); if ($::isInstall) { my $ret; if ($upNetwork) { $ret = &$upNetwork(); undef $upNetwork; sleep(1); } return $ret; } else { return printer::services::start("network") } } sub network_configured() { # Do configured networks (/etc/sysconfig/network-scripts/ifcfg*) exist? my @netscripts = cat_("ls -1 $::prefix/etc/sysconfig/network-scripts/ |"); my $netconfigured = 0; (/ifcfg-/ and !/(ifcfg-lo|:|rpmsave|rpmorig|rpmnew)/ and !/(~|\.bak)$/ and $netconfigured = 1) foreach @netscripts; return $netconfigured; } sub check_network { # This routine is called whenever the user tries to configure a remote # printer. It checks the state of the network functionality to assure # that the network is up and running so that the remote printer is # reachable. my ($printer, $in, $upNetwork, $b_dontconfigure) = @_; local $::isEmbedded = 0; # Any additional dialogs caused by this subroutine should appear as # extra windows and not embedded in the "Add printer" wizard. local $::isWizard = 0; # $in->set_help('checkNetwork') if $::isInstall; # First check: Do configured networks # (/etc/sysconfig/network-scripts/ifcfg*) exist? if (!$b_dontconfigure && !network_configured()) { my $go_on = 0; while (!$go_on) { my $choice = N("Configure the network now"); if ($in->ask_from(N("Network functionality not configured"), N("You are going to configure a remote printer. This needs working network access, but your network is not configured yet. If you go on without network configuration, you will not be able to use the printer which you are configuring now. How do you want to proceed?"), [ { val => \$choice, type => 'list', list => [ N("Configure the network now"), N("Go on without configuring the network") ] } ])) { if ($choice eq N("Configure the network now")) { if ($::isInstall) { my $o = $in; require network::netconnect; network::netconnect::real_main($o->{net}, $o, $o->{modules_conf}); } else { system("/usr/sbin/drakconnect"); } $go_on = network_configured(); } else { return 1; } } else { return 0; } } } # Do not try to start the network if it is not configured if (!network_configured()) { return 0 } # Second check: Is the network running? if (printer::detect::network_running()) { return 1 } # The network is configured now, start it. if (!start_network($in, $upNetwork) && (!$b_dontconfigure || $::isInstall)) { $in->ask_warn(N("Warning"), ($::isInstall ? N("The network configuration done during the installation cannot be started now. Please check whether the network is accessible after booting your system and correct the configuration using the %s Control Center, section \"Network & Internet\"/\"Connection\", and afterwards set up the printer, also using the %s Control Center, section \"Hardware\"/\"Printer\"", $shortdistroname, $shortdistroname) : N("The network access was not running and could not be started. Please check your configuration and your hardware. Then try to configure your remote printer again."))); return 0; } # Give a SIGHUP to the daemon and in case of CUPS do also the # automatic configuration of broadcasting/access permissions # The daemon is not really restarted but only SIGHUPped to not # interrupt print jobs. my $_w = $in->wait_message(N("Printerdrake"), N("Restarting printing system...")); return printer::main::SIGHUP_daemon($printer->{SPOOLER}); } sub security_check { # Check the security mode and when in "high" or "paranoid" mode ask the # user whether he really wants to configure printing. my ($spooler, $security, $o_in) = @_; local $::isEmbedded = 0; # Any additional dialogs caused by this subroutine should appear as # extra windows and not embedded in the "Add printer" wizard. local $::isWizard = 0; # $in->set_help('securityCheck') if $::isInstall; # Exit silently if the spooler is PDQ if ($spooler eq "pdq") { return 1 } # Exit silently in medium or lower security levels if (!$security || $security < 4) { return 1 } # Exit silently if the current spooler is already activated for the current # security level if (printer::main::spooler_in_security_level($spooler, $security)) { return 1 } # Tell user in which security mode he is and ask him whether he really # wants to activate the spooler in the given security mode. Stop the # operation of installing the spooler if he disagrees. my $securitystr = ($security == 4 ? N("high") : N("paranoid")); if ($o_in && $o_in->ask_yesorno(N("Installing a printing system in the %s security level", $securitystr), N("You are about to install the printing system %s on a system running in the %s security level. This printing system runs a daemon (background process) which waits for print jobs and handles them. This daemon is also accessible by remote machines through the network and so it is a possible point for attacks. Therefore only a few selected daemons are started by default in this security level. Do you really want to configure printing on this machine?", $printer::data::spoolers{$spooler}{short_name}, $securitystr))) { printer::main::add_spooler_to_security_level($spooler, $security); my $service; if ($spooler eq "lpr" || $spooler eq "lprng") { $service = "lpd"; } else { $service = $spooler; } services::start_service_on_boot($service); #TV return 1; } else { return 0; } } sub start_spooler_on_boot { # Checks whether the spooler will be started at boot time and if not, # ask the user whether he wants to start the spooler at boot time. my ($printer, $o_in, $b_service, $b_silentspooleronboot) = @_; # PDQ has no daemon, so nothing needs to be started : return unless $b_service; local $::isEmbedded = 0; # Any additional dialogs caused by this subroutine should appear as # extra windows and not embedded in the "Add printer" wizard. local $::isWizard = 0; # $in->set_help('startSpoolerOnBoot') if $::isInstall; if (!services::starts_on_boot($b_service)) { if ($b_silentspooleronboot || $o_in && $o_in->ask_yesorno(N("Starting the printing system at boot time"), N("The printing system (%s) will not be started automatically when the machine is booted. It is possible that the automatic starting was turned off by changing to a higher security level, because the printing system is a potential point for attacks. Do you want to have the automatic starting of the printing system turned on again?", $printer::data::spoolers{$printer->{SPOOLER}}{short_name}))) { services::start_service_on_boot($b_service); } } 1; } sub install_spooler { # installs the default spooler and start its daemon my ($printer, $security, $do_pkgs, $o_in, $o_upNetwork, $b_silentspooleronboot) = @_; local $::isEmbedded = 0; return 1 if $::testing; my $spooler = $printer->{SPOOLER}; # If the user refuses to install the spooler in high or paranoid # security level, exit. return 0 unless security_check($spooler, $security, $o_in); # should not happen return 0 if $spooler !~ /^(rcups|cups|lpd|lprng|pqd)$/; my $w = $::noX || $::autoqueue || ($o_in && $o_in->wait_message(N("Printerdrake"), N("Checking installed software..."))); # "lpr" conflicts with "LPRng", remove either "LPRng" or remove "lpr" my $packages = $spoolers{$spooler}{packages2rm}; if ($packages && files_exist($packages->[1])) { undef $w; $w = $o_in && $o_in->wait_message(N("Printerdrake"), N("Removing %s..."), $spoolers{$packages->[0]}{short_name}); $do_pkgs->remove_nodeps($packages->[0]) or do { $o_in && $o_in->ask_warn(N("Error"), N("Could not remove the %s printing system!", $spoolers{$packages->[0]}{short_name})); return 0; }; } # Install all packages needed to run printerdrake and the chosen spooler $packages = $spoolers{$spooler}{packages2add}; push @{$packages->[0]}, @{$commonpackages->[0]}; push @{$packages->[0]}, @{$localqueuepackages->[0]} if $spoolers{$spooler}{local_queues}; push @{$packages->[1]}, @{$commonpackages->[1]}; push @{$packages->[1]}, @{$localqueuepackages->[1]} if $spoolers{$spooler}{local_queues}; if (files_exist("/usr/bin/gimp") || files_exist("/usr/bin/gimp-2.2")) { push @{$packages->[0]}, @{$gimpprintingpackages->[0]}; push @{$packages->[1]}, @{$gimpprintingpackages->[1]}; } if (files_exist("/usr/bin/gnome-panel")) { push @{$packages->[0]}, @{$gnomecupspackages->[0]}; push @{$packages->[1]}, @{$gnomecupspackages->[1]}; } if (@{$packages->[0]} && !files_exist(@{$packages->[1]})) { undef $w; $w = $o_in && $o_in->wait_message(N("Printerdrake"), N("Installing %s..."), $spoolers{$spooler}{short_name}); $do_pkgs->install(@{$packages->[0]}) or do { $o_in && $o_in->ask_warn(N("Error"), N("Could not install the %s printing system!", $spoolers{$spooler}{short_name})); return 0; }; } undef $w; # Start the network (especially during installation), so the # user can set up queues to remote printers. $o_upNetwork and do { &$o_upNetwork(); undef $o_upNetwork; sleep(1); }; # Start daemon if ($spooler eq "cups") { # Start daemon # Avoid unnecessary restarting of CUPS, this blocks the # startup of printerdrake for several seconds. printer::services::start_not_running_service("cups"); # Remove a remote CUPS server setting from the client.conf # file, otherwise the local CUPS daemon gets overridden. my ($daemonless_cups, $remote_cups_server) = printer::main::read_client_conf(); if ($daemonless_cups) { printer::main::write_client_conf(0, $remote_cups_server); } } elsif ($spooler eq "rcups") { # Stop CUPS daemon, we want to run daemon-less services::stop("cups") if services::is_service_running("cups"); # Do not start CUPS daemon during boot services::do_not_start_service_on_boot("cups"); } elsif ($spoolers{$spooler}{service}) { printer::services::restart($spoolers{$spooler}{service}); } # Set the choosen spooler tools as defaults for "lpr", "lpq", # "lprm", ... foreach (@{$spoolers{$spooler}{alternatives}}) { set_alternative($_->[0], $_->[1]); } # Remove/add PDQ panic buttons from the user's KDE Desktops printer::main::pdq_panic_button($spooler eq 'pdq' ? "add" : "remove"); # Should it be started at boot time? start_spooler_on_boot($printer, $o_in, $spoolers{$spooler}{boot_spooler}, $b_silentspooleronboot); # Give a SIGHUP to the devfsd daemon to correct the permissions # for the /dev/... files according to the spooler #printer::main::SIGHUP_daemon("devfs"); 1; } sub assure_remote_server_is_set { my ($printer, $in) = @_; local $::isEmbedded = 0; # Check if a remote CUPS server is specified if (!$printer->{remote_cups_server}) { my ($daemonless_cups, $remote_cups_server) = printer::main::read_client_conf(); if (!$daemonless_cups) { if (!$in->ask_from_ ({ title => N("Remote CUPS server and no local CUPS daemon"), messages => N("In this mode there is no local printing system, all printing requests go directly to the server specified below. Note that it is not possible to define local print queues then and if the specified server is down it cannot be printed at all from this machine.") . "\n\n" . N("Enter the host name or IP of your CUPS server and click OK if you want to use this mode, click \"Quit\" otherwise."), cancel => N("Quit"), callbacks => { complete => sub { if ($remote_cups_server =~ /^\s*$/) { $in->ask_warn(N("Error"), N("CUPS server name or IP address missing.")); return 1, 1; } return 0; }, }, }, # Show the widgets [ { label => N("Name or IP of remote server:"), val => \$remote_cups_server, } ], )) { # Cancel was clicked exit 1; } printer::main::write_client_conf(1, $remote_cups_server); $printer->{remote_cups_server} = $remote_cups_server; } } 1; } sub assure_default_printer_is_set { my ($printer, $in) = @_; if (defined($printer->{SPOOLER}) && $printer->{SPOOLER} && (!defined($printer->{DEFAULT}) || !$printer->{DEFAULT})) { my $_w = $::noX || $::autoqueue || $in->wait_message(N("Printerdrake"), N("Setting Default Printer...")); $printer->{DEFAULT} = printer::default::get_printer($printer); if ($printer->{DEFAULT}) { # If a CUPS system has only remote printers and no default # printer defined, it defines the first printer whose # broadcast signal appeared after the start of the CUPS # daemon, so on every start another printer gets the default # printer. To avoid this, make sure that the default printer # is defined. printer::default::set_printer($printer); } else { $printer->{DEFAULT} = '' } } } sub set_cups_daemon_mode { my ($printer, $in) = @_; local $::isEmbedded = 0; my ($modechoice, $daemonless_cups, $remote_cups_server); if ($in->ask_from_ ({ title => N("Local CUPS printing system or remote CUPS server?"), messages => N("The CUPS printing system can be used in two ways: ") . "\n\n" . N("1. The CUPS printing system can run locally. ") . N("Then locally connected printers can be used and remote printers on other CUPS servers in the same network are automatically discovered. ") . N("Disadvantage of this approach is, that more resources on the local machine are needed: Additional software packages need to be installed, the CUPS daemon has to run in the background and needs some memory, and the IPP port (port 631) is opened. ") . "\n\n" . N("2. All printing requests are immediately sent to a remote CUPS server. ") . N("Here local resource occupation is reduced to a minimum. No CUPS daemon is started or port opened, no software infrastructure for setting up local print queues is installed, so less memory and disk space is used. ") . N("Disadvantage is that it is not possible to define local printers then and if the specified server is down it cannot be printed at all from this machine. ") . "\n\n" . N("How should CUPS be set up on your machine?"), callbacks => { complete => sub { if ($modechoice eq N("Remote server, specify Name or IP here:") && $remote_cups_server =~ /^\s*$/) { $in->ask_warn(N("Error"), N("CUPS server name or IP address missing.")); return 1, 1; } return 0; }, }, }, # Show the widgets [ { val => \$modechoice, format => \&translate, type => 'list', sort => 0, list => [ N("Local CUPS printing system"), N("Remote server, specify Name or IP here:") ] }, { val => \$remote_cups_server, disabled => sub { $modechoice ne N("Remote server, specify Name or IP here:"); } }, ], )) { # OK was clicked, update the data $daemonless_cups = ($modechoice eq N("Remote server, specify Name or IP here:")); if ($daemonless_cups) { $printer->{SPOOLER} = "rcups"; $printer->{remote_cups_server} = $remote_cups_server; } else { $printer->{SPOOLER} = "cups"; undef $printer->{remote_cups_server}; } printer::main::write_client_conf($daemonless_cups, $remote_cups_server); return 1; } else { # Cancel was clicked return 0; } } sub setup_default_spooler { my ($printer, $security, $in, $upNetwork) = @_; local $::isEmbedded = 0; my $oldspooler = $printer->{SPOOLER}; $printer->{SPOOLER} ||= 'cups'; my @spoolerlist = printer::main::spooler(); if ($#spoolerlist == 1) { set_cups_daemon_mode($printer, $in) || return; } else { my $str_spooler = $in->ask_from_listf_raw({ title => N("Select Printer Spooler"), messages => N("Which printing system (spooler) do you want to use?"), interactive_help_id => 'setupDefaultSpooler', }, sub { translate($_[0]) }, \@spoolerlist, $spoolers{$printer->{SPOOLER}}{long_name}, ) or return; $printer->{SPOOLER} = $spooler_inv{$str_spooler}; } # Install the spooler if not done yet if (!install_spooler($printer, $security, $in->do_pkgs, $in, $upNetwork)) { $printer->{SPOOLER} = $oldspooler; return; } assure_remote_server_is_set($printer, $in) if ($printer->{SPOOLER} eq "rcups"); if ($printer->{SPOOLER} ne $oldspooler) { # Get the queues of this spooler { my $_w = $in->wait_message(N("Printerdrake"), N("Reading printer data...")); printer::main::read_configured_queues($printer); } # Copy queues from former spooler copy_queues_from($printer, $in, $oldspooler) if ($oldspooler && ($oldspooler ne "rcups")); # Re-read the printer database (CUPS has additional drivers, PDQ # has no raw queue) %printer::main::thedb = (); assure_default_printer_is_set($printer, $in); } # Save spooler choice printer::default::set_spooler($printer); return $printer->{SPOOLER}; } sub configure_queue { my ($printer, $in) = @_; local $::isEmbedded = 0; my $_w = $in->wait_message(N("Printerdrake"), N("Configuring printer \"%s\"...", $printer->{currentqueue}{queue})) if !$printer->{noninteractive}; $printer->{complete} = 1; my $retval = printer::main::configure_queue($printer); $printer->{complete} = 0; if (!$retval && !$printer->{noninteractive}) { local $::isWizard = 0; $in->ask_warn(N("Printerdrake"), N("Failed to configure printer \"%s\"!", $printer->{currentqueue}{queue})); } return $retval; } sub install_foomatic { my ($in) = @_; local $::isEmbedded = 0; if (!$::testing && !files_exist(qw(/usr/bin/foomatic-configure /usr/bin/foomatic-rip /usr/share/foomatic/db/source/driver/ljet4.xml /usr/share/foomatic/db/source/driver/hpijs.xml))) { my $_w = $in->wait_message(N("Printerdrake"), N("Installing Foomatic...")); $in->do_pkgs->install('foomatic-db-engine', 'foomatic-filters', 'foomatic-db', 'foomatic-db-hpijs') or do { $in->ask_warn(N("Error"), N("Could not install %s packages, %s cannot be started!", "Foomatic", "printerdrake")); exit 1; }; } } sub wizard_close { my ($in, $mode) = @_; local $::isEmbedded = 0; # Leave wizard mode with congratulations screen if $mode = 1 $::Wizard_no_previous = 1; $::Wizard_no_cancel = 1; $::Wizard_finished = 1; wizard_congratulations($in) if $mode == 1; undef $::isWizard; $::WizardWindow->destroy if defined $::WizardWindow; undef $::WizardWindow; } #- Program entry point for configuration of the printing system. sub main { my ($printer, $security, $in, $install_step, $upNetwork) = @_; # $install_step is only made use of during the installation. It is # 0 when this function is called during the preparation of the "Summary" # screen and 1 when the user clicks on "Configure" on the "Summary" # screen # Initialization of Printerdrake and queue auto-installation: # During installation we do this step only once, when we prepare # the "Summary" screen in case of detected local printers or when # the "Configure" button in the "Printer" entry of the "Summary" # screen is clicked. If the button is clicked after an automatic # installation of local printers or if it is clicked for the # second time, these steps are not repeated. # Set the spooler to CUPS if we arrive here during the preparation # of the "Summary" screen of the installation, as we have local # printers then (if we do not have local printers, this function # is not called during the preparation of the "Summary" screen). if (!$::isInstall || !$::printerdrake_initialized) { $printer->{SPOOLER} ||= 'cups' if ($::isInstall && $install_step == 0 && !$printer->{expert}); init($printer, $security, $in, $upNetwork) or return; } # Main loop: During installation we only enter it when the user has # clicked on the "Configure" button in the "Summary" step. We do not # call it during the preparation of the "Summary" screen. if (!$::isInstall || $install_step == 1) { # Ask for a spooler when none is defined yet $printer->{SPOOLER} ||= setup_default_spooler($printer, $security, $in, $upNetwork) || return; # Save the default spooler printer::default::set_spooler($printer); mainwindow_interactive($printer, $security, $in, $upNetwork); } # In the installation we call the clean-up manually when we leave # the "Summary" step if (!$::isInstall) { final_cleanup($printer); } } sub init { my ($printer, $security, $in, $upNetwork) = @_; # Initialization of Printerdrake and queue auto-installation # This subroutine is called on every start of printerdrake # directly, from mcc, during installation, or for automatic print # queue setup in the background, triggered when # hotplug/udev/dynamic (script /etc/dynamic/script/lp.script) # discovers a new printer being connected and turned on. # In the latter case (background queue installation) only this # subroutine is called as only the automatic, non-interactive # print queue creation is needed. This must be totally # non-interactive and cannot open any window on the X desktop, # also packages cannot be installed, as the background process # cannot ask the user to insert CDs. To reach this state of # absolute silence, there is the global variable $::noX. If it is # set, all interactivity or wait message is suppressed. If # interactivity is required, the operation requiring interactivity # will be skipped. # Save the user mode, so that the same one is used on the next start # of Printerdrake printer::main::set_usermode($printer->{expert}); # Get the settings for printer auto administration printer::main::get_auto_admin($printer); # only experts should be asked for the spooler also for background # installation of print it should not be asked for the spooler, # as this feature is only supported for CUPS. $printer->{SPOOLER} ||= 'cups' if (!$printer->{expert} || $::noX || $::autoqueue) && !$::isInstall; # If we have chosen a spooler, install it and mark it as default # spooler. Spooler installation is ommitted on background queue # installation, because this only works when CUPS is already running if ($printer->{SPOOLER}) { return 0 unless ($::noX || install_spooler($printer, $security, $in->do_pkgs, $in, $upNetwork)); assure_remote_server_is_set($printer, $in) if ($printer->{SPOOLER} eq "rcups") && !$::noX && !$::autoqueue; printer::main::read_configured_queues($printer) if (($printer->{SPOOLER} ne "rcups") && (keys(%{$printer->{configured}}) == 0)); printer::default::set_spooler($printer); # Get the default printer (Done before non-interactive queue setup, # so that former default is not lost) assure_default_printer_is_set($printer, $in); my $nodefault = !$printer->{DEFAULT}; # Non-interactive setup of newly detected printers (This is done # only when not in expert mode, so we always have a spooler defined # here) configure_new_printers($printer, $in, $upNetwork) if $printer->{SPOOLER} ne "rcups"; # Make sure that default printer is registered if ($nodefault && $printer->{DEFAULT}) { printer::default::set_printer($printer); } } # Turn on local printer autodetection by default $printer->{AUTODETECT} = 1; $printer->{AUTODETECTLOCAL} = 1; $printer->{AUTODETECTNETWORK} = 0; $printer->{AUTODETECTSMB} = 0; $printer->{CONFIGLPD} = 0; # Mark this part as done, it should not be done a second time. if ($::isInstall) { $::printerdrake_initialized = 1; } return 1; } sub mainwindow_interactive { my ($printer, $security, $in, $upNetwork) = @_; # Control variables for the main loop my ($menuchoice, $cursorpos) = ('', '::'); while (1) { my ($queue, $newcursorpos) = ('', 0); # If networking is configured, start it, but do not ask the # user to configure networking. We want to know whether we # have a local network to suppress some buttons when there is # no network my $havelocalnetworks = check_network($printer, $in, $upNetwork, 1) && printer::detect::getIPsInLocalNetworks() != (); my $havelocalnetworks_or_expert = $printer->{expert} || $havelocalnetworks; # $in->set_help('mainMenu') if $::isInstall; # Initialize the cursor position if ($cursorpos eq "::" && $printer->{DEFAULT} && $printer->{DEFAULT} ne "") { if (defined($printer->{configured}{$printer->{DEFAULT}})) { $cursorpos = $printer->{configured}{$printer->{DEFAULT}}{queuedata}{menuentry} . N(" (Default)"); } elsif (($printer->{SPOOLER} eq "cups") || ($printer->{SPOOLER} eq "rcups")) { $cursorpos = find { /!$printer->{DEFAULT}:[^!]*$/ } printer::cups::get_formatted_remote_queues($printer); } } # Generate the list of available printers my @printerlist = (sort(map { $printer->{configured}{$_}{queuedata}{menuentry} . ($_ eq $printer->{DEFAULT} ? N(" (Default)") : "") } keys(%{$printer->{configured} || {}})), (($printer->{SPOOLER} eq "cups") || ($printer->{SPOOLER} eq "rcups") ? sort(printer::cups::get_formatted_remote_queues($printer)) : ())); my $noprinters = $#printerlist < 0; # Position the cursor where it was before (in case # a button was pressed). $menuchoice = $cursorpos; # Show the main dialog $in->ask_from_({ title => N("Printerdrake"), messages => if_(!$noprinters, N("The following printers are configured. Double-click on a printer to change its settings; to make it the default printer; or to view information about it. ")) . if_(!$havelocalnetworks, N("\nWARNING: No local network connection active, remote printers can neither be detected nor tested!")), cancel => (""), ok => ("") }, # List the queues [ if_(!$noprinters, { val => \$menuchoice, format => \&translate, sort => 0, separator => "!", tree_expanded => 1, quit_if_double_click => 1, allow_empty_list => 1, list => \@printerlist }), ($printer->{SPOOLER} ne "rcups" ? { clicked_may_quit => sub { # Save the cursor position $cursorpos = $menuchoice; $menuchoice = '@addprinter'; 1; }, val => N("Add a new printer") } : ()), ((($printer->{SPOOLER} eq "cups") || ($printer->{SPOOLER} eq "rcups")) && $havelocalnetworks ? { clicked_may_quit => sub { # Save the cursor position $cursorpos = $menuchoice; $menuchoice = '@refresh'; 1; }, val => ($noprinters ? N("Display all available remote CUPS printers") : N("Refresh printer list (to display all available remote CUPS printers)")) } : ()), ((($printer->{SPOOLER} eq "cups") || ($printer->{SPOOLER} eq "rcups")) && $havelocalnetworks_or_expert ? { clicked_may_quit => sub { # Save the cursor position $cursorpos = $menuchoice; $menuchoice = '@cupsconfig'; 1; }, val => N("CUPS configuration") } : ()), (($printer->{SPOOLER} eq "cups") ? { clicked_may_quit => sub { # Save the cursor position $cursorpos = $menuchoice; $menuchoice = '@autoadminconfig'; 1; }, val => N("Configure Auto Administration") } : ()), ($printer->{expert} && (files_exist(qw(/usr/bin/pdq)) || files_exist("/usr/$lib/filters/lpf", "/usr/sbin/lpd")) ? { clicked_may_quit => sub { # Save the cursor position $cursorpos = $menuchoice; $menuchoice = '@spooler'; 1; }, val => N("Change the printing system") } : ()), { clicked_may_quit => sub { # Save the cursor position $cursorpos = $menuchoice; $menuchoice = '@usermode'; 1; }, val => ($printer->{expert} ? N("Normal Mode") : N("Expert Mode")) }, { clicked_may_quit => sub { $menuchoice = '@quit'; 1 }, val => ($::isEmbedded || $::isInstall ? N("Done") : N("Quit")) }, ]); # Toggle expert mode and standard mode if ($menuchoice eq '@usermode') { $printer->{expert} = printer::main::set_usermode(!$printer->{expert}); # Read printer database for the new user mode %printer::main::thedb = (); # Modify menu entries to switch the tree # structure between expert/normal mode. my $spooler = $spoolers{$printer->{SPOOLER}}{short_name}; if ($printer->{expert}) { foreach (keys(%{$printer->{configured}})) { $printer->{configured}{$_}{queuedata}{menuentry} =~ s/^/$spooler!/; } $cursorpos =~ s/^/$spooler!/; } else { foreach (keys(%{$printer->{configured}})) { $printer->{configured}{$_}{queuedata}{menuentry} =~ s/^$spooler!//; } $cursorpos =~ s/^$spooler!//; } next; } # Refresh printer list next if $menuchoice eq '@refresh'; # Configure CUPS if ($menuchoice eq '@cupsconfig') { config_cups($printer, $security, $in, $upNetwork); next; } # Configure auto administration if ($menuchoice eq '@autoadminconfig') { config_auto_admin($printer, $in); next; } # Call function to switch to another spooler if ($menuchoice eq '@spooler') { $printer->{SPOOLER} = setup_default_spooler($printer, $security, $in, $upNetwork) || $printer->{SPOOLER}; next; } # Add a new print queue if ($menuchoice eq '@addprinter') { $newcursorpos = add_printer($printer, $in, $upNetwork); } # Edit an existing print queue if ($menuchoice =~ /!([^\s!:]+):[^!]*$/) { # Rip the queue name out of the chosen menu entry $queue = $1; # Save the cursor position $cursorpos = $menuchoice; # Edit the queue edit_printer($printer, $in, $upNetwork, $queue); $newcursorpos = 1; } #- Close printerdrake $menuchoice eq '@quit' and last; if ($newcursorpos) { # Set the cursor onto the current menu entry $queue = $printer->{QUEUE}; if ($queue) { # Make sure that the cursor is still at the same position # in the main menu when one has modified something on the # current printer if (!$printer->{configured}{$printer->{QUEUE}}) { my $s1 = N(" (Default)"); my $s2 = $s1; $s2 =~ s/\(/\\(/; $s2 =~ s/\)/\\)/; $cursorpos .= $s1 if $printer->{QUEUE} eq $printer->{DEFAULT} && $cursorpos !~ /$s2/; } else { $cursorpos = $printer->{configured}{$queue}{queuedata}{menuentry} . ($queue eq $printer->{DEFAULT} ? N(" (Default)") : ''); } } else { $cursorpos = "::"; } } else { delete($printer->{QUEUE}); } } } sub add_printer { my ($printer, $in, $upNetwork) = @_; # The add-printer wizard of printerdrake, adds a queue for a local # or remote printer interactively # Tell subroutines that we add a new printer $printer->{NEW} = 1; # Printer queue name my $queue = ""; #- Set default values for a new queue $printer_type_inv{$printer->{TYPE}} or $printer->{TYPE} = printer::default::printer_type(); $printer->{currentqueue} = { queue => "", foomatic => 0, desc => "", loc => "", make => "", model => "", printer => "", driver => "", connect => "", dd => 1, att => 0, delay => 30, spooler => $printer->{SPOOLER}, }; #- Do all the configuration steps for a new queue if (!$::isInstall && $in->isa('interactive::gtk')) { local $::isEmbedded = 0; undef $::WizardTable; undef $::WizardWindow; # Enter wizard mode (only after installation) $::Wizard_pix_up = "printerdrake.png"; $::Wizard_title = N("Add a new printer"); $::isWizard = 1; # Wizard welcome screen step_0: $::Wizard_no_previous = 1; undef $::Wizard_no_cancel; undef $::Wizard_finished; wizard_welcome($printer, $in, $upNetwork) or do { wizard_close($in, 0); return 0; }; undef $::Wizard_no_previous; eval { #do { # eval to catch wizard cancel. The wizard stuff # should be in a separate function with steps. see # drakgw. $printer->{expert} or do { if ($printer->{CONFIGLPD}) { $printer->{TYPE} = "LPD"; } else { $printer->{TYPE} = "LOCAL"; } }; step_1: !$printer->{expert} or choose_printer_type($printer, $in, $upNetwork) or goto step_0; step_2: setup_printer_connection($printer, $in, $upNetwork) or do { goto step_1 if $printer->{expert}; goto step_0; }; get_db_entry($printer, $in); step_3_9: if (!$printer->{expert} && !$printer->{MANUAL}) { is_model_correct($printer, $in) or goto step_2; } step_4: # Remember DB entry for "Previous" button in wizard my $dbentry = $printer->{DBENTRY}; if ($printer->{expert} || $printer->{MANUAL} || $printer->{MANUALMODEL}) { choose_model($printer, $in) or do { # Restore DB entry $printer->{DBENTRY} = $dbentry; goto step_3_9 if $printer->{MANUALMODEL} && $printer->{DBENTRY}; goto step_2; }; } get_printer_info($printer, $in) or do { goto step_4 if $printer->{expert} || $printer->{MANUAL} || $printer->{MANUALMODEL}; goto step_3_9; }; $queue = generate_queuename($printer); step_5: setup_options($printer, $in) or goto step_4; step_6: if ($printer->{expert} || $printer->{MANUAL} || $printer->{MORETHANONE}) { choose_printer_name($printer, $in) or do { goto step_5 if $printer->{expert} || $printer->{MANUAL}; goto step_4 if $printer->{MANUALMODEL}; goto step_3_9; }; } configure_queue($printer, $in) or die 'wizcancel'; undef $printer->{MANUAL} if $printer->{MANUAL}; step_7: $::Wizard_no_previous = 1; setasdefault($printer, $in); my $testpages = print_testpages($printer, $in, $printer->{TYPE} !~ /LOCAL/ && $upNetwork); if ($testpages == 1) { # User was content with test pages # Leave wizard mode with congratulations screen wizard_close($in, 1); } elsif ($testpages == 2) { # User was not content with test pages # Leave wizard mode without congratulations # screen wizard_close($in, 0); $queue = $printer->{QUEUE}; edit_printer($printer, $in, $upNetwork, $queue); return 1; } else { # "Previous" button clicked in test page dialog goto step_7; } }; die if $@ && $@ !~ /^wizcancel/; wizard_close($in, 0); } else { # Print queue setup without wizard (for installation) $printer->{expert} or $printer->{TYPE} = "LOCAL"; wizard_welcome($printer, $in, $upNetwork) or return 0; $printer->{expert} or do { if ($printer->{CONFIGLPD}) { $printer->{TYPE} = "LPD"; } else { $printer->{TYPE} = "LOCAL"; } }; !$printer->{expert} or choose_printer_type($printer, $in, $upNetwork) or return 0; setup_printer_connection($printer, $in, $upNetwork) or return 0; get_db_entry($printer, $in); if (!$printer->{expert} && !$printer->{MANUAL}) { is_model_correct($printer, $in) or return 0; } if ($printer->{expert} || $printer->{MANUAL} || $printer->{MANUALMODEL}) { choose_model($printer, $in) or return 0; } get_printer_info($printer, $in) or return 0; $queue = generate_queuename($printer); setup_options($printer, $in) or return 0; if ($printer->{expert} || $printer->{MANUAL} || $printer->{MORETHANONE}) { choose_printer_name($printer, $in) or return 0; } configure_queue($printer, $in) or return 0; undef $printer->{MANUAL} if $printer->{MANUAL}; setasdefault($printer, $in); my $testpages = print_testpages($printer, $in, $printer->{TYPE} !~ /LOCAL/ && $upNetwork); if ($testpages == 2) { # User was not content with test pages $queue = $printer->{QUEUE}; edit_printer($printer, $in, $upNetwork, $queue); return 1; } } # Delete some variables cleanup($printer); return 1; } sub edit_printer { my ($printer, $in, $upNetwork, $queue) = @_; # The menu for doing modifications on an existing print queue # Cursor position in queue modification window my $modify = N("Printer options"); # Tell subroutines that we modify the printer $printer->{NEW} = 0; while (defined($printer->{QUEUE}) || defined($queue)) { # Do not continue when current queue # is deleted # Modify a queue, ask which part should be modified # $in->set_help('modifyPrinterMenu') if $::isInstall; # Get some info to display my $infoline; if ($printer->{configured}{$queue}) { # Here we must regenerate the menu entry, because the # parameters can be changed. printer::main::make_menuentry($printer,$queue); if ($printer->{configured}{$queue}{queuedata}{menuentry} =~ /!([^!]+)$/) { $infoline = $1 . ($queue eq $printer->{DEFAULT} ? N(" (Default)") : '') . ($printer->{configured}{$queue}{queuedata}{desc} ? ", Descr.: $printer->{configured}{$queue}{queuedata}{desc}" : '') . ($printer->{configured}{$queue}{queuedata}{loc} ? ", Loc.: $printer->{configured}{$queue}{queuedata}{loc}" : '') . ($printer->{expert} ? ", Driver: $printer->{configured}{$queue}{queuedata}{driver}" : ''); } } else { # Extract the entry for a remote CUPS queue from the menu entry # for it. my $menuentry = find { /!$queue:[^!]*$/ } printer::cups::get_formatted_remote_queues($printer); $infoline = $1 if $menuentry =~ /!([^!]+)$/; } # Mark the printer queue which we edit $printer->{QUEUE} = $queue; if ($in->ask_from_( { title => N("Modify printer configuration"), messages => N("Printer %s%s What do you want to modify on this printer?", $infoline, if_(($printer->{SPOOLER} =~ /cups/) && !printer::cups::queue_enabled($queue), "\n" . N("This printer is disabled"))), cancel => N("Close"), ok => N("Do it!") }, [ { val => \$modify, format => \&translate, type => 'list', separator => '|', list => [ ($printer->{configured}{$queue} ? (N("Printer connection type"), N("Printer name, description, location"), ($printer->{expert} ? N("Printer manufacturer, model, driver") : N("Printer manufacturer, model")), if_($printer->{configured}{$queue}{queuedata}{make} ne "" && $printer->{configured}{$queue}{queuedata}{model} ne N("Unknown model") && $printer->{configured}{$queue}{queuedata}{model} ne N("Raw printer"), N("Printer options"))) : ()), if_($queue ne $printer->{DEFAULT}, N("Set this printer as the default")), if_(($printer->{SPOOLER} ne "pdq") && $printer->{configured}{$queue}, if_(($printer->{SPOOLER} !~ /cups/) || !printer::cups::queue_enabled($queue), N("Enable Printer")), if_(($printer->{SPOOLER} !~ /cups/) || printer::cups::queue_enabled($queue), N("Disable Printer"))), if_(($printer->{SPOOLER} eq "cups") && $printer->{configured}{$queue} && ($printer->{configured}{$queue}{queuedata}{connect} !~ m!^hp:/!), N("Printer communication error handling")), N("Print test pages"), N("Learn how to use this printer"), if_($printer->{configured}{$queue}, N("Remove printer")) ] } ])) { #- Copy the queue data and work on the copy $printer->{currentqueue} = {}; if ($printer->{configured}{$queue}) { printer::main::copy_printer_params($printer->{configured}{$queue}{queuedata}, $printer->{currentqueue}); } #- keep in mind old name of queue (in case of changing) $printer->{OLD_QUEUE} = $printer->{QUEUE} = $queue; #- Reset some variables $printer->{OLD_CHOICE} = undef; $printer->{DBENTRY} = undef; #- Which printer type did we have before (check #- beginning of URI) if ($printer->{configured}{$queue}) { if (($printer->{currentqueue}{connect} =~ m!^ptal://?hpjd!) || ($printer->{currentqueue}{connect} =~ m!^hp:/net!)) { $printer->{TYPE} = "SOCKET"; } else { foreach my $type (qw(file parallel serial usb ptal hp mtink lpd socket smb ncp postpipe)) { if ($printer->{currentqueue}{connect} =~ /^$type:/) { $printer->{TYPE} = ($type =~ /(file|parallel|serial|usb|ptal|hp|mtink)/ ? 'LOCAL' : uc($type)); last; } } } } # Do the chosen task if ($modify eq N("Printer connection type")) { choose_printer_type($printer, $in, $upNetwork) && setup_printer_connection($printer, $in, $upNetwork) && #get_db_entry($printer, $in) && get_printer_info($printer, $in) && configure_queue($printer, $in); } elsif ($modify eq N("Printer name, description, location")) { choose_printer_name($printer, $in) and get_printer_info($printer, $in) and configure_queue($printer, $in) or next; # Delete old queue when it was renamed if (lc($printer->{QUEUE}) ne lc($printer->{OLD_QUEUE})) { my $_w = $in->wait_message( N("Printerdrake"), N("Removing old printer \"%s\"...", $printer->{OLD_QUEUE})); printer::main::remove_queue($printer, $printer->{OLD_QUEUE}); # If the default printer was renamed, correct the # the default printer setting of the spooler if ($queue eq $printer->{DEFAULT}) { $printer->{DEFAULT} = $printer->{QUEUE}; printer::default::set_printer($printer); } $queue = $printer->{QUEUE}; } } elsif ($modify eq N("Printer manufacturer, model, driver") || $modify eq N("Printer manufacturer, model")) { get_db_entry($printer, $in); choose_model($printer, $in) && get_printer_info($printer, $in) && setup_options($printer, $in) && configure_queue($printer, $in); } elsif ($modify eq N("Printer options")) { get_printer_info($printer, $in) && setup_options($printer, $in) && configure_queue($printer, $in); } elsif ($modify eq N("Set this printer as the default")) { default_printer($printer, $in, $queue); # The "Set this printer as the default" menu entry will # disappear if the printer is the default, so go back to the # default entry $modify = N("Printer options"); } elsif ($modify eq N("Enable Printer")) { printer::main::enable_disable_queue($printer, $queue, 1) && $in->ask_warn(N("Enable Printer"), N("Printer \"%s\" is now enabled.", $queue)); $modify = N("Disable Printer"); } elsif ($modify eq N("Disable Printer")) { printer::main::enable_disable_queue($printer, $queue, 0) && $in->ask_warn(N("Disable Printer"), N("Printer \"%s\" is now disabled.", $queue)); $modify = N("Enable Printer"); } elsif ($modify eq N("Printer communication error handling")) { config_backend_error_handling($printer, $in) && get_printer_info($printer, $in) && configure_queue($printer, $in); } elsif ($modify eq N("Print test pages")) { print_testpages($printer, $in, $upNetwork); } elsif ($modify eq N("Learn how to use this printer")) { printer_help($printer, $in); } elsif ($modify eq N("Remove printer")) { if (remove_printer($printer, $in, $queue)) { # Let the main menu cursor go to the default # position delete $printer->{QUEUE}; undef $queue; } } # Delete some variables cleanup($printer); } else { # User closed the dialog # Delete some variables cleanup($printer); last; } } } sub remove_printer { my ($printer, $in, $queue) = @_; # Asks the user whether he really wants to remove the selected printer # and, if yes, removes it. The default printer will be reassigned if # needed. if ($in->ask_yesorno( N("Warning"), N("Do you really want to remove the printer \"%s\"?", $queue), 1)) { my $_w = $in->wait_message( N("Printerdrake"), N("Removing printer \"%s\"...", $queue)); if (printer::main::remove_queue($printer, $queue)) { # Define a new default printer if we have # removed the default one if ($queue eq $printer->{DEFAULT}) { my @k = sort(keys %{$printer->{configured}}); $printer->{DEFAULT} = $k[0]; printer::default::set_printer($printer) if @k; } return 1; } } return 0; } sub default_printer { my ($printer, $in, $queue) = @_; # Makes the given queue the default queue and gives an information # message $printer->{DEFAULT} = $queue; printer::default::set_printer($printer); $in->ask_warn(N("Default printer"), N("The printer \"%s\" is set as the default printer now.", $queue)); return 1; } sub cleanup { my ($printer) = @_; # Clean up the $printer data structure after printer manipulations foreach (qw(OLD_QUEUE TYPE str_type DBENTRY ARGS OLD_CHOICE MANUAL)) { delete($printer->{$_}); } $printer->{currentqueue} = {}; $printer->{complete} = 0; } sub final_cleanup { my ($printer) = @_; # Clean up the $printer data structure for auto-install log foreach my $queue (keys %{$printer->{configured}}) { foreach my $item (keys %{$printer->{configured}{$queue}}) { delete($printer->{configured}{$queue}{$item}) if $item ne "queuedata"; } delete($printer->{configured}{$queue}{queuedata}{menuentry}); } foreach (qw(Old_queue OLD_QUEUE QUEUE TYPE str_type currentqueue DBENTRY ARGS complete OLD_CHOICE NEW MORETHANONE MANUALMODEL AUTODETECT AUTODETECTLOCAL AUTODETECTNETWORK AUTODETECTSMB CONFIGLPD noninteractive expert)) { delete $printer->{$_} } }
/div>
msgstr "Επιλογή Ομάδων από Πακέτα"
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
#, c-format
msgid "Individual package selection"
msgstr "Επιλογή ξεχωριστών πακέτων"
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
#, c-format
msgid "Total size: %d / %d MB"
msgstr "Συνολικό μέγεθος: %d / %d MB"
@@ -975,12 +937,12 @@ msgstr "Ελάχιστη Εγκατάσταση"
msgid "Software Management"
msgstr "Διαχείριση Λογισμικού"
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
#, c-format
msgid "Choose the packages you want to install"
msgstr "Επιλέξτε τα πακέτα που θέλετε να εγκαταστήσετε"
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
#, c-format
msgid "Installing"
msgstr "Εγκατάσταση"
@@ -1007,7 +969,7 @@ msgid_plural "%d packages"
msgstr[0] "%d πακέτο"
msgstr[1] "%d πακέτα"
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
#, c-format
msgid "Summary"
msgstr "Περίληψη"
@@ -1017,7 +979,7 @@ msgstr "Περίληψη"
msgid "Configure"
msgstr "Ρύθμιση"
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
#, c-format
msgid "not configured"
msgstr "δεν ρυθμίστηκε"
@@ -1027,7 +989,7 @@ msgstr "δεν ρυθμίστηκε"
msgid "Media Selection"
msgstr "Επιλογή Μέσου"
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
#, c-format
msgid ""
"The following installation media have been found.\n"
@@ -1036,7 +998,7 @@ msgstr ""
"Βρέθηκαν τα ακόλουθα μέσα εγκατάστασης.\n"
"Αν θες να παραλειφθούν κάποια από αυτά, μπορείς να τα αποεπιλέξεις τώρα."
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
#, c-format
msgid ""
"You have the option to copy the contents of the CDs onto the hard drive "
@@ -1049,7 +1011,7 @@ msgstr ""
"Η οποία θα συνεχιστεί από τον σκληρό δίσκο και τα πακέτα θα μείνουν "
"διαθέσιμα και μετά το τέλος της εγκατάστασης."
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
#, c-format
msgid "Copy whole CDs"
msgstr "Αντιγραφή ολόκληρων CD"
@@ -1069,17 +1031,17 @@ msgstr "Παρακαλώ επέλεξε τη διάταξη του πληκτρ
msgid "Here is the full list of available keyboards:"
msgstr "Αυτή είναι η πλήρης λίστα με τα διαθέσιμα πληκτρολόγια:"
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
#, c-format
msgid "Install/Upgrade"
msgstr "Εγκατάσταση/Αναβάθμιση"
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
#, c-format
msgid "Is this an install or an upgrade?"
msgstr "Πρόκειται για εγκατάσταση ή για αναβάθμιση;"
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
#, c-format
msgid ""
"_: This is a noun:\n"
@@ -1088,42 +1050,32 @@ msgstr ""
"_: Αυτό είναι ένα ουσιαστικό:\n"
"Εγκατάσταση"
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
#, c-format
msgid "Upgrade %s"
msgstr "Αναβάθμιση %s"
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr "Η αναβάθμιση της διανομής από 32bit σε 64bit δεν υποστηρίζεται "
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr "Η αναβάθμιση της διανομής από 64bit σε 32bit δεν υποστηρίζεται"
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
#, c-format
msgid "Encryption key for %s"
msgstr "Κλειδί κρυπτογράφησης για το %s"
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
#, c-format
msgid "Cancel installation, reboot system"
msgstr "Ακύρωση της εγκατάστασης, επανεκκίνηση του συστήματος"
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
#, c-format
msgid "New Installation"
msgstr "Νέα εγκατάσταση"
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
#, c-format
msgid "Upgrade previous installation (not recommended)"
msgstr "Αναβάθμιση προηγούμενης εγκατάστασης (δεν συστήνεται)"
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
#, c-format
msgid ""
"Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1145,17 +1097,17 @@ msgstr ""
"σου\n"
"δεδομένα και τα έγγραφα πριν επιλέξεις τη \"Νέα Εγκατάσταση\"."
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "IDE"
msgstr "IDE"
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "Configuring IDE"
msgstr "Ρύθμιση IDE"
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
#, c-format
msgid ""
"No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1165,7 +1117,7 @@ msgstr ""
"αλλά για να ξεκινήσετε το σύστημά σας, θα χρειαστεί να δημιουργήσετε μια "
"κατάτμηση bootstrap με το DiskDrake"
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
#, c-format
msgid ""
"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1176,7 +1128,7 @@ msgstr ""
"εγκατάσταση θα συνεχιστεί, αλλά για να εκκινήσετε το σύστημά σας, θα πρέπει "
"να δημιουργήσετε την κατάτμηση έναρξης από το DiskDrake"
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
#, c-format
msgid ""
"Change your Cd-Rom!\n"
@@ -1191,12 +1143,12 @@ msgstr ""
"Εάν δεν το έχετε, πατήστε Ακύρωση για αποφυγή εγκατάστασης από αυτό το Cd-"
"Rom."
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
#, c-format
msgid "Looking for available packages..."
msgstr "Ψάχνω για διαθέσιμα πακέτα..."
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
#, c-format
msgid ""
"Your system does not have enough space left for installation or upgrade (%"
@@ -1205,7 +1157,7 @@ msgstr ""
"Το σύστημά σας δεν έχει αρκετό ελεύθερο χώρο για την εγκατάσταση ή την "
"αναβάθμιση (%dMB > %dMB)"
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
#, c-format
msgid ""
"Please choose load or save package selection.\n"
@@ -1215,54 +1167,54 @@ msgstr ""
"πακέτα.\n"
"Η μορφή είναι η ίδια με τα αρχεία auto_install (αυτόματης εγκατάστασης)."
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Load"
msgstr "Φόρτος"
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Save"
msgstr "Αποθήκευση"
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
#, c-format
msgid "Bad file"
msgstr "Λανθασμένο αρχείο"
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
#, c-format
msgid "KDE"
msgstr "KDE"
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
#, c-format
msgid "GNOME"
msgstr "GNOME"
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
#, c-format
msgid "Desktop Selection"
msgstr "Επιλογή Γραφικού Περιβάλλοντος Εργασίας"
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
#, c-format
msgid "You can choose your workstation desktop profile."
msgstr ""
"Μπορείς να επιλέξεις το προφίλ για το γραφικό περιβάλλον εργασίας του "
"υπολογιστή σου."
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
#, c-format
msgid "Selected size is larger than available space"
msgstr "Το επιλεγμένο μέγεθος είναι μεγαλύτερο από το διαθέσιμο χώρο"
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
#, c-format
msgid "Type of install"
msgstr "Τύπος εγκατάστασης"
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
#, c-format
msgid ""
"You have not selected any group of packages.\n"
@@ -1271,84 +1223,84 @@ msgstr ""
"Δεν έχετε επιλέξει κάποια ομάδα πακέτων.\n"
"Παρακαλώ επιλέξτε την ελάχιστη εγκατάσταση που θέλετε:"
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
#, c-format
msgid "With X"
msgstr "Με Χ"
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
#, c-format
msgid "With basic documentation (recommended!)"
msgstr "Με την βασική τεκμηρίωση (συνιστάται!)"
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
#, c-format
msgid "Truly minimal install (especially no urpmi)"
msgstr "Πραγματικά ελάχιστη εγκατάσταση (ειδικά χωρίς urpmi)"
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
#, c-format
msgid "Preparing installation"
msgstr "Προετοιμασία της εγκατάστασης"
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
#, c-format
msgid "Installing package %s"
msgstr "Εγκατάσταση του πακέτου %s"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "There was an error ordering packages:"
msgstr "Προκλήθηκε σφάλμα κατά την ταξινόμηση των πακέτων:"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "Go on anyway?"
msgstr "Να συνεχίσω;"
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
#, c-format
msgid "Retry"
msgstr "Προσπάθησε ξανά"
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
#, c-format
msgid "Skip this package"
msgstr "Παράβλεψη αυτού του πακέτου"
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
#, c-format
msgid "Skip all packages from medium \"%s\""
msgstr "Παράβλεψη όλων των πακέτων από το μέσο \"%s\""
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
#, c-format
msgid "Go back to media and packages selection"
msgstr "Επιστροφή στην επιλογή μέσων και πακέτων"
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
#, c-format
msgid "There was an error installing package %s."
msgstr "Προκλήθηκε σφάλμα κατά την εγκατάσταση του πακέτου %s."
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
#, c-format
msgid "Post-install configuration"
msgstr "Ρυθμίσεις μετά την εγκατάσταση"
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
#, c-format
msgid "Please ensure the Update Modules media is in drive %s"
msgstr ""
"Παρακαλώ σιγουρευτείτε ότι το μέσο ενημέρωσης των οδηγών (modules) είναι "
"μέσα στην συσκευή %s"
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
#, c-format
msgid "Updates"
msgstr "Ενημερώσεις"
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
#, c-format
msgid ""
"You now have the opportunity to download updated packages. These packages\n"
@@ -1370,28 +1322,28 @@ msgstr ""
"\n"
"Θέλετε να εγκαταστήσετε τις αναβαθμίσεις ;"
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
#, c-format
msgid "%s on %s"
msgstr "%s σε %s"
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
#, c-format
msgid "Hardware"
msgstr "Υλικό"
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
#, c-format
msgid "Sound card"
msgstr "Κάρτα ήχου"
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
#, c-format
msgid "Do you have an ISA sound card?"
msgstr "Έχετε κάρτα ήχου ISA;"
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
#, c-format
msgid ""
"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1400,69 +1352,69 @@ msgstr ""
"Εκτέλεσε την εντολή \"alsaconf\" ή \"sndconfig\", μετά την εγκατάσταση, για "
"να ρυθμίσεις την κάρτα ήχου"
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
#, c-format
msgid "No sound card detected. Try \"harddrake\" after installation"
msgstr ""
"Δεν βρέθηκε κάρτα ήχου. Δοκιμάστε το \"harddrake\" μετά την εγκατάσταση"
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
#, c-format
msgid "Graphical interface"
msgstr "Γραφικό περιβάλλον"
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
#, c-format
msgid "Network & Internet"
msgstr "Δίκτυο & Διαδίκτυο"
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
#, c-format
msgid "Proxies"
msgstr "Διαμεσολαβητές (proxies)"
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
#, c-format
msgid "configured"
msgstr "ρυθμισμένο"
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
#, c-format
msgid "Security Level"
msgstr "Επίπεδο Ασφαλείας"
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
#, c-format
msgid "Firewall"
msgstr "Τοίχος Προστασίας"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "activated"
msgstr "ενεργοποιημένο"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "disabled"
msgstr "απενεργοποιημένο"
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
#, c-format
msgid "You have not configured X. Are you sure you really want this?"
msgstr "Δεν έχετε ρυθμίσει το Χ. Είστε βέβαιοι ότι θέλετε να το κάνετε;"
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
#, c-format
msgid "Preparing bootloader..."
msgstr "Προετοιμασία του προγράμματος εκκίνησης..."
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
#, c-format
msgid "Be patient, this may take a while..."
msgstr ""
"Παρακαλώ περιμένετε, η διαδικασία θα διαρκέσει κάποιο χρονικό διάστημα ..."
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
#, c-format
msgid ""
"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1476,7 +1428,7 @@ msgstr ""
"θα χρειαστεί να χρησιμοποιήσετε το BootX ή μια άλλη μέθοδο για να ξεκινήσετε "
"το μηχάνημά σας. Η παράμετρος για το root fs είναι: root=%s"
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
#, c-format
msgid ""
"In this security level, access to the files in the Windows partition is "
@@ -1485,17 +1437,17 @@ msgstr ""
"Σε αυτό το επίπεδο ασφαλείας, η πρόσβαση στα αρχεία στην κατάτμηση των "
"windows περιορίζεται μόνο για τον διαχειριστή."
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr "Εισάγετε άδεια δισκέτα στον οδηγό %s"
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
#, c-format
msgid "Creating auto install floppy..."
msgstr "Δημιουργία δισκέτας αυτόματης εγκατάστασης..."
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
#, c-format
msgid ""
"Some steps are not completed.\n"
@@ -1506,7 +1458,7 @@ msgstr ""
"\n"
"Θέλετε σίγουρα να εγκαταλείψετε τώρα;"
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
#, c-format
msgid "Congratulations"
msgstr "Συγχαρητήρια"
@@ -1650,6 +1602,30 @@ msgid ""
"Exit"
msgstr "Έξοδος"
+#~ msgid "Your desktop on a USB key"
+#~ msgstr "Το προσωπικό σου σύστημα εργασίας σε ένα USB"
+
+#~ msgid "The 100%% open source Mandriva Linux distribution"
+#~ msgstr "Η 100%% ανοιχτού κώδικα, διανομή του Mandriva Linux"
+
+#~ msgid "Explore Linux easily with Mandriva One"
+#~ msgstr "Εξερεύνησε το Λίνουξ, εύκολα, με το Mandriva One"
+
+#~ msgid "A full Mandriva Linux desktop, with support"
+#~ msgstr "Ένα πλήρες σύστημα desktop Mandriva Linux, με υποστήριξη"
+
+#~ msgid "Mandriva: distributions for everybody's needs"
+#~ msgstr "Mandriva: συστήματα Λίνουξ για όλες τις χρήσεις"
+
+#~ msgid "Downloading file %s..."
+#~ msgstr "Λήψη αρχείου %s..."
+
+#~ msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
+#~ msgstr "Η αναβάθμιση της διανομής από 32bit σε 64bit δεν υποστηρίζεται "
+
+#~ msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
+#~ msgstr "Η αναβάθμιση της διανομής από 64bit σε 32bit δεν υποστηρίζεται"
+
#~ msgid ""
#~ "You have selected the following server(s): %s\n"
#~ "\n"
diff --git a/perl-install/install/share/po/eo.po b/perl-install/install/share/po/eo.po
index 7ad313ce1..29aa81534 100644
--- a/perl-install/install/share/po/eo.po
+++ b/perl-install/install/share/po/eo.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: eo\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
"PO-Revision-Date: 2007-12-29 05:55+0100\n"
"Last-Translator: Vilhelmo Lutermano <vlutermano@free.fr>\n"
"Language-Team: Esperanto <eo@li.org>\n"
@@ -19,31 +19,6 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: KBabel 1.11.4\n"
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr ""
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr ""
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr ""
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr ""
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr ""
-
#: any.pm:109
#, c-format
msgid "Do you have further supplementary media?"
@@ -83,17 +58,17 @@ msgstr "Reto (FTP)"
msgid "Network (NFS)"
msgstr "Reto (NFS)"
-#: any.pm:163
+#: any.pm:165
#, c-format
msgid "URL of the mirror?"
msgstr "URL de la spegulo?"
-#: any.pm:169
+#: any.pm:171
#, c-format
msgid "URL must start with ftp:// or http://"
msgstr "URL devas komenci per ftp:// aŭ http://"
-#: any.pm:180
+#: any.pm:182
#, c-format
msgid ""
"Contacting Mandriva Linux web site to get the list of available mirrors..."
@@ -101,7 +76,7 @@ msgstr ""
"Mi kontaktas la Mandriva Linuksan retpaĝon por havigi la liston de "
"disponeblaj speguloj..."
-#: any.pm:185
+#: any.pm:187
#, c-format
msgid ""
"Failed contacting Mandriva Linux web site to get the list of available "
@@ -110,47 +85,47 @@ msgstr ""
"Mi malsukcesis kontakti la Mandriva Linuksan retpaĝon por havigi la liston "
"de disponeblaj speguloj..."
-#: any.pm:195
+#: any.pm:197
#, c-format
msgid "Choose a mirror from which to get the packages"
msgstr "Elektu spegulon de kiu havigi la pakaĵojn"
-#: any.pm:225
+#: any.pm:227
#, c-format
msgid "NFS setup"
msgstr "NFS-agordo"
-#: any.pm:226
+#: any.pm:228
#, c-format
msgid "Please enter the hostname and directory of your NFS media"
msgstr "Bonvole enigu la nomon kaj dosierujon de via NSF-datenportilo"
-#: any.pm:230
+#: any.pm:232
#, c-format
msgid "Hostname missing"
msgstr "Nomo mankas"
-#: any.pm:231
+#: any.pm:233
#, c-format
msgid "Directory must begin with \"/\""
msgstr "Dosierujo devas komenci per \"/\""
-#: any.pm:235
+#: any.pm:237
#, c-format
msgid "Hostname of the NFS mount ?"
msgstr "Nomo de la NFS surmeto?"
-#: any.pm:236
+#: any.pm:238
#, c-format
msgid "Directory"
msgstr "Dosierujo"
-#: any.pm:258
+#: any.pm:260
#, c-format
msgid "Supplementary"
msgstr "Kroma"
-#: any.pm:293
+#: any.pm:295
#, c-format
msgid ""
"Can't find a package list file on this mirror. Make sure the location is "
@@ -159,22 +134,22 @@ msgstr ""
"Mi ne trovas pakaĵlistan dosieron sur tiu spegulo. Certiĝu ke la adreso "
"estas ĝusta."
-#: any.pm:328
+#: any.pm:334
#, c-format
msgid "Looking at packages already installed..."
msgstr "Rigardante jam instalitajn pakaĵojn..."
-#: any.pm:362
+#: any.pm:368
#, c-format
msgid "Finding packages to upgrade..."
msgstr "Trovadas pakaĵojn por promocii"
-#: any.pm:381
+#: any.pm:387
#, c-format
msgid "Removing packages prior to upgrade..."
msgstr "Mi forigas pakaĵojn antaŭ ol ĝisdatigi..."
-#: any.pm:402
+#: any.pm:408
#, c-format
msgid ""
"You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -186,18 +161,18 @@ msgid ""
"please reboot your system and upgrade using the Mandriva update applet."
msgstr ""
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
#, c-format
msgid "Reboot"
msgstr "Restarto"
-#: any.pm:407
+#: any.pm:413
#, c-format
msgid "Proceed"
msgstr ""
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -210,72 +185,72 @@ msgstr ""
"\n"
"Ĉu vi vere deziras forigi tiujn pakaĵojn?\n"
-#: any.pm:815
+#: any.pm:821
#, fuzzy, c-format
msgid "Error reading file %s"
msgstr "Mi deŝutas dosieron %s..."
-#: any.pm:1022
+#: any.pm:1028
#, c-format
msgid "The following disk(s) were renamed:"
msgstr "La sekva(j) disko(j) estas alinomitaj:"
-#: any.pm:1024
+#: any.pm:1030
#, c-format
msgid "%s (previously named as %s)"
msgstr "%s (antaŭe nomitaj kiel %s)"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "HTTP"
msgstr "HTTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "FTP"
msgstr "FTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "NFS"
msgstr "NFS"
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
#, c-format
msgid "Network"
msgstr "Reto"
-#: any.pm:1104
+#: any.pm:1110
#, c-format
msgid "Please choose a media"
msgstr "Bonvole elektu datenportilon"
-#: any.pm:1120
+#: any.pm:1126
#, c-format
msgid "File already exists. Overwrite it?"
msgstr "Dosiero jam ekzistas. Ĉu surskribi ĝin?"
-#: any.pm:1124
+#: any.pm:1130
#, c-format
msgid "Permission denied"
msgstr "Permeso rifuzita"
-#: any.pm:1172
+#: any.pm:1178
#, c-format
msgid "Bad NFS name"
msgstr "Malĝusta NFS-nomo"
-#: any.pm:1193
+#: any.pm:1199
#, c-format
msgid "Bad media %s"
msgstr "Malbona datenportilo %s"
-#: any.pm:1236
+#: any.pm:1242
#, c-format
msgid "Can not make screenshots before partitioning"
msgstr "Mi ne povas fari ekranfotojn antaŭ ol subdiskigi"
-#: any.pm:1244
+#: any.pm:1250
#, c-format
msgid "Screenshots will be available after install in %s"
msgstr "Ekranfotoj haveblos post instalado en %s"
@@ -286,11 +261,15 @@ msgid "Installation"
msgstr "Instalado"
#: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
#, c-format
msgid "Configuration"
msgstr "Konfigurado"
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
#: install2.pm:168
#, c-format
msgid "You must also format %s"
@@ -316,22 +295,22 @@ msgstr "Startado de la reto"
msgid "Bringing down the network"
msgstr "Haltas de la reto"
-#: media.pm:402
+#: media.pm:399
#, c-format
msgid "Please wait, retrieving file"
msgstr ""
-#: media.pm:734
+#: media.pm:718
#, c-format
-msgid "Downloading file %s..."
-msgstr "Mi deŝutas dosieron %s..."
+msgid "unable to add medium"
+msgstr ""
-#: media.pm:822
+#: media.pm:758
#, c-format
msgid "Copying some packages on disks for future use"
msgstr "Mi kopias kelkajn pakaĵojn sur diskoj por estonta uzo"
-#: media.pm:875
+#: media.pm:811
#, c-format
msgid "Copying in progress"
msgstr "Mi estas kopianta"
@@ -375,27 +354,27 @@ msgstr ""
msgid "An error occurred:"
msgstr "Eraro okazis"
-#: pkgs.pm:776
+#: pkgs.pm:780
#, c-format
msgid "%d installation transactions failed"
msgstr "%d instal-transakcioj malsukcesis"
-#: pkgs.pm:777
+#: pkgs.pm:781
#, fuzzy, c-format
msgid "Installation of packages failed:"
msgstr "Instalanta pakaĵo %s"
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
#, c-format
msgid "Workstation"
msgstr "Laborstacio"
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
#, c-format
msgid "Office Workstation"
msgstr "Oficeja laborstacio"
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
#, c-format
msgid ""
"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -404,7 +383,7 @@ msgstr ""
"Oficejaj programoj: tekstiloj (OpenOffice.org Writer, Verkilo [Kword]), "
"tabelkalkuliloj (OpenOffice.org Calc, Kspread), PDF-vidigiloj, ktp."
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
#, c-format
msgid ""
"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -413,32 +392,32 @@ msgstr ""
"Oficej-programoj: tekstiloj (Verkilo [kword], aboword), tabelkalkuliloj "
"(kspread, gnumeric), pdf-vidigiloj, ktp."
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
#, c-format
msgid "Game station"
msgstr "Ludstacio"
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
#, c-format
msgid "Amusement programs: arcade, boards, strategy, etc"
msgstr "Amuz-programoj: arcade, tabuloj [boards], strategio, ktp."
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
#, c-format
msgid "Multimedia station"
msgstr "Plurmediaj stacio"
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
#, c-format
msgid "Sound and video playing/editing programs"
msgstr "Programoj por ludi/prilabori son- kaj video-programojn"
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
#, c-format
msgid "Internet station"
msgstr "Interreta stacio"
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
#, c-format
msgid ""
"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -447,230 +426,212 @@ msgstr ""
"Agordiloj por legi kaj sendi retpoŝt-mesaĝojn kaj novaĵojn (mutt, tin...) "
"kaj por krozi tra la ttt"
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
#, c-format
msgid "Network Computer (client)"
msgstr "Reta computilo (kliento)"
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
#, c-format
msgid "Clients for different protocols including ssh"
msgstr "Klientoj por diversaj protokoloj inklude de ssh"
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
#, c-format
msgid "Tools to ease the configuration of your computer"
msgstr "Iloj por faciligi la konfiguradon de via komputilo"
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
#, c-format
msgid "Console Tools"
msgstr "Konsoliloj"
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
#, c-format
msgid "Editors, shells, file tools, terminals"
msgstr "Redaktiloj, ŝeloj, dosieriloj, terminaloj"
#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
#, c-format
msgid "Development"
msgstr "Programado"
#: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
#, c-format
msgid "C and C++ development libraries, programs and include files"
msgstr "C kaj C++ programadaj bibliotekoj, programoj kaj ĉapdosieroj"
#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
#, c-format
msgid "Documentation"
msgstr "Dokumentaro"
#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
#, c-format
msgid "Books and Howto's on Linux and Free Software"
msgstr "Libroj kaj Kielfari pri Linukso kaj libera programaro"
#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
#, c-format
msgid "LSB"
msgstr "LSB"
#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
#, c-format
msgid "Linux Standard Base. Third party applications support"
msgstr "Linux Standard Base. Subteno por triaflankaj aplikaĵoj"
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
#, c-format
msgid "Web Server"
msgstr "Interret-servilo"
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
#, c-format
msgid "Apache"
msgstr "Apache"
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
#, c-format
msgid "Groupware"
msgstr "Grupa programaro"
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
#, c-format
msgid "Kolab Server"
msgstr "Kolab Servilo"
#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
#, c-format
msgid "Firewall/Router"
msgstr "Fajroŝirmilo/enkursigilo"
#: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
#, c-format
msgid "Internet gateway"
msgstr "Interreta kluzo"
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
#, c-format
msgid "Mail/News"
msgstr "Poŝto/Novaĵoj"
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
#, c-format
msgid "Postfix mail server, Inn news server"
msgstr "Postfix poŝta servilo, Inn novaĵaj servilo"
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
#, c-format
msgid "Directory Server"
msgstr "Dosierujo-servilo"
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
#, c-format
msgid "FTP Server"
msgstr "FTP Servilo"
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
#, c-format
msgid "ProFTPd"
msgstr "ProFTPd"
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
#, c-format
msgid "DNS/NIS"
msgstr "DNS/NIS"
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
#, c-format
msgid "Domain Name and Network Information Server"
msgstr "Domajn-noma kaj ret-informa servilo"
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
#, c-format
msgid "File and Printer Sharing Server"
msgstr "Dosier- kaj printil-kundivida servilo"
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
#, c-format
msgid "NFS Server, Samba server"
msgstr "NFS servilo, Samba servilo"
#: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
#, c-format
msgid "Database"
msgstr "Datumbazoj"
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
#, c-format
msgid "PostgreSQL and MySQL Database Server"
msgstr "Datenbaz-serviloj PostgreSQL kaj MySQL"
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
#, c-format
msgid "Web/FTP"
msgstr "TTT/FTP"
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
#, c-format
msgid "Apache, Pro-ftpd"
msgstr "Apache, Pro-ftpd"
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
#, c-format
msgid "Mail"
msgstr "Poŝto"
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
#, c-format
msgid "Postfix mail server"
msgstr "Postfix poŝta servilo"
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
#, c-format
msgid "PostgreSQL or MySQL database server"
msgstr "Datenbaz-servilo PostgreSQL aŭ MySQL"
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
#, c-format
msgid "Network Computer server"
msgstr "Reta computilo (servilo)"
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
#, c-format
msgid "NFS server, SMB server, Proxy server, ssh server"
msgstr "NFS-servilo, SMB-servilo, prokur-servilo, ssh-servilo"
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
#, c-format
msgid "Graphical Environment"
msgstr "Grafika medio"
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
#, c-format
msgid "KDE Workstation"
msgstr "KDE Laborstacio"
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
#, c-format
msgid ""
"The K Desktop Environment, the basic graphical environment with a collection "
"of accompanying tools"
msgstr "La tabula medio K, la baza grafika medio kun kolekto da akompanaj iloj"
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
#, c-format
msgid "GNOME Workstation"
msgstr "Gnoma Laborstacio"
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
#, c-format
msgid ""
"A graphical environment with user-friendly set of applications and desktop "
"tools"
msgstr "Grafika medio kun uzfacila aplikaĵaro kaj tabul-iloj"
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
#, fuzzy, c-format
msgid "LXDE Desktop"
msgstr "Labortabulo IceWm"
@@ -682,54 +643,52 @@ msgid ""
"applications and desktop tools"
msgstr "Grafika medio kun uzfacila aplikaĵaro kaj tabul-iloj"
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
#, c-format
msgid "Other Graphical Desktops"
msgstr "Aliaj grafikaj labortabuloj"
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
#, c-format
msgid "Window Maker, Enlightenment, Fvwm, etc"
msgstr "Window Maker, Enlightenment, Fvwm, ktp."
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
#, c-format
msgid "Utilities"
msgstr "Iloj"
#: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
#, c-format
msgid "SSH Server"
msgstr "SSH servilo"
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
#, c-format
msgid "Webmin"
msgstr "Webmin"
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
#, c-format
msgid "Webmin Remote Configuration Server"
msgstr "Servilo de fora konfigurado Webmin"
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
#, c-format
msgid "Network Utilities/Monitoring"
msgstr "Retaj utilaĵoj/monitorado"
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
#, c-format
msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
msgstr "Monitoriloj, proces-kalkuliloj, tcpdump, nmap, ..."
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
#, c-format
msgid "Mandriva Wizards"
msgstr "Sorĉiloj de Mandriva"
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
#, c-format
msgid "Wizards to configure server"
msgstr "Sorĉiloj por konfiguri servilon"
@@ -829,17 +788,17 @@ msgstr ""
msgid "Click on images in order to see a bigger preview"
msgstr ""
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
#, c-format
msgid "Package Group Selection"
msgstr "Elektado de Pakaĵaj Grupoj"
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
#, c-format
msgid "Individual package selection"
msgstr "Elektado de individuaj pakaĵoj"
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
#, c-format
msgid "Total size: %d / %d MB"
msgstr "Tuta grandeco: %d / %d MB"
@@ -958,12 +917,12 @@ msgstr "Minimuma instalado"
msgid "Software Management"
msgstr "Programar-mastrumilo"
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
#, c-format
msgid "Choose the packages you want to install"
msgstr "Elektu la pakaĵojn kiuj vi deziras instali"
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
#, c-format
msgid "Installing"
msgstr "Instalanta"
@@ -990,7 +949,7 @@ msgid_plural "%d packages"
msgstr[0] "%d pakaĵo"
msgstr[1] "%d pakaĵoj"
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
#, c-format
msgid "Summary"
msgstr "Resumo"
@@ -1000,7 +959,7 @@ msgstr "Resumo"
msgid "Configure"
msgstr "Konfiguru"
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
#, c-format
msgid "not configured"
msgstr "ne konfigurita"
@@ -1010,7 +969,7 @@ msgstr "ne konfigurita"
msgid "Media Selection"
msgstr "Elektado de Pakaĵaj Grupoj"
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
#, c-format
msgid ""
"The following installation media have been found.\n"
@@ -1019,7 +978,7 @@ msgstr ""
"La sekva instal-datenportilo(j) estas trovita(j).\n"
"Se vi deziras transsalti kelkajn de ili, vi povas tiujn nun malselekti."
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
#, c-format
msgid ""
"You have the option to copy the contents of the CDs onto the hard drive "
@@ -1032,7 +991,7 @@ msgstr ""
"Tiam la instalado daŭrigas el la fiksdisko kaj la pakaĵoj restos atingeblaj "
"post kiam la sistemo estos plene instalita."
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
#, c-format
msgid "Copy whole CDs"
msgstr "Kopii kompletajn KD-ojn"
@@ -1052,59 +1011,49 @@ msgstr "Bonvole elektu vian klavar-aranĝon"
msgid "Here is the full list of available keyboards:"
msgstr "Jen la kompleta listo de disponeblaj klavaroj"
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
#, c-format
msgid "Install/Upgrade"
msgstr "Instalado/Ĝisdatigo"
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
#, c-format
msgid "Is this an install or an upgrade?"
msgstr "Ĉu tiu ĉi estas instalado aŭ ĝisdatigo?"
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
#, c-format
msgid ""
"_: This is a noun:\n"
"Install"
msgstr "Instalado"
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
#, c-format
msgid "Upgrade %s"
msgstr "Ĝisdatigu %s"
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr "Ĝisdatigo de 32-bita al 64-bita eldono ne estas subtenata"
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr "Ĝisdatigo de 64-bita al 32-bita eldono ne estas subtenata"
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
#, c-format
msgid "Encryption key for %s"
msgstr "Ĉifroŝlosilo por %s"
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
#, c-format
msgid "Cancel installation, reboot system"
msgstr ""
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
#, fuzzy, c-format
msgid "New Installation"
msgstr "Instalado"
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
#, c-format
msgid "Upgrade previous installation (not recommended)"
msgstr ""
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
#, c-format
msgid ""
"Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1116,17 +1065,17 @@ msgid ""
"Installation\"."
msgstr ""
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "IDE"
msgstr "IDE"
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "Configuring IDE"
msgstr "Konfiguras IDE"
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
#, c-format
msgid ""
"No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1135,7 +1084,7 @@ msgstr ""
"Ne libera spaco por 1mb-startparto! La instalado daurigos, sed por startigi "
"vian sistemon, vi devos krei la startpartan subdiskon en DiskDrake"
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
#, c-format
msgid ""
"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1145,7 +1094,7 @@ msgstr ""
"Vi devas krei praŝargon PPC PReP Boot! La instalado daŭros, sed por startigi "
"vian sistemon, vi devas krei la praŝargan subdiskon en DiskDrake"
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
#, c-format
msgid ""
"Change your Cd-Rom!\n"
@@ -1160,12 +1109,12 @@ msgstr ""
"kiam vi finos.\n"
"Se vi ne havas ĝin, klaku \"Nuligu\" por eviti la instaladon de ĉi tiu KDROM."
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
#, c-format
msgid "Looking for available packages..."
msgstr "Serĉas haveblajn pakaĵojn"
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
#, c-format
msgid ""
"Your system does not have enough space left for installation or upgrade (%"
@@ -1174,7 +1123,7 @@ msgstr ""
"Via sistemo ne havas sufiĉe da spaco libera por instalado aŭ ĝisdatigo (%dMB "
"> %dMB)"
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
#, c-format
msgid ""
"Please choose load or save package selection.\n"
@@ -1183,54 +1132,54 @@ msgstr ""
"Bonvole elektu ŝargi aŭ konservi pakaĵ-elekton.\n"
" La formato estas la sama kiel dosieroj generitaj per auto_install."
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Load"
msgstr "Ŝargu"
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Save"
msgstr "Konservu"
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
#, c-format
msgid "Bad file"
msgstr "Malbona dosiero"
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
#, fuzzy, c-format
msgid "KDE"
msgstr "IDE"
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
#, c-format
msgid "GNOME"
msgstr "GNOME"
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
#, fuzzy, c-format
msgid "Desktop Selection"
msgstr "Elektado de Pakaĵaj Grupoj"
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
#, fuzzy, c-format
msgid "You can choose your workstation desktop profile."
msgstr ""
"Vi povas elekti profilon de labortablo de via laborejo: KDE, GNOME aŭ "
"Personigita"
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
#, c-format
msgid "Selected size is larger than available space"
msgstr "Elektita grandeco estas pli ampleksa ol disponebla spaco"
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
#, c-format
msgid "Type of install"
msgstr "Instaltipo"
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
#, c-format
msgid ""
"You have not selected any group of packages.\n"
@@ -1239,84 +1188,84 @@ msgstr ""
"Vi ne elektis pakaĵgrupon.\n"
"Bonvole elektu la minimuman instaladon kiun vi deziras:"
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
#, c-format
msgid "With X"
msgstr "Kun X"
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
#, c-format
msgid "With basic documentation (recommended!)"
msgstr "Kun baza dokumentaĵo (rekomendita!)"
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
#, c-format
msgid "Truly minimal install (especially no urpmi)"
msgstr "Vere minimuma instalado (precipe ne urpmi)"
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
#, c-format
msgid "Preparing installation"
msgstr "Preparas instaladon"
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
#, c-format
msgid "Installing package %s"
msgstr "Instalanta pakaĵo %s"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "There was an error ordering packages:"
msgstr "Estis eraro ordigi pakaĵojn:"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "Go on anyway?"
msgstr "Ĉu vi deziras daŭri tamen?"
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
#, c-format
msgid "Retry"
msgstr "Reprovu"
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
#, c-format
msgid "Skip this package"
msgstr "Transsalti tiun pakaĵon"
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
#, c-format
msgid "Skip all packages from medium \"%s\""
msgstr "Transsalti ĉiujn pakaĵojn de la datenportilo \"%s\""
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
#, c-format
msgid "Go back to media and packages selection"
msgstr "Reiru al la datenportilo kaj pakaĵ-selekto"
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
#, c-format
msgid "There was an error installing package %s."
msgstr "Estis eraro dum instalado de pakaĵo %s."
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
#, c-format
msgid "Post-install configuration"
msgstr "Post-instala konfigurado"
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
#, c-format
msgid "Please ensure the Update Modules media is in drive %s"
msgstr ""
"Bonvole certiĝu ke la datenportilo por ĝisdatigaj moduloj troviĝas en la "
"aparato %s"
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
#, c-format
msgid "Updates"
msgstr "Ĝisdatigoj"
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
#, c-format
msgid ""
"You now have the opportunity to download updated packages. These packages\n"
@@ -1337,28 +1286,28 @@ msgstr ""
"\n"
"Ĉu vi deziras instali tiujn ĝisdatigojn?"
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
#, c-format
msgid "%s on %s"
msgstr "%s sur %s"
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
#, c-format
msgid "Hardware"
msgstr "Aparataro"
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
#, c-format
msgid "Sound card"
msgstr "Sonkarto"
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
#, c-format
msgid "Do you have an ISA sound card?"
msgstr "Ĉu vi havas ISA-sonkarton?"
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
#, c-format
msgid ""
"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1367,67 +1316,67 @@ msgstr ""
"Rulu \"alsaconf\" aŭ \"sndconfig\" post instalado por konfiguri vian "
"sonkarton"
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
#, c-format
msgid "No sound card detected. Try \"harddrake\" after installation"
msgstr "Ne detektis sonkarto. Provu \"harddrake\" post instalado"
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
#, c-format
msgid "Graphical interface"
msgstr "Grafika interfaco"
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
#, c-format
msgid "Network & Internet"
msgstr "Reto kaj Interreto"
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
#, c-format
msgid "Proxies"
msgstr "Prokuraj Serviloj"
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
#, c-format
msgid "configured"
msgstr "konfigurita"
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
#, c-format
msgid "Security Level"
msgstr "sekurnivelo"
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
#, c-format
msgid "Firewall"
msgstr "Fajromuro (Firewall)"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "activated"
msgstr "aktiva"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "disabled"
msgstr "malebligita"
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
#, c-format
msgid "You have not configured X. Are you sure you really want this?"
msgstr "Vi ne konfiguris X-on. Ĉu vi certas vere voli tion?"
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
#, c-format
msgid "Preparing bootloader..."
msgstr "Preparas startŝargilon"
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
#, c-format
msgid "Be patient, this may take a while..."
msgstr ""
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
#, c-format
msgid ""
"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1440,7 +1389,7 @@ msgstr ""
"rimedon por startigi vian maŝinon. La kerno-argumento por la root fs "
"[dosiersistemo] estas: root=%s"
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
#, c-format
msgid ""
"In this security level, access to the files in the Windows partition is "
@@ -1449,17 +1398,17 @@ msgstr ""
"Sur tiu ĉi sekurec-nivelo, la aliro al dosieroj en la Vindozaj subdiskoj "
"estas limigitaj al la mastrumanto."
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr "Enŝovu malplenan disketon en drajvo %s"
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
#, c-format
msgid "Creating auto install floppy..."
msgstr "Kreas aŭtoinstalan disketon"
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
#, c-format
msgid ""
"Some steps are not completed.\n"
@@ -1470,7 +1419,7 @@ msgstr ""
"\n"
"Ĉu vi vere volas ĉesi nun?"
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
#, c-format
msgid "Congratulations"
msgstr "Gratulojn"
@@ -1614,6 +1563,15 @@ msgid ""
"Exit"
msgstr "Eliro"
+#~ msgid "Downloading file %s..."
+#~ msgstr "Mi deŝutas dosieron %s..."
+
+#~ msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
+#~ msgstr "Ĝisdatigo de 32-bita al 64-bita eldono ne estas subtenata"
+
+#~ msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
+#~ msgstr "Ĝisdatigo de 64-bita al 32-bita eldono ne estas subtenata"
+
#~ msgid ""
#~ "You have selected the following server(s): %s\n"
#~ "\n"
diff --git a/perl-install/install/share/po/es.po b/perl-install/install/share/po/es.po
index 81a853fa7..ed120c602 100644
--- a/perl-install/install/share/po/es.po
+++ b/perl-install/install/share/po/es.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: es\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
"PO-Revision-Date: 2008-10-02 09:35-0300\n"
"Last-Translator: Fabián Mandelbaum <fmandelbaum@gmail.com>\n"
"Language-Team: Español <es@li.org>\n"
@@ -21,31 +21,6 @@ msgstr ""
"X-Generator: KBabel 1.11.4\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr "Su escritorio en un pendrive USB"
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr "La distribución Mandriva Linux 100% Open Source"
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr "Explore Linux con facilidad por medio de Mandriva One"
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr "Un escritorio Mandriva Linux completo, con soporte"
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr "Mandriva: distribuciones para las necesidades de todos"
-
#: any.pm:109
#, c-format
msgid "Do you have further supplementary media?"
@@ -86,17 +61,17 @@ msgstr "Red (FTP)"
msgid "Network (NFS)"
msgstr "Red (NFS)"
-#: any.pm:163
+#: any.pm:165
#, c-format
msgid "URL of the mirror?"
msgstr "¿URL del sitio réplica?"
-#: any.pm:169
+#: any.pm:171
#, c-format
msgid "URL must start with ftp:// or http://"
msgstr "El URL debe empezar con ftp:// o http://"
-#: any.pm:180
+#: any.pm:182
#, c-format
msgid ""
"Contacting Mandriva Linux web site to get the list of available mirrors..."
@@ -104,7 +79,7 @@ msgstr ""
"Contactando con el sitio web de Mandriva Linux para obtener la lista de las "
"réplicas disponibles"
-#: any.pm:185
+#: any.pm:187
#, c-format
msgid ""
"Failed contacting Mandriva Linux web site to get the list of available "
@@ -113,47 +88,47 @@ msgstr ""
"No se pudo conectar con el sitio web de Mandriva Linux para obtener la lista "
"de las réplicas disponibles"
-#: any.pm:195
+#: any.pm:197
#, c-format
msgid "Choose a mirror from which to get the packages"
msgstr "Elija un sitio de réplica del cual obtener los paquetes"
-#: any.pm:225
+#: any.pm:227
#, c-format
msgid "NFS setup"
msgstr "Configuración NFS"
-#: any.pm:226
+#: any.pm:228
#, c-format
msgid "Please enter the hostname and directory of your NFS media"
msgstr "Ingrese el nombre de servidor y el directorio de su soporte NFS"
-#: any.pm:230
+#: any.pm:232
#, c-format
msgid "Hostname missing"
msgstr "Falta el nombre del servidor"
-#: any.pm:231
+#: any.pm:233
#, c-format
msgid "Directory must begin with \"/\""
msgstr "El directorio debe empezar con \"/\""
-#: any.pm:235
+#: any.pm:237
#, c-format
msgid "Hostname of the NFS mount ?"
msgstr "¿Nombre del servidor del montaje NFS?"
-#: any.pm:236
+#: any.pm:238
#, c-format
msgid "Directory"
msgstr "Directorio"
-#: any.pm:258
+#: any.pm:260
#, c-format
msgid "Supplementary"
msgstr "Suplementario"
-#: any.pm:293
+#: any.pm:295
#, c-format
msgid ""
"Can't find a package list file on this mirror. Make sure the location is "
@@ -162,22 +137,22 @@ msgstr ""
"No puedo encontrar el archivo hdlist en este sitio réplica. Asegúrese que la "
"ubicación es correcta."
-#: any.pm:328
+#: any.pm:334
#, c-format
msgid "Looking at packages already installed..."
msgstr "Buscando paquetes ya instalados..."
-#: any.pm:362
+#: any.pm:368
#, c-format
msgid "Finding packages to upgrade..."
msgstr "Encontrando los paquetes a actualizar..."
-#: any.pm:381
+#: any.pm:387
#, c-format
msgid "Removing packages prior to upgrade..."
msgstr "Quitando paquetes antes de actualizar..."
-#: any.pm:402
+#: any.pm:408
#, c-format
msgid ""
"You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -195,18 +170,18 @@ msgstr ""
"Para actualizar con KDE 3.5 y preservar su configuración, por favor\n"
"vuelva a iniciar su sistema y actualize utilizando el applet Mandriva Update."
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
#, c-format
msgid "Reboot"
msgstr "Reiniciar"
-#: any.pm:407
+#: any.pm:413
#, c-format
msgid "Proceed"
msgstr ""
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -219,72 +194,72 @@ msgstr ""
"\n"
"¿Realmente desea quitar estos paquetes?\n"
-#: any.pm:815
+#: any.pm:821
#, c-format
msgid "Error reading file %s"
msgstr "Error al leer el archivo %s"
-#: any.pm:1022
+#: any.pm:1028
#, c-format
msgid "The following disk(s) were renamed:"
msgstr "Se renombraron los discos siguientes:"
-#: any.pm:1024
+#: any.pm:1030
#, c-format
msgid "%s (previously named as %s)"
msgstr "%s (antes conocido como %s)"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "HTTP"
msgstr "HTTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "FTP"
msgstr "FTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "NFS"
msgstr "NFS"
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
#, c-format
msgid "Network"
msgstr "Red"
-#: any.pm:1104
+#: any.pm:1110
#, c-format
msgid "Please choose a media"
msgstr "Por favor, elija un soporte"
-#: any.pm:1120
+#: any.pm:1126
#, c-format
msgid "File already exists. Overwrite it?"
msgstr "El archivo ya existe. ¿Desea sobreescribirlo?"
-#: any.pm:1124
+#: any.pm:1130
#, c-format
msgid "Permission denied"
msgstr "Permiso denegado"
-#: any.pm:1172
+#: any.pm:1178
#, c-format
msgid "Bad NFS name"
msgstr "Nombre NFS incorrecto"
-#: any.pm:1193
+#: any.pm:1199
#, c-format
msgid "Bad media %s"
msgstr "Soporte %s incorrecto"
-#: any.pm:1236
+#: any.pm:1242
#, c-format
msgid "Can not make screenshots before partitioning"
msgstr "No se pueden realizar instantáneas de pantalla antes del particionado"
-#: any.pm:1244
+#: any.pm:1250
#, c-format
msgid "Screenshots will be available after install in %s"
msgstr ""
@@ -297,11 +272,15 @@ msgid "Installation"
msgstr "Instalación"
#: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
#, c-format
msgid "Configuration"
msgstr "Configuración"
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
#: install2.pm:168
#, c-format
msgid "You must also format %s"
@@ -327,22 +306,22 @@ msgstr "Levantando la red"
msgid "Bringing down the network"
msgstr "Bajando la red"
-#: media.pm:402
+#: media.pm:399
#, c-format
msgid "Please wait, retrieving file"
msgstr "Por favor espere, recuperando archivo"
-#: media.pm:734
+#: media.pm:718
#, c-format
-msgid "Downloading file %s..."
-msgstr "Descargando el archivo %s..."
+msgid "unable to add medium"
+msgstr ""
-#: media.pm:822
+#: media.pm:758
#, c-format
msgid "Copying some packages on disks for future use"
msgstr "Copiando algunos paquetes en el disco para uso futuro"
-#: media.pm:875
+#: media.pm:811
#, c-format
msgid "Copying in progress"
msgstr "Copia en curso"
@@ -386,27 +365,27 @@ msgstr ""
msgid "An error occurred:"
msgstr "Ocurrió un error"
-#: pkgs.pm:776
+#: pkgs.pm:780
#, c-format
msgid "%d installation transactions failed"
msgstr "Fallaron %d transacciones de instalación"
-#: pkgs.pm:777
+#: pkgs.pm:781
#, fuzzy, c-format
msgid "Installation of packages failed:"
msgstr "Instalando el paquete %s"
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
#, c-format
msgid "Workstation"
msgstr "Estación de trabajo"
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
#, c-format
msgid "Office Workstation"
msgstr "Estación de trabajo de Oficina"
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
#, c-format
msgid ""
"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -415,7 +394,7 @@ msgstr ""
"Programas de Oficina: procesadores de texto (OpenOffice.org Writer, Kword), "
"hojas de cálculo (OpenOffice.org Calc, Kspread), visualizadores PDF, etc"
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
#, c-format
msgid ""
"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -424,32 +403,32 @@ msgstr ""
"Programas de Oficina: procesadores de palabras (kword, abiword), plantillas "
"de cálculo (kspread, gnumeric), visualizadores PDF, etc"
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
#, c-format
msgid "Game station"
msgstr "Estación de Juegos"
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
#, c-format
msgid "Amusement programs: arcade, boards, strategy, etc"
msgstr "Programas de entretenimiento: arcade, tableros, estrategia, etc"
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
#, c-format
msgid "Multimedia station"
msgstr "Estación Multimedios"
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
#, c-format
msgid "Sound and video playing/editing programs"
msgstr "Programas de reproducción/edición de sonido y vídeo"
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
#, c-format
msgid "Internet station"
msgstr "Estación Internet"
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
#, c-format
msgid ""
"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -458,211 +437,193 @@ msgstr ""
"Conjunto de herramientas para leer y enviar correo y noticias (mutt, tin...) "
"y para navegar por la Web"
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
#, c-format
msgid "Network Computer (client)"
msgstr "Computadora de Red (cliente)"
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
#, c-format
msgid "Clients for different protocols including ssh"
msgstr "Clientes para los distintos protocolos incluyendo a SSH"
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
#, c-format
msgid "Tools to ease the configuration of your computer"
msgstr "Herramientas para facilitar la configuración de su computadora"
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
#, c-format
msgid "Console Tools"
msgstr "Herramientas para la consola"
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
#, c-format
msgid "Editors, shells, file tools, terminals"
msgstr "Editores, shells, manipulación de archivos, terminales"
#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
#, c-format
msgid "Development"
msgstr "Desarrollo"
#: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
#, c-format
msgid "C and C++ development libraries, programs and include files"
msgstr "Bibliotecas de desarrollo C y C++, programas y archivos *.h"
#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
#, c-format
msgid "Documentation"
msgstr "Documentación"
#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
#, c-format
msgid "Books and Howto's on Linux and Free Software"
msgstr "Libros y COMOs sobre Linux y Software Libre"
#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
#, c-format
msgid "LSB"
msgstr "LSB"
#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
#, c-format
msgid "Linux Standard Base. Third party applications support"
msgstr "Linux Standard Base. Soporte de aplicaciones de terceros"
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
#, c-format
msgid "Web Server"
msgstr "Servidor web"
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
#, c-format
msgid "Apache"
msgstr "Apache"
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
#, c-format
msgid "Groupware"
msgstr "Grupos de trabajo"
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
#, c-format
msgid "Kolab Server"
msgstr "Servidor Kolab"
#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
#, c-format
msgid "Firewall/Router"
msgstr "Cortafuegos/Router"
#: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
#, c-format
msgid "Internet gateway"
msgstr "Pasarela de acceso a Internet"
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
#, c-format
msgid "Mail/News"
msgstr "Correo/Noticias"
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
#, c-format
msgid "Postfix mail server, Inn news server"
msgstr "Servidor de correo Postfix, servidor de noticias Inn"
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
#, c-format
msgid "Directory Server"
msgstr "Servidor de directorios"
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
#, c-format
msgid "FTP Server"
msgstr "Servidor FTP"
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
#, c-format
msgid "ProFTPd"
msgstr "ProFTPd"
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
#, c-format
msgid "DNS/NIS"
msgstr "DNS/NIS"
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
#, c-format
msgid "Domain Name and Network Information Server"
msgstr "Servidor de nombres de dominio y servidor de información de red"
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
#, c-format
msgid "File and Printer Sharing Server"
msgstr "Servidor de archivos e impresión"
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
#, c-format
msgid "NFS Server, Samba server"
msgstr "Servidor NFS, servidor Samba"
#: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
#, c-format
msgid "Database"
msgstr "Base de Datos"
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
#, c-format
msgid "PostgreSQL and MySQL Database Server"
msgstr "Servidor de base de datos PostgreSQL y MySQL"
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
#, c-format
msgid "Web/FTP"
msgstr "Web/FTP"
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
#, c-format
msgid "Apache, Pro-ftpd"
msgstr "Apache y Pro-ftpd"
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
#, c-format
msgid "Mail"
msgstr "Correo"
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
#, c-format
msgid "Postfix mail server"
msgstr "Servidor de correo Postfix"
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
#, c-format
msgid "PostgreSQL or MySQL database server"
msgstr "Servidor de base de datos PostgreSQL o MySQL"
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
#, c-format
msgid "Network Computer server"
msgstr "Servidor de red"
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
#, c-format
msgid "NFS server, SMB server, Proxy server, ssh server"
msgstr "Servidor NFS, servidor SMB, servidor proxy, servidor SSH"
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
#, c-format
msgid "Graphical Environment"
msgstr "Entorno gráfico"
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
#, c-format
msgid "KDE Workstation"
msgstr "Estación de trabajo KDE"
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
#, c-format
msgid ""
"The K Desktop Environment, the basic graphical environment with a collection "
@@ -671,12 +632,12 @@ msgstr ""
"El K Desktop Environment, el entorno gráfico básico con una colección de "
"herramientas que lo acompañan"
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
#, c-format
msgid "GNOME Workstation"
msgstr "Estación de trabajo GNOME"
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
#, c-format
msgid ""
"A graphical environment with user-friendly set of applications and desktop "
@@ -685,7 +646,7 @@ msgstr ""
"Entorno gráfico con un conjunto de herramientas de escritorio y aplicaciones "
"amigables"
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
#, fuzzy, c-format
msgid "LXDE Desktop"
msgstr "Escritorio KDE"
@@ -699,54 +660,52 @@ msgstr ""
"Entorno gráfico con un conjunto de herramientas de escritorio y aplicaciones "
"amigables"
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
#, c-format
msgid "Other Graphical Desktops"
msgstr "Otros entornos gráficos"
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
#, c-format
msgid "Window Maker, Enlightenment, Fvwm, etc"
msgstr "Window Maker, Enlightenment, Fvwm, etc"
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
#, c-format
msgid "Utilities"
msgstr "Utilidades"
#: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
#, c-format
msgid "SSH Server"
msgstr "Servidor SSH"
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
#, c-format
msgid "Webmin"
msgstr "Webmin"
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
#, c-format
msgid "Webmin Remote Configuration Server"
msgstr "Servidor de configuración remota Webmin"
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
#, c-format
msgid "Network Utilities/Monitoring"
msgstr "Utilidades/Supervisión de red"
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
#, c-format
msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
msgstr "Herramientas de supervisión, control de procesos, tcpdump, nmap, ..."
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
#, c-format
msgid "Mandriva Wizards"
msgstr "Asistentes de Mandriva"
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
#, c-format
msgid "Wizards to configure server"
msgstr "Asistentes para configurar el servidor"
@@ -845,17 +804,17 @@ msgstr "Aquí tiene un previsualización del escritorio '%s'."
msgid "Click on images in order to see a bigger preview"
msgstr "Haga clic sobre las imágenes para agrandarlas"
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
#, c-format
msgid "Package Group Selection"
msgstr "Selección de grupos de paquetes"
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
#, c-format
msgid "Individual package selection"
msgstr "Selección de paquetes individuales"
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
#, c-format
msgid "Total size: %d / %d MB"
msgstr "Tamaño total: %d / %d MB"
@@ -974,12 +933,12 @@ msgstr "Instalación mínima"
msgid "Software Management"
msgstr "Administración de software"
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
#, c-format
msgid "Choose the packages you want to install"
msgstr "Elija los paquetes que desea instalar"
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
#, c-format
msgid "Installing"
msgstr "Instalando"
@@ -1006,7 +965,7 @@ msgid_plural "%d packages"
msgstr[0] "%d paquete"
msgstr[1] "%d paquetes"
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
#, c-format
msgid "Summary"
msgstr "Resumen"
@@ -1016,7 +975,7 @@ msgstr "Resumen"
msgid "Configure"
msgstr "Configurar"
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
#, c-format
msgid "not configured"
msgstr "no configurado"
@@ -1026,7 +985,7 @@ msgstr "no configurado"
msgid "Media Selection"
msgstr "Selección de soportes"
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
#, c-format
msgid ""
"The following installation media have been found.\n"
@@ -1035,7 +994,7 @@ msgstr ""
"Se han encontrado los siguientes soportes de instalación.\n"
"Si quiere saltarse alguno de ellos, puede deseleccionarlos ahora."
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
#, c-format
msgid ""
"You have the option to copy the contents of the CDs onto the hard drive "
@@ -1048,7 +1007,7 @@ msgstr ""
"La misma continuará desde el disco duro y los paquetes estarán disponibles "
"una vez que el sistema esté completamente instalado."
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
#, c-format
msgid "Copy whole CDs"
msgstr "Copiar los CD por completo"
@@ -1068,59 +1027,49 @@ msgstr "Por favor, elija el tipo de su teclado"
msgid "Here is the full list of available keyboards:"
msgstr "Aquí tiene la lista completa de teclados disponibles:"
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
#, c-format
msgid "Install/Upgrade"
msgstr "Instalación/Actualización"
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
#, c-format
msgid "Is this an install or an upgrade?"
msgstr "¿Es una instalación o una actualización?"
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
#, c-format
msgid ""
"_: This is a noun:\n"
"Install"
msgstr "Instalación"
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
#, c-format
msgid "Upgrade %s"
msgstr "Actualizar %s"
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr "No se soporta la acutalización de una distribución 32 bit a una 64 bit"
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr "No se soporta la actualización de una distribución 64 bit a una 32 bit"
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
#, c-format
msgid "Encryption key for %s"
msgstr "Clave de cifrado para %s"
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
#, c-format
msgid "Cancel installation, reboot system"
msgstr "Cancelar la instalación, volver a iniciar el sistema"
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
#, c-format
msgid "New Installation"
msgstr "Instalación nueva"
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
#, c-format
msgid "Upgrade previous installation (not recommended)"
msgstr "Actualizar la instalación previa (no se recomienda)"
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
#, c-format
msgid ""
"Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1139,17 +1088,17 @@ msgstr ""
"¡Atención: debería hacer copia de respaldo de todos sus datos\n"
"antes de comenzar con la instalación nueva!"
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "IDE"
msgstr "IDE"
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "Configuring IDE"
msgstr "Configurando dispositivos IDE"
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
#, c-format
msgid ""
"No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1158,7 +1107,7 @@ msgstr ""
"¡No hay 1MB de espacio para bootstrap! La instalación continuará, pero para "
"arrancar su sistema, necesitará crear la partición bootstrap en DiskDrake"
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
#, c-format
msgid ""
"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1169,7 +1118,7 @@ msgstr ""
"pero, para arrancar su sistema, necesitará crear la partición bootstrap en "
"DiskDrake"
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
#, c-format
msgid ""
"Change your Cd-Rom!\n"
@@ -1183,12 +1132,12 @@ msgstr ""
"cuando lo haya hecho.\n"
"Si no lo posee, pulse Cancelar para evitar la instalación desde este CD-ROM."
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
#, c-format
msgid "Looking for available packages..."
msgstr "Buscando los paquetes disponibles..."
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
#, c-format
msgid ""
"Your system does not have enough space left for installation or upgrade (%"
@@ -1197,7 +1146,7 @@ msgstr ""
"Su sistema no tiene espacio libre suficiente para la instalación o "
"actualización (%d MB > %d MB)"
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
#, c-format
msgid ""
"Please choose load or save package selection.\n"
@@ -1207,52 +1156,52 @@ msgstr ""
"El formato es el mismo que el de los archivos generados con la instación "
"automática."
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Load"
msgstr "Cargar"
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Save"
msgstr "Guardar"
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
#, c-format
msgid "Bad file"
msgstr "Archivo incorrecto"
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
#, c-format
msgid "KDE"
msgstr "KDE"
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
#, c-format
msgid "GNOME"
msgstr "GNOME"
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
#, c-format
msgid "Desktop Selection"
msgstr "Selección del entorno de escritorio"
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
#, c-format
msgid "You can choose your workstation desktop profile."
msgstr "Puede elegir un perfil de escritorio de estación de trabajo."
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
#, c-format
msgid "Selected size is larger than available space"
msgstr "El tamaño seleccionado es mayor que el disponible"
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
#, c-format
msgid "Type of install"
msgstr "Tipo de instalación."
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
#, c-format
msgid ""
"You have not selected any group of packages.\n"
@@ -1261,84 +1210,84 @@ msgstr ""
"No ha seleccionado ningún grupo de paquetes\n"
"Elija por favor la instalación mínima que desea."
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
#, c-format
msgid "With X"
msgstr "Con X"
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
#, c-format
msgid "With basic documentation (recommended!)"
msgstr "Con documentación básica (¡recomendado!)"
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
#, c-format
msgid "Truly minimal install (especially no urpmi)"
msgstr "Instalación mínima \"en serio\" (especialmente sin urpmi)"
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
#, c-format
msgid "Preparing installation"
msgstr "Preparando la instalación"
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
#, c-format
msgid "Installing package %s"
msgstr "Instalando el paquete %s"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "There was an error ordering packages:"
msgstr "Hubo un error al ordenar los paquetes:"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "Go on anyway?"
msgstr "¿Seguir adelante?"
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
#, c-format
msgid "Retry"
msgstr "Reintentarlo"
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
#, c-format
msgid "Skip this package"
msgstr "Omitir este paquete"
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
#, c-format
msgid "Skip all packages from medium \"%s\""
msgstr "Omitir todos los paquetes del soporte \"%s\""
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
#, c-format
msgid "Go back to media and packages selection"
msgstr "Volver a la selección de paquetes"
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
#, c-format
msgid "There was an error installing package %s."
msgstr "Hubo un error al instalar el paquete %s."
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
#, c-format
msgid "Post-install configuration"
msgstr "Configuración posterior a la instalación"
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
#, c-format
msgid "Please ensure the Update Modules media is in drive %s"
msgstr ""
"Por favor, asegúrese de que el soporte de actualización de módulos está en "
"la unidad %s"
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
#, c-format
msgid "Updates"
msgstr "Actualizaciones"
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
#, c-format
msgid ""
"You now have the opportunity to download updated packages. These packages\n"
@@ -1359,28 +1308,28 @@ msgstr ""
"\n"
"¿Desea instalar las actualizaciones?"
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
#, c-format
msgid "%s on %s"
msgstr "%s en %s"
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
#, c-format
msgid "Hardware"
msgstr "Hardware"
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
#, c-format
msgid "Sound card"
msgstr "Tarjeta de sonido"
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
#, c-format
msgid "Do you have an ISA sound card?"
msgstr "¿Tiene una tarjeta de sonido ISA?"
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
#, c-format
msgid ""
"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1389,68 +1338,68 @@ msgstr ""
"Use \"alsaconf\" o \"sndconfig\" luego de la instalación para configurar su "
"tarjeta de sonido"
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
#, c-format
msgid "No sound card detected. Try \"harddrake\" after installation"
msgstr ""
"No se detectó tarjeta de sonido. Pruebe \"harddrake\" luego de la instalación"
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
#, c-format
msgid "Graphical interface"
msgstr "Interfaz gráfica"
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
#, c-format
msgid "Network & Internet"
msgstr "Redes e Internet"
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
#, c-format
msgid "Proxies"
msgstr "Proxis"
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
#, c-format
msgid "configured"
msgstr "configurado"
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
#, c-format
msgid "Security Level"
msgstr "Nivel de seguridad"
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
#, c-format
msgid "Firewall"
msgstr "Cortafuegos"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "activated"
msgstr "activado"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "disabled"
msgstr "deshabilitado"
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
#, c-format
msgid "You have not configured X. Are you sure you really want this?"
msgstr "No ha configurado a X ¿Está seguro que realmente desea esto?"
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
#, c-format
msgid "Preparing bootloader..."
msgstr "Preparando el cargador de arranque"
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
#, c-format
msgid "Be patient, this may take a while..."
msgstr ""
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
#, c-format
msgid ""
"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1464,7 +1413,7 @@ msgstr ""
"utilizar BootX o alguna otra manera para arrancar su máquina. El parámetro "
"del kernel para el sistema de archvivos raíz es: root=%s"
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
#, c-format
msgid ""
"In this security level, access to the files in the Windows partition is "
@@ -1473,17 +1422,17 @@ msgstr ""
"En este nivel de seguridad, el acceso a los archivos en la partición Windows "
"está restringido sólo al administrador."
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr "Inserte un disquete en blanco en la unidad %s"
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
#, c-format
msgid "Creating auto install floppy..."
msgstr "Creando el disquete de instalación automática"
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
#, c-format
msgid ""
"Some steps are not completed.\n"
@@ -1494,7 +1443,7 @@ msgstr ""
"\n"
"¿Realmente desea salir ahora?"
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
#, c-format
msgid "Congratulations"
msgstr "Felicidades"
@@ -1638,6 +1587,32 @@ msgid ""
"Exit"
msgstr "Salir"
+#~ msgid "Your desktop on a USB key"
+#~ msgstr "Su escritorio en un pendrive USB"
+
+#~ msgid "The 100%% open source Mandriva Linux distribution"
+#~ msgstr "La distribución Mandriva Linux 100% Open Source"
+
+#~ msgid "Explore Linux easily with Mandriva One"
+#~ msgstr "Explore Linux con facilidad por medio de Mandriva One"
+
+#~ msgid "A full Mandriva Linux desktop, with support"
+#~ msgstr "Un escritorio Mandriva Linux completo, con soporte"
+
+#~ msgid "Mandriva: distributions for everybody's needs"
+#~ msgstr "Mandriva: distribuciones para las necesidades de todos"
+
+#~ msgid "Downloading file %s..."
+#~ msgstr "Descargando el archivo %s..."
+
+#~ msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
+#~ msgstr ""
+#~ "No se soporta la acutalización de una distribución 32 bit a una 64 bit"
+
+#~ msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
+#~ msgstr ""
+#~ "No se soporta la actualización de una distribución 64 bit a una 32 bit"
+
#~ msgid ""
#~ "You have selected the following server(s): %s\n"
#~ "\n"
diff --git a/perl-install/install/share/po/et.po b/perl-install/install/share/po/et.po
index cb7ceba72..cad3e4476 100644
--- a/perl-install/install/share/po/et.po
+++ b/perl-install/install/share/po/et.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: DrakX-et\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
"PO-Revision-Date: 2009-02-16 12:27+0200\n"
"Last-Translator: Marek Laane <bald@starman.ee>\n"
"Language-Team: Estonian <et@li.org>\n"
@@ -17,31 +17,6 @@ msgstr ""
"X-Generator: KBabel 1.3\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr "Kogu töölaud USB-pulgal"
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr "100%% vaba tarkvaraga Mandriva Linuxi distributsioon"
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr "Linuxi hõlpus tundmaõppimine Mandriva One abil"
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr "Täielik Mandriva Linuxi töölaud koos kasutajatoega"
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr "Mandriva: distributsioone igale maitsele ja kõigiks vajadusteks"
-
#: any.pm:109
#, c-format
msgid "Do you have further supplementary media?"
@@ -81,24 +56,24 @@ msgstr "Võrk (FTP)"
msgid "Network (NFS)"
msgstr "Võrk (NFS)"
-#: any.pm:163
+#: any.pm:165
#, c-format
msgid "URL of the mirror?"
msgstr "Peegli URL?"
-#: any.pm:169
+#: any.pm:171
#, c-format
msgid "URL must start with ftp:// or http://"
msgstr "URL-i alguses peab seisma ftp:// või http://"
-#: any.pm:180
+#: any.pm:182
#, c-format
msgid ""
"Contacting Mandriva Linux web site to get the list of available mirrors..."
msgstr ""
"Mandriva Linuxi veebisaidilt saadaolevate peeglite nimekirja hankimine..."
-#: any.pm:185
+#: any.pm:187
#, c-format
msgid ""
"Failed contacting Mandriva Linux web site to get the list of available "
@@ -107,47 +82,47 @@ msgstr ""
"Ühenduse loomine Mandriva Linuxi veebisaidiga saadaolevate peeglite "
"nimekirja hankimiseks nurjus"
-#: any.pm:195
+#: any.pm:197
#, c-format
msgid "Choose a mirror from which to get the packages"
msgstr "Valige peegel, millelt lugeda pakettide nimekiri"
-#: any.pm:225
+#: any.pm:227
#, c-format
msgid "NFS setup"
msgstr "NFS-i seadistamine"
-#: any.pm:226
+#: any.pm:228
#, c-format
msgid "Please enter the hostname and directory of your NFS media"
msgstr "Palun andke NFS-andmekandja masinanimi ja kataloog"
-#: any.pm:230
+#: any.pm:232
#, c-format
msgid "Hostname missing"
msgstr "Masinanimi puudub"
-#: any.pm:231
+#: any.pm:233
#, c-format
msgid "Directory must begin with \"/\""
msgstr "Kataloogi alguses peab olema \"/\""
-#: any.pm:235
+#: any.pm:237
#, c-format
msgid "Hostname of the NFS mount ?"
msgstr "NFS-i andmekandja masinanimi?"
-#: any.pm:236
+#: any.pm:238
#, c-format
msgid "Directory"
msgstr "Kataloog"
-#: any.pm:258
+#: any.pm:260
#, c-format
msgid "Supplementary"
msgstr "Täiendav"
-#: any.pm:293
+#: any.pm:295
#, c-format
msgid ""
"Can't find a package list file on this mirror. Make sure the location is "
@@ -156,22 +131,22 @@ msgstr ""
"Tarkvara nimekirja sisaldava faili leidmine sellelt peeglilt nurjus. "
"Kontrollige palun asukohta."
-#: any.pm:328
+#: any.pm:334
#, c-format
msgid "Looking at packages already installed..."
msgstr "Juba paigaldatud pakettide tuvastamine..."
-#: any.pm:362
+#: any.pm:368
#, c-format
msgid "Finding packages to upgrade..."
msgstr "Uuendatavate pakettide otsimine..."
-#: any.pm:381
+#: any.pm:387
#, c-format
msgid "Removing packages prior to upgrade..."
msgstr "Pakettide eemaldamine enne uuendamist..."
-#: any.pm:402
+#: any.pm:408
#, c-format
msgid ""
"You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -190,18 +165,18 @@ msgstr ""
"käivitage oma süsteem uuesti ja sooritage uuendamine Mandriva uuendusapleti "
"abil."
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
#, c-format
msgid "Reboot"
msgstr "Taaskäivitus"
-#: any.pm:407
+#: any.pm:413
#, c-format
msgid "Proceed"
msgstr "Jätka"
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -214,72 +189,72 @@ msgstr ""
"\n"
"Kas tõesti eemaldada need paketid?\n"
-#: any.pm:815
+#: any.pm:821
#, c-format
msgid "Error reading file %s"
msgstr "Viga faili %s lugemisel"
-#: any.pm:1022
+#: any.pm:1028
#, c-format
msgid "The following disk(s) were renamed:"
msgstr "Järgmistele ketastele anti uus nimi:"
-#: any.pm:1024
+#: any.pm:1030
#, c-format
msgid "%s (previously named as %s)"
msgstr "%s (varem oli %s)"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "HTTP"
msgstr "HTTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "FTP"
msgstr "FTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "NFS"
msgstr "NFS"
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
#, c-format
msgid "Network"
msgstr "Võrk"
-#: any.pm:1104
+#: any.pm:1110
#, c-format
msgid "Please choose a media"
msgstr "Palun valige andmekandja"
-#: any.pm:1120
+#: any.pm:1126
#, c-format
msgid "File already exists. Overwrite it?"
msgstr "Fail on juba olemas. Kas kirjutada see üle?"
-#: any.pm:1124
+#: any.pm:1130
#, c-format
msgid "Permission denied"
msgstr "Ligipääs keelatud"
-#: any.pm:1172
+#: any.pm:1178
#, c-format
msgid "Bad NFS name"
msgstr "Vigane NFS-i nimi"
-#: any.pm:1193
+#: any.pm:1199
#, c-format
msgid "Bad media %s"
msgstr "Vigane andmekandja %s"
-#: any.pm:1236
+#: any.pm:1242
#, c-format
msgid "Can not make screenshots before partitioning"
msgstr "Ekraanipilte ei saa teha enne partitsioneerimist"
-#: any.pm:1244
+#: any.pm:1250
#, c-format
msgid "Screenshots will be available after install in %s"
msgstr "Ekraanipildid asuvad pärast paigaldamist asukohas %s"
@@ -290,11 +265,15 @@ msgid "Installation"
msgstr "Paigaldamine"
#: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
#, c-format
msgid "Configuration"
msgstr "Seadistamine"
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
#: install2.pm:168
#, c-format
msgid "You must also format %s"
@@ -319,22 +298,22 @@ msgstr "Võrgu aktiveerimine"
msgid "Bringing down the network"
msgstr "Võrgu seiskamine"
-#: media.pm:402
+#: media.pm:399
#, c-format
msgid "Please wait, retrieving file"
msgstr "Palun oodake, tõmmatakse faili"
-#: media.pm:734
+#: media.pm:718
#, c-format
-msgid "Downloading file %s..."
-msgstr "Faili %s allalaadimine..."
+msgid "unable to add medium"
+msgstr ""
-#: media.pm:822
+#: media.pm:758
#, c-format
msgid "Copying some packages on disks for future use"
msgstr "Mõningate tarkvarapakettide kopeerimine kettale edasiseks kasutamiseks"
-#: media.pm:875
+#: media.pm:811
#, c-format
msgid "Copying in progress"
msgstr "Käib kopeerimine..."
@@ -378,27 +357,27 @@ msgstr ""
msgid "An error occurred:"
msgstr "Tekkis viga:"
-#: pkgs.pm:776
+#: pkgs.pm:780
#, c-format
msgid "%d installation transactions failed"
msgstr "%d paigaldamistehingut nurjus"
-#: pkgs.pm:777
+#: pkgs.pm:781
#, c-format
msgid "Installation of packages failed:"
msgstr "Pakettide paigaldamine nurjus:"
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
#, c-format
msgid "Workstation"
msgstr "Tööjaam"
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
#, c-format
msgid "Office Workstation"
msgstr "Kontori-tööjaam"
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
#, c-format
msgid ""
"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -407,7 +386,7 @@ msgstr ""
"Kontoritöö programmid: tekstitöötlus (OpenOffice.org Writer, KWord), "
"tabelitöötlus (OpenOffice.org Calc, KSpread), PDF-failide näitajad jne"
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
#, c-format
msgid ""
"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -416,32 +395,32 @@ msgstr ""
"Kontoritöö programmid: tekstitöötlus (KWord, Abiword), tabelitöötlus "
"(KSpread, Gnumeric), PDF-failide näitajad jne"
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
#, c-format
msgid "Game station"
msgstr "Mänguvahend"
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
#, c-format
msgid "Amusement programs: arcade, boards, strategy, etc"
msgstr "Meelelahutus: põnevus-, laua-, strateegiamängud jne"
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
#, c-format
msgid "Multimedia station"
msgstr "Multimeedia-tööjaam"
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
#, c-format
msgid "Sound and video playing/editing programs"
msgstr "Heli ja video mängimine ja redigeerimine"
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
#, c-format
msgid "Internet station"
msgstr "Interneti-tööjaam"
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
#, c-format
msgid ""
"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -450,230 +429,212 @@ msgstr ""
"Valik rakendusi e-posti ja uudiste lugemiseks (mutt, tin...) ning veebi "
"lehitsemiseks"
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
#, c-format
msgid "Network Computer (client)"
msgstr "Võrguarvuti (klient)"
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
#, c-format
msgid "Clients for different protocols including ssh"
msgstr "Mitme protokolli, sealhulgas ssh kliendid"
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
#, c-format
msgid "Tools to ease the configuration of your computer"
msgstr "Tööriistad süsteemi lihtsamaks haldamiseks"
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
#, c-format
msgid "Console Tools"
msgstr "Konsoolitööriistad"
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
#, c-format
msgid "Editors, shells, file tools, terminals"
msgstr "Redaktorid, shellid, terminalid, failihaldus"
#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
#, c-format
msgid "Development"
msgstr "Arendus"
#: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
#, c-format
msgid "C and C++ development libraries, programs and include files"
msgstr "C ja C++ arendusteegid, rakendused ja päisefailid"
#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
#, c-format
msgid "Documentation"
msgstr "Dokumentatsioon"
#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
#, c-format
msgid "Books and Howto's on Linux and Free Software"
msgstr "Raamatud ja HOWTO-d Linuxi ja vabavara kohta"
#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
#, c-format
msgid "LSB"
msgstr "LSB"
#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
#, c-format
msgid "Linux Standard Base. Third party applications support"
msgstr "Linux Standard Base. Kolmandate tootjate rakenduste toetus"
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
#, c-format
msgid "Web Server"
msgstr "Veebiserver"
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
#, c-format
msgid "Apache"
msgstr "Apache"
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
#, c-format
msgid "Groupware"
msgstr "Grupitöö"
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
#, c-format
msgid "Kolab Server"
msgstr "Kolabi server"
#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
#, c-format
msgid "Firewall/Router"
msgstr "Tulemüür/marsruuter"
#: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
#, c-format
msgid "Internet gateway"
msgstr "Internet"
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
#, c-format
msgid "Mail/News"
msgstr "E-post/Uudistegrupid"
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
#, c-format
msgid "Postfix mail server, Inn news server"
msgstr "Postfixi e-posti server, Inn uudisteserver"
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
#, c-format
msgid "Directory Server"
msgstr "Kataloogiserver"
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
#, c-format
msgid "FTP Server"
msgstr "FTP-server"
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
#, c-format
msgid "ProFTPd"
msgstr "ProFTPd"
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
#, c-format
msgid "DNS/NIS"
msgstr "DNS/NIS"
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
#, c-format
msgid "Domain Name and Network Information Server"
msgstr "Nimeserver ja võrguteabeserver"
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
#, c-format
msgid "File and Printer Sharing Server"
msgstr "Faili- ja printserver"
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
#, c-format
msgid "NFS Server, Samba server"
msgstr "NFS-server, Samba-server"
#: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
#, c-format
msgid "Database"
msgstr "Andmebaasid"
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
#, c-format
msgid "PostgreSQL and MySQL Database Server"
msgstr "PostgreSQL- ja MySQL-andmebaasiserver"
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
#, c-format
msgid "Web/FTP"
msgstr "Veeb/FTP"
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
#, c-format
msgid "Apache, Pro-ftpd"
msgstr "Apache ja Pro-ftpd"
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
#, c-format
msgid "Mail"
msgstr "E-post"
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
#, c-format
msgid "Postfix mail server"
msgstr "Postfixi e-posti server"
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
#, c-format
msgid "PostgreSQL or MySQL database server"
msgstr "PostgreSQL- või MySQL-andmebaasiserver"
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
#, c-format
msgid "Network Computer server"
msgstr "Võrguserver"
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
#, c-format
msgid "NFS server, SMB server, Proxy server, ssh server"
msgstr "NFS-, SMB-, SSH-server, puhverserver (proxy)"
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
#, c-format
msgid "Graphical Environment"
msgstr "Graafiline keskkond"
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
#, c-format
msgid "KDE Workstation"
msgstr "KDE tööjaam"
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
#, c-format
msgid ""
"The K Desktop Environment, the basic graphical environment with a collection "
"of accompanying tools"
msgstr "K töölaua keskkond: graafiline töökeskkond ja palju rakendusi"
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
#, c-format
msgid "GNOME Workstation"
msgstr "GNOME tööjaam"
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
#, c-format
msgid ""
"A graphical environment with user-friendly set of applications and desktop "
"tools"
msgstr "Graafiline töökeskkond koos kasutajasõbralike rakendustega"
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
#, c-format
msgid "LXDE Desktop"
msgstr "LXDE töölaud"
@@ -687,54 +648,52 @@ msgstr ""
"Vähese koormusega ja kiire graafiline töökeskkond koos kasutajasõbralike "
"rakenduste ja tööriistadega"
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
#, c-format
msgid "Other Graphical Desktops"
msgstr "Muud graafilised töölauad"
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
#, c-format
msgid "Window Maker, Enlightenment, Fvwm, etc"
msgstr "WindowMaker, Enlightenment, Fvwm jt"
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
#, c-format
msgid "Utilities"
msgstr "Utiliidid"
#: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
#, c-format
msgid "SSH Server"
msgstr "SSH-server"
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
#, c-format
msgid "Webmin"
msgstr "Webmin"
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
#, c-format
msgid "Webmin Remote Configuration Server"
msgstr "Webmin võrguseadistusserver"
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
#, c-format
msgid "Network Utilities/Monitoring"
msgstr "Võrguutiliidid ja võrgu jälgimine"
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
#, c-format
msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
msgstr "Jälgimistööriistad, protsesside jälgimine, tcpdump, nmap..."
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
#, c-format
msgid "Mandriva Wizards"
msgstr "Mandriva nõustajad"
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
#, c-format
msgid "Wizards to configure server"
msgstr "Serverite seadistamise nõustajad"
@@ -832,17 +791,17 @@ msgstr "Siin näeb '%s' töölaua eelvaatlust."
msgid "Click on images in order to see a bigger preview"
msgstr "Klõpsake piltidel suurema eelvaatluse nägemiseks"
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
#, c-format
msgid "Package Group Selection"
msgstr "Paketigruppide valik"
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
#, c-format
msgid "Individual package selection"
msgstr "Valik paketthaaval"
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
#, c-format
msgid "Total size: %d / %d MB"
msgstr "Suurus kokku: %d / %d MB"
@@ -959,12 +918,12 @@ msgstr "Minimaalne paigaldus"
msgid "Software Management"
msgstr "Tarkvarahaldur"
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
#, c-format
msgid "Choose the packages you want to install"
msgstr "Valige paketid, mida soovite paigaldada"
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
#, c-format
msgid "Installing"
msgstr "Paigaldamine"
@@ -991,7 +950,7 @@ msgid_plural "%d packages"
msgstr[0] "%d pakett"
msgstr[1] "%d paketti"
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
#, c-format
msgid "Summary"
msgstr "Kokkuvõte"
@@ -1001,7 +960,7 @@ msgstr "Kokkuvõte"
msgid "Configure"
msgstr "Seadista"
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
#, c-format
msgid "not configured"
msgstr "seadistamata"
@@ -1011,7 +970,7 @@ msgstr "seadistamata"
msgid "Media Selection"
msgstr "Andmekandjate valik"
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
#, c-format
msgid ""
"The following installation media have been found.\n"
@@ -1020,7 +979,7 @@ msgstr ""
"Leiti järgmised paigaldusandmekandjad.\n"
"Kui Te ei soovi mõnda neist kasutada, eemaldage need valikust."
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
#, c-format
msgid ""
"You have the option to copy the contents of the CDs onto the hard drive "
@@ -1032,7 +991,7 @@ msgstr ""
"Seejärel jätkatakse paigaldamist kõvakettalt ning kogu tarkvara on seal "
"kättesaadav ka pärast süsteemi paigaldamist."
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
#, c-format
msgid "Copy whole CDs"
msgstr "Kopeeri kõik CD-d"
@@ -1052,59 +1011,49 @@ msgstr "Palun valige klaviatuuriasetus"
msgid "Here is the full list of available keyboards:"
msgstr "See on saadaolevate klaviatuuriasetuste täielik nimekiri:"
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
#, c-format
msgid "Install/Upgrade"
msgstr "Paigaldamine/Uuendamine"
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
#, c-format
msgid "Is this an install or an upgrade?"
msgstr "Kas see on paigaldamine või uuendamine?"
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
#, c-format
msgid ""
"_: This is a noun:\n"
"Install"
msgstr "Paigaldamine"
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
#, c-format
msgid "Upgrade %s"
msgstr "%s uuendamine"
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr "Uuendamine 32-bitiselt distributsioonilt 64-bitisele ei ole toetatud"
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr "Uuendamine 64-bitiselt distributsioonilt 32-bitisele ei ole toetatud"
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
#, c-format
msgid "Encryption key for %s"
msgstr "%s krüptovõti"
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
#, c-format
msgid "Cancel installation, reboot system"
msgstr "Paigaldamisest loobumine, süsteemi taaskäivitamine"
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
#, c-format
msgid "New Installation"
msgstr "Uus paigaldus"
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
#, c-format
msgid "Upgrade previous installation (not recommended)"
msgstr "Varasema paigalduse uuendamine (ei ole soovitatav)"
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
#, c-format
msgid ""
"Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1123,17 +1072,17 @@ msgstr ""
"Hoiatus: Te peaksite varundama kõik oma isiklikud andmed,\n"
"enne kui valite võimaluse \"Uus paigaldus\"."
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "IDE"
msgstr "IDE"
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "Configuring IDE"
msgstr "IDE seadistamine"
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
#, c-format
msgid ""
"No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1142,7 +1091,7 @@ msgstr ""
"Ruumi 1MB-se alglaadimisala loomiseks napib! Paigaldamine jätkub, kuid "
"süsteemi alglaadimiseks tuleb Teil luua DiskDrake abil alglaadimisala."
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
#, c-format
msgid ""
"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1152,7 +1101,7 @@ msgstr ""
"Teil tuleb luua PPC PReP Boot alglaadimisala! Paigaldamine jätkub, kuid "
"süsteemi alglaadimiseks tuleb Teil luua DiskDrake abil alglaadimisala."
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
#, c-format
msgid ""
"Change your Cd-Rom!\n"
@@ -1165,12 +1114,12 @@ msgstr ""
"Palun sisestage CD nimega \"%s\" CD-seadmesse ja klõpsake nupule \"Olgu\".\n"
"Kui Teil sellist ei ole, klõpsake nupule \"Loobu\"."
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
#, c-format
msgid "Looking for available packages..."
msgstr "Saadaolevate pakettide otsimine..."
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
#, c-format
msgid ""
"Your system does not have enough space left for installation or upgrade (%"
@@ -1178,7 +1127,7 @@ msgid ""
msgstr ""
"Teie süsteemis ei jagu ruumi paigaldamiseks ega uuendamiseks (%dMB > %dMB)"
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
#, c-format
msgid ""
"Please choose load or save package selection.\n"
@@ -1187,52 +1136,52 @@ msgstr ""
"Valige palun paketivaliku laadimine või salvestamine.\n"
"Vorming on sama, mis automaatpaigaldusega loodud failide puhul."
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Load"
msgstr "Laadi"
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Save"
msgstr "Salvesta"
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
#, c-format
msgid "Bad file"
msgstr "Vigane fail"
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
#, c-format
msgid "KDE"
msgstr "KDE"
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
#, c-format
msgid "GNOME"
msgstr "GNOME"
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
#, c-format
msgid "Desktop Selection"
msgstr "Töölaua valik"
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
#, c-format
msgid "You can choose your workstation desktop profile."
msgstr "Siin saab valida oma arvuti töölauaprofiili: "
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
#, c-format
msgid "Selected size is larger than available space"
msgstr "Valiku suurus ületab saadaolevat kettaruumi"
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
#, c-format
msgid "Type of install"
msgstr "Paigaldamise tüüp"
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
#, c-format
msgid ""
"You have not selected any group of packages.\n"
@@ -1241,82 +1190,82 @@ msgstr ""
"Te ei valinud ühtegi paketigruppi.\n"
"Palun valige meelepärane minimaalne paigaldus:"
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
#, c-format
msgid "With X"
msgstr "X'iga"
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
#, c-format
msgid "With basic documentation (recommended!)"
msgstr "Baasdokumentatsiooniga (soovitatav!)"
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
#, c-format
msgid "Truly minimal install (especially no urpmi)"
msgstr "Tõeliselt minimaalne (eriti just ilma urpmi-ta)"
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
#, c-format
msgid "Preparing installation"
msgstr "Paigaldamiseks valmistumine"
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
#, c-format
msgid "Installing package %s"
msgstr "Paketi %s paigaldamine"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "There was an error ordering packages:"
msgstr "Pakettide tellimisel tekkis viga:"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "Go on anyway?"
msgstr "Kas ikkagi jätkata?"
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
#, c-format
msgid "Retry"
msgstr "Proovi uuesti"
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
#, c-format
msgid "Skip this package"
msgstr "Jäta pakett vahele"
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
#, c-format
msgid "Skip all packages from medium \"%s\""
msgstr "Jäta kõik andmekandja \"%s\" paketid vahele"
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
#, c-format
msgid "Go back to media and packages selection"
msgstr "Tagasi andmekandja ja paketivaliku juurde"
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
#, c-format
msgid "There was an error installing package %s."
msgstr "Paketi %s paigaldamisel tekkis viga."
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
#, c-format
msgid "Post-install configuration"
msgstr "Paigaldamisjärgne seadistamine"
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
#, c-format
msgid "Please ensure the Update Modules media is in drive %s"
msgstr "Palun kontrollige, et uuenduste andmekandja on seadmes %s"
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
#, c-format
msgid "Updates"
msgstr "Uuendused"
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
#, c-format
msgid ""
"You now have the opportunity to download updated packages. These packages\n"
@@ -1336,28 +1285,28 @@ msgstr ""
"\n"
"Kas soovite uuendusi paigaldada?"
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
#, c-format
msgid "%s on %s"
msgstr "%s asukohas %s"
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
#, c-format
msgid "Hardware"
msgstr "Riistvara"
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
#, c-format
msgid "Sound card"
msgstr "Helikaart"
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
#, c-format
msgid "Do you have an ISA sound card?"
msgstr "Kas Teil on ISA helikaart?"
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
#, c-format
msgid ""
"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1366,69 +1315,69 @@ msgstr ""
"Helikaardi seadistamiseks käivitage pärast paigaldamist \"alsaconf\" või "
"\"sndconfig\""
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
#, c-format
msgid "No sound card detected. Try \"harddrake\" after installation"
msgstr ""
"Helikaarti ei leitud. Proovige see leida pärast paigaldamist \"harddrake\" "
"abil"
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
#, c-format
msgid "Graphical interface"
msgstr "Graafiline kasutajaliides"
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
#, c-format
msgid "Network & Internet"
msgstr "Kohtvõrk ja internet"
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
#, c-format
msgid "Proxies"
msgstr "Puhverserverid"
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
#, c-format
msgid "configured"
msgstr "seadistatud"
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
#, c-format
msgid "Security Level"
msgstr "Turvatase"
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
#, c-format
msgid "Firewall"
msgstr "Tulemüür"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "activated"
msgstr "aktiveeritud"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "disabled"
msgstr "keelatud"
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
#, c-format
msgid "You have not configured X. Are you sure you really want this?"
msgstr "Te ei ole seadistanud X'i. Kas Te tõesti ei taha seda teha?"
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
#, c-format
msgid "Preparing bootloader..."
msgstr "Alglaaduri ettevalmistamine..."
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
#, c-format
msgid "Be patient, this may take a while..."
msgstr "Varuge kannatust, see võib võtta veidi aega..."
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
#, c-format
msgid ""
"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1441,7 +1390,7 @@ msgstr ""
"tuleb Teil kasutada BootX'i või mingit muud nippi. Kerneli argument "
"juurfailisüsteemi jaoks on root=%s"
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
#, c-format
msgid ""
"In this security level, access to the files in the Windows partition is "
@@ -1450,17 +1399,17 @@ msgstr ""
"Sellel turvatasemel pääseb Windowsi partitsioonil asuvatele failidele ligi "
"ainult administraator."
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr "Pange palun tühi diskett seadmesse %s"
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
#, c-format
msgid "Creating auto install floppy..."
msgstr "Kiirpaigaldusdisketi loomine..."
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
#, c-format
msgid ""
"Some steps are not completed.\n"
@@ -1471,7 +1420,7 @@ msgstr ""
"\n"
"Kas soovite tõesti praegu lõpetada ja väljuda?"
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
#, c-format
msgid "Congratulations"
msgstr "Õnnitleme!"
@@ -1615,6 +1564,32 @@ msgid ""
"Exit"
msgstr "Välju"
+#~ msgid "Your desktop on a USB key"
+#~ msgstr "Kogu töölaud USB-pulgal"
+
+#~ msgid "The 100%% open source Mandriva Linux distribution"
+#~ msgstr "100%% vaba tarkvaraga Mandriva Linuxi distributsioon"
+
+#~ msgid "Explore Linux easily with Mandriva One"
+#~ msgstr "Linuxi hõlpus tundmaõppimine Mandriva One abil"
+
+#~ msgid "A full Mandriva Linux desktop, with support"
+#~ msgstr "Täielik Mandriva Linuxi töölaud koos kasutajatoega"
+
+#~ msgid "Mandriva: distributions for everybody's needs"
+#~ msgstr "Mandriva: distributsioone igale maitsele ja kõigiks vajadusteks"
+
+#~ msgid "Downloading file %s..."
+#~ msgstr "Faili %s allalaadimine..."
+
+#~ msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
+#~ msgstr ""
+#~ "Uuendamine 32-bitiselt distributsioonilt 64-bitisele ei ole toetatud"
+
+#~ msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
+#~ msgstr ""
+#~ "Uuendamine 64-bitiselt distributsioonilt 32-bitisele ei ole toetatud"
+
#~ msgid ""
#~ "You have selected the following server(s): %s\n"
#~ "\n"
diff --git a/perl-install/install/share/po/eu.po b/perl-install/install/share/po/eu.po
index c1a9f7c57..6d3504c7f 100644
--- a/perl-install/install/share/po/eu.po
+++ b/perl-install/install/share/po/eu.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: DrakX\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
"PO-Revision-Date: 2009-03-01 20:15+0100\n"
"Last-Translator: Iñigo Salvador Azurmendi <xalba@euskalnet.net>\n"
"Language-Team: Basque <kde-i18n-doc@lists.kde.org>\n"
@@ -18,31 +18,6 @@ msgstr ""
"X-Generator: Lokalize 0.2\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr "Zure idaztegia USB giltza batean"
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr "100%% iturburu irekia duen Mandriva Linux banaketa"
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr "Esploratu Linux era errazean Mandriva One-kin"
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr "Mandriva Linux idaztegi oso bat, eukarriarekin"
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr "Mandriva: guztientzako beharrak asetzeko banaketak"
-
#: any.pm:109
#, c-format
msgid "Do you have further supplementary media?"
@@ -82,24 +57,25 @@ msgstr "Sarea (FTP)"
msgid "Network (NFS)"
msgstr "Sarea (NFS)"
-#: any.pm:163
+#: any.pm:165
#, c-format
msgid "URL of the mirror?"
msgstr "Ispiluaren URL?"
-#: any.pm:169
+#: any.pm:171
#, c-format
msgid "URL must start with ftp:// or http://"
msgstr "URL-ak ftp:// edo http:// aurretik izan behar du"
-#: any.pm:180
+#: any.pm:182
#, c-format
-msgid "Contacting Mandriva Linux web site to get the list of available mirrors..."
+msgid ""
+"Contacting Mandriva Linux web site to get the list of available mirrors..."
msgstr ""
"Mandriva Linux web gunearekin konektatzen, ispilu erabilgarrien zerrenda "
"lortzeko..."
-#: any.pm:185
+#: any.pm:187
#, c-format
msgid ""
"Failed contacting Mandriva Linux web site to get the list of available "
@@ -108,69 +84,69 @@ msgstr ""
"Mandriva Linux web gunearekin eskuragarri dauden ispiluen zerrenda lortzeko "
"harremanak huts egin du"
-#: any.pm:195
+#: any.pm:197
#, c-format
msgid "Choose a mirror from which to get the packages"
msgstr "Aukeratu ispilu bat paketeak bertatik hartzeko"
-#: any.pm:225
+#: any.pm:227
#, c-format
msgid "NFS setup"
msgstr "NFS ezarpena"
-#: any.pm:226
+#: any.pm:228
#, c-format
msgid "Please enter the hostname and directory of your NFS media"
msgstr "Mesedez sartu zure NFS euskarriaren ostalari izena eta direktorioa"
-#: any.pm:230
+#: any.pm:232
#, c-format
msgid "Hostname missing"
msgstr "Ostalari izena falta da"
-#: any.pm:231
+#: any.pm:233
#, c-format
msgid "Directory must begin with \"/\""
msgstr "Direktorioa honekin \"/\" hasi behar da"
-#: any.pm:235
+#: any.pm:237
#, c-format
msgid "Hostname of the NFS mount ?"
msgstr "NFS muntaiaren ostalari izena?"
-#: any.pm:236
+#: any.pm:238
#, c-format
msgid "Directory"
msgstr "Direktorioa"
-#: any.pm:258
+#: any.pm:260
#, c-format
msgid "Supplementary"
msgstr "Osagarria"
-#: any.pm:293
+#: any.pm:295
#, c-format
msgid ""
"Can't find a package list file on this mirror. Make sure the location is "
"correct."
msgstr "Ezin aurkitu hdlist fitxategia ispilu honetan"
-#: any.pm:328
+#: any.pm:334
#, c-format
msgid "Looking at packages already installed..."
msgstr "Instalatutako paketeak bilatzen..."
-#: any.pm:362
+#: any.pm:368
#, c-format
msgid "Finding packages to upgrade..."
msgstr "Bertsio berritzeko paketeak bilatzen..."
-#: any.pm:381
+#: any.pm:387
#, c-format
msgid "Removing packages prior to upgrade..."
msgstr "Paketeak ezabatzen bertsioa berritu aurretik..."
-#: any.pm:402
+#: any.pm:408
#, c-format
msgid ""
"You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -191,18 +167,18 @@ msgstr ""
"berrabiatu zure sistema eta bertsio berritu Mandrivaren eguneraketa appleta "
"erabiliz."
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
#, c-format
msgid "Reboot"
msgstr "Berrabiarazi"
-#: any.pm:407
+#: any.pm:413
#, c-format
msgid "Proceed"
msgstr "Jarratiu"
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -215,75 +191,76 @@ msgstr ""
"\n"
"Ziur zaude pakete hauek kendu nahi dituzula?\n"
-#: any.pm:815
+#: any.pm:821
#, c-format
msgid "Error reading file %s"
msgstr "Errorea %s fitxategia irakurtzean"
-#: any.pm:1022
+#: any.pm:1028
#, c-format
msgid "The following disk(s) were renamed:"
msgstr "Ondoko diskoa(k) berrizendatu egin d(ir)a:"
-#: any.pm:1024
+#: any.pm:1030
#, c-format
msgid "%s (previously named as %s)"
msgstr "%s (lehenago %s deitua)"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "HTTP"
msgstr "HTTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "FTP"
msgstr "FTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "NFS"
msgstr "NFS"
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
#, c-format
msgid "Network"
msgstr "Sarea"
-#: any.pm:1104
+#: any.pm:1110
#, c-format
msgid "Please choose a media"
msgstr "Aukeratu euskarri bat mesedez"
-#: any.pm:1120
+#: any.pm:1126
#, c-format
msgid "File already exists. Overwrite it?"
msgstr "Fitxategia badago lehendik ere. Gainidatzi?"
-#: any.pm:1124
+#: any.pm:1130
#, c-format
msgid "Permission denied"
msgstr "Baimena ukatuta"
-#: any.pm:1172
+#: any.pm:1178
#, c-format
msgid "Bad NFS name"
msgstr "NFS izen okerra"
-#: any.pm:1193
+#: any.pm:1199
#, c-format
msgid "Bad media %s"
msgstr "%s okerreko euskarria"
-#: any.pm:1236
+#: any.pm:1242
#, c-format
msgid "Can not make screenshots before partitioning"
msgstr "Ezin da pantaila-argazkirik egin partizioak egin aurretik"
-#: any.pm:1244
+#: any.pm:1250
#, c-format
msgid "Screenshots will be available after install in %s"
-msgstr "%s(e)n instalazioa egindakoan pantaila-argazkiak erabilgarri egongo dira"
+msgstr ""
+"%s(e)n instalazioa egindakoan pantaila-argazkiak erabilgarri egongo dira"
#: gtk.pm:130
#, c-format
@@ -291,11 +268,15 @@ msgid "Installation"
msgstr "Instalaketa"
#: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
#, c-format
msgid "Configuration"
msgstr "Konfigurazioa"
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
#: install2.pm:168
#, c-format
msgid "You must also format %s"
@@ -320,22 +301,22 @@ msgstr "Sarea irekitzen"
msgid "Bringing down the network"
msgstr "Sarea ixten"
-#: media.pm:402
+#: media.pm:399
#, c-format
msgid "Please wait, retrieving file"
msgstr "Itxoin mesedez, fitxategia eskuratzen"
-#: media.pm:734
+#: media.pm:718
#, c-format
-msgid "Downloading file %s..."
-msgstr "%s fitxategiak jaisten..."
+msgid "unable to add medium"
+msgstr ""
-#: media.pm:822
+#: media.pm:758
#, c-format
msgid "Copying some packages on disks for future use"
msgstr "Zenbait pakete diskoetan kopiatzen etorkizunean erabiltzeko"
-#: media.pm:875
+#: media.pm:811
#, c-format
msgid "Copying in progress"
msgstr "Kopiatzen ari da"
@@ -379,27 +360,27 @@ msgstr ""
msgid "An error occurred:"
msgstr "Errore bat izan da"
-#: pkgs.pm:776
+#: pkgs.pm:780
#, c-format
msgid "%d installation transactions failed"
msgstr "%d instaketa eragiketek huts egin dute"
-#: pkgs.pm:777
+#: pkgs.pm:781
#, fuzzy, c-format
msgid "Installation of packages failed:"
msgstr "%s paketea instalatzen"
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
#, c-format
msgid "Workstation"
msgstr "Lanpostua"
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
#, c-format
msgid "Office Workstation"
msgstr "Bulegoko lanpostua"
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
#, c-format
msgid ""
"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -408,7 +389,7 @@ msgstr ""
"Bulego programak: testu-prozetzaileak (OpenOffice.org Writer, Kword), "
"kalkulu-orriak (OpenOffice.org Calc, Kspread), PDF ikustaileak, etab"
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
#, c-format
msgid ""
"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -417,32 +398,33 @@ msgstr ""
"Bulego-lanetako programak: testu prozesatzaileak (kword, abiword), kalkulu "
"orriak (kspread, gnumeric), pdf erakusleak, etab."
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
#, c-format
msgid "Game station"
msgstr "Jokoak"
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
#, c-format
msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "Denbora-pasako programak: makina-jokoak, taula-jokoak, estrategiakoak, etab."
+msgstr ""
+"Denbora-pasako programak: makina-jokoak, taula-jokoak, estrategiakoak, etab."
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
#, c-format
msgid "Multimedia station"
msgstr "Multimedia"
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
#, c-format
msgid "Sound and video playing/editing programs"
msgstr "Soinua eta bideoa jotzeko/editatzeko programak"
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
#, c-format
msgid "Internet station"
msgstr "Internet"
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
#, c-format
msgid ""
"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -451,223 +433,206 @@ msgstr ""
"Posta eta berri-taldeetako mezuak (mutt, tin...) irakurtzeko eta bidaltzeko "
"eta Interneten nabigatzeko tresna-multzoa"
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
#, c-format
msgid "Network Computer (client)"
msgstr "Sare-ordenagailua (bezeroa)"
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
#, c-format
msgid "Clients for different protocols including ssh"
msgstr "Hainbat protokolotako bezeroak, ssh-renak barne"
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
#, c-format
msgid "Tools to ease the configuration of your computer"
msgstr "Zure ordenagailuaren konfigurazioa errazteko tresnak"
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
#, c-format
msgid "Console Tools"
msgstr "Kontsola-tresnak"
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
#, c-format
msgid "Editors, shells, file tools, terminals"
msgstr "Editoreak, shell-ak, fitxategi-tresnak, terminalak"
#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
#, c-format
msgid "Development"
msgstr "Garapena"
#: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
#, c-format
msgid "C and C++ development libraries, programs and include files"
msgstr "C eta C++ garapen-liburutegiak, programak eta fitxategiak"
#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
#, c-format
msgid "Documentation"
msgstr "Dokumentazioa"
#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
#, c-format
msgid "Books and Howto's on Linux and Free Software"
msgstr "Linux eta Software libreari buruzko liburuak eta azalpenak"
#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
#, c-format
msgid "LSB"
msgstr "LSB"
#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
#, c-format
msgid "Linux Standard Base. Third party applications support"
msgstr "Linux Standard Base. Beste batzuek egindako aplikazioen euskarria"
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
#, c-format
msgid "Web Server"
msgstr "Web zerbitzaria"
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
#, c-format
msgid "Apache"
msgstr "Apache"
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
#, c-format
msgid "Groupware"
msgstr "Taldelanerako Aplikazioak"
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
#, c-format
msgid "Kolab Server"
msgstr "Kolab Zerbitzaria"
#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
#, c-format
msgid "Firewall/Router"
msgstr "Suebakia/Bideratzailea"
#: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
#, c-format
msgid "Internet gateway"
msgstr "Interneteko atebidea"
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
#, c-format
msgid "Mail/News"
msgstr "Posta/Berriak"
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
#, c-format
msgid "Postfix mail server, Inn news server"
msgstr "Postfix posta zerbitzaria, Inn berri zerbitzaria"
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
#, c-format
msgid "Directory Server"
msgstr "Direktorio Zerbitzara"
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
#, c-format
msgid "FTP Server"
msgstr "FTP Zerbitzaria"
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
#, c-format
msgid "ProFTPd"
msgstr "ProFTPd"
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
#, c-format
msgid "DNS/NIS"
msgstr "DNS/NIS"
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
#, c-format
msgid "Domain Name and Network Information Server"
msgstr "Domeinu Izen eta Sare Informazio Zerbitzaria"
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
#, c-format
msgid "File and Printer Sharing Server"
msgstr "Fitxategi eta Inprimaketa Elkarbanatzeko Zerbitzaria"
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
#, c-format
msgid "NFS Server, Samba server"
msgstr "NFS zerbitzaria, Samba zerbitzaria"
#: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
#, c-format
msgid "Database"
msgstr "Datu-basea"
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
#, c-format
msgid "PostgreSQL and MySQL Database Server"
msgstr "PostgreSQL eta MySQL Datubase Zerbitzaria"
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
#, c-format
msgid "Web/FTP"
msgstr "Web/FTP"
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
#, c-format
msgid "Apache, Pro-ftpd"
msgstr "Apache, Pro-ftpd"
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
#, c-format
msgid "Mail"
msgstr "Posta"
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
#, c-format
msgid "Postfix mail server"
msgstr "Postfix posta-zerbitzaria"
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
#, c-format
msgid "PostgreSQL or MySQL database server"
msgstr "PostgreSQL edo MySQL datu-baseen zerbitzaria"
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
#, c-format
msgid "Network Computer server"
msgstr "Sare-zerbitzaria"
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
#, c-format
msgid "NFS server, SMB server, Proxy server, ssh server"
msgstr "NFS zerbitzaria, SMB zerbitzaria, Proxy zerbitzaria, ssh zerbitzaria"
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
#, c-format
msgid "Graphical Environment"
msgstr "Ingurune grafikoa"
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
#, c-format
msgid "KDE Workstation"
msgstr "KDE lanpostua"
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
#, c-format
msgid ""
"The K Desktop Environment, the basic graphical environment with a collection "
"of accompanying tools"
-msgstr "K Desktop Environment, hainbat tresna dituen oinarrizko ingurune grafikoa"
+msgstr ""
+"K Desktop Environment, hainbat tresna dituen oinarrizko ingurune grafikoa"
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
#, c-format
msgid "GNOME Workstation"
msgstr "GNOME lanpostua"
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
#, c-format
msgid ""
"A graphical environment with user-friendly set of applications and desktop "
@@ -676,7 +641,7 @@ msgstr ""
"Aplikazio-multzo eta mahaigaineko tresna lagungarri eta atseginak dituen "
"ingurune grafikoa"
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
#, c-format
msgid "LXDE Desktop"
msgstr "LXDE Idaztegia"
@@ -690,54 +655,52 @@ msgstr ""
"Aplikazio-multzo eta mahaigaineko tresna lagungarri eta atseginak dituen "
"ingurune grafikoa"
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
#, c-format
msgid "Other Graphical Desktops"
msgstr "Beste mahaigain grafiko batzuk"
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
#, c-format
msgid "Window Maker, Enlightenment, Fvwm, etc"
msgstr "Window Maker, Enlightenment, Fvwm, etab."
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
#, c-format
msgid "Utilities"
msgstr "Utilitateak"
#: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
#, c-format
msgid "SSH Server"
msgstr "SSH zerbitzaria"
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
#, c-format
msgid "Webmin"
msgstr "Webmin"
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
#, c-format
msgid "Webmin Remote Configuration Server"
msgstr "Webmin Urruneko Konfigurazio Zerbitzaria"
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
#, c-format
msgid "Network Utilities/Monitoring"
msgstr "Sare Utilitateak/Gainbegiraketa"
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
#, c-format
msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
msgstr "Gainbegiraketa tresnak, prozesuen kotabilitatea, tcpdump, nmap, ..."
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
#, c-format
msgid "Mandriva Wizards"
msgstr "Mandriva Morroiak"
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
#, c-format
msgid "Wizards to configure server"
msgstr "Zerbitzaria konfiguratzeko morroiak"
@@ -836,17 +799,17 @@ msgstr "Hemen duzu '%s' idaztegiaren aurrebista bat."
msgid "Click on images in order to see a bigger preview"
msgstr "Klikatu irudietan aurrebista haundiago ikusteko"
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
#, c-format
msgid "Package Group Selection"
msgstr "Pakete-taldearen hautapena"
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
#, c-format
msgid "Individual package selection"
msgstr "Pakete indibidualen hautapena"
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
#, c-format
msgid "Total size: %d / %d MB"
msgstr "Guztizko tamaina: %d / %d MB"
@@ -963,12 +926,12 @@ msgstr "Gutxieneko instalazioa"
msgid "Software Management"
msgstr "Software kudeaketa"
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
#, c-format
msgid "Choose the packages you want to install"
msgstr "Aukeratu instalatu nahi dituzun paketeak"
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
#, c-format
msgid "Installing"
msgstr "Instalatzen"
@@ -995,7 +958,7 @@ msgid_plural "%d packages"
msgstr[0] "pakete %d"
msgstr[1] "%d pakete"
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
#, c-format
msgid "Summary"
msgstr "Laburpena"
@@ -1005,7 +968,7 @@ msgstr "Laburpena"
msgid "Configure"
msgstr "Konfiguratu"
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
#, c-format
msgid "not configured"
msgstr "konfiguratu gabe"
@@ -1015,7 +978,7 @@ msgstr "konfiguratu gabe"
msgid "Media Selection"
msgstr "Euskarri hautaketa"
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
#, c-format
msgid ""
"The following installation media have been found.\n"
@@ -1024,7 +987,7 @@ msgstr ""
"Ondorengo instalazio euskarriak aurkitu dira.\n"
"Horietako batzuk erabiltzerik nahi ez baduzu, haututik kendu ditzakezu orain."
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
#, c-format
msgid ""
"You have the option to copy the contents of the CDs onto the hard drive "
@@ -1036,7 +999,7 @@ msgstr ""
"Disko zurrunetik jarraituko du orduan eta paketeak eskuragarri egongo dira "
"sistema osorik instalatu ondoren."
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
#, c-format
msgid "Copy whole CDs"
msgstr "Kopiatu CD osoak"
@@ -1056,59 +1019,49 @@ msgstr "Aukeratu zure teklatu-diseinua"
msgid "Here is the full list of available keyboards:"
msgstr "Hemen duzu eskuragarri dauden teklatuen zerrenda osoa:"
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
#, c-format
msgid "Install/Upgrade"
msgstr "Instalaketa/Bertsio berritzea"
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
#, c-format
msgid "Is this an install or an upgrade?"
msgstr "Instalaketa edo bertsio berritzea da hau?"
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
#, c-format
msgid ""
"_: This is a noun:\n"
"Install"
msgstr "Instalaketa"
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
#, c-format
msgid "Upgrade %s"
msgstr "%s bertsio berritu"
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr "32bit-eko banaketa batetik 64bit-ekora bertsio berritzea ez da onartzen"
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr "64bit-eko banaketa batetik 32bit-ekora bertsio berritzea ez da onartzen"
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
#, c-format
msgid "Encryption key for %s"
msgstr "%s(r)en enkriptatze-gakoa"
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
#, c-format
msgid "Cancel installation, reboot system"
msgstr "Instalaketa galarazi, sistema berrabiatu"
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
#, c-format
msgid "New Installation"
msgstr "Instalaketa berria"
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
#, c-format
msgid "Upgrade previous installation (not recommended)"
msgstr "Aurreko instalaketa bertsio berritu (ez da gomendatzen)"
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
#, c-format
msgid ""
"Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1127,17 +1080,17 @@ msgstr ""
"Erne: zure datu pertsonalen babeskopia egin behar zenuke \"Instalaketa\n"
"Berria\" aukeratu aurretik\"."
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "IDE"
msgstr "IDE"
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "Configuring IDE"
msgstr "IDE konfiguratzen"
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
#, c-format
msgid ""
"No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1147,7 +1100,7 @@ msgstr ""
"baina sistema abiarazteko, bootstrap partizioa sortu beharko duzu DiskDrake-"
"rekin"
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
#, c-format
msgid ""
"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1158,7 +1111,7 @@ msgstr ""
"jarraituko du, baino zure sistema abiarazteko, bootstrap partizioa sortu "
"beharko duzu DiskDrake erabiliz"
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
#, c-format
msgid ""
"Change your Cd-Rom!\n"
@@ -1172,12 +1125,12 @@ msgstr ""
"'Ados'.\n"
"Ez badaukazu, sakatu 'Utzi' CD-ROM horretatik instalazioa egin ez dezan."
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
#, c-format
msgid "Looking for available packages..."
msgstr "Pakete erabilgarriak bilatzen..."
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
#, c-format
msgid ""
"Your system does not have enough space left for installation or upgrade (%"
@@ -1186,7 +1139,7 @@ msgstr ""
"Zure sistemak ez dauka instalatu edo bertsio berritzeko behar duen lekua (%d "
"MB > %d MB)"
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
#, c-format
msgid ""
"Please choose load or save package selection.\n"
@@ -1195,52 +1148,52 @@ msgstr ""
"Mesedez aukeratu pakete aukeraketa zamatu edo gorde.\n"
"Formatua instalazio automatikoarekin sortutako fitxategiaren berdina da."
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Load"
msgstr "Karga"
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Save"
msgstr "Gorde"
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
#, c-format
msgid "Bad file"
msgstr "Okerreko fitxategia"
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
#, c-format
msgid "KDE"
msgstr "KDE"
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
#, c-format
msgid "GNOME"
msgstr "GNOME"
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
#, c-format
msgid "Desktop Selection"
msgstr "Idaztegi hautaketa"
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
#, c-format
msgid "You can choose your workstation desktop profile."
msgstr "Zure lanpostuaren idaztegi profila hautatu dezakezu."
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
#, c-format
msgid "Selected size is larger than available space"
msgstr "Hautatutako tamaina handiagoa da leku erabilgarria baino"
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
#, c-format
msgid "Type of install"
msgstr "Instalazio-mota"
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
#, c-format
msgid ""
"You have not selected any group of packages.\n"
@@ -1249,82 +1202,82 @@ msgstr ""
"Ez duzu talde edo paketerik hautatuta\n"
"Nahi duzun gutxieneko instalazioa hautatu behar duzu:"
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
#, c-format
msgid "With X"
msgstr "Xrekin"
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
#, c-format
msgid "With basic documentation (recommended!)"
msgstr "Oinarrizko dokumentazioarekin (gomendatua)"
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
#, c-format
msgid "Truly minimal install (especially no urpmi)"
msgstr "Instalazio minimo-minimoa (batez ere, urpmi gabe)"
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
#, c-format
msgid "Preparing installation"
msgstr "Instalazioa prestatzen"
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
#, c-format
msgid "Installing package %s"
msgstr "%s paketea instalatzen"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "There was an error ordering packages:"
msgstr "Errore bat izan da paketeak ordenatzean:"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "Go on anyway?"
msgstr "Jarraitu hala ere?"
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
#, c-format
msgid "Retry"
msgstr "Berriro saiatu"
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
#, c-format
msgid "Skip this package"
msgstr "Pakete hau utzi"
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
#, c-format
msgid "Skip all packages from medium \"%s\""
msgstr "\"%s\" euskarriko pakete guztiak utzi"
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
#, c-format
msgid "Go back to media and packages selection"
msgstr "Jo atzera euskarri eta pakete hautapenera"
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
#, c-format
msgid "There was an error installing package %s."
msgstr "Akatsa gertatu da %s paketea instalatzerakoan."
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
#, c-format
msgid "Post-install configuration"
msgstr "Instalazio-ondorengo konfigurazioa"
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
#, c-format
msgid "Please ensure the Update Modules media is in drive %s"
msgstr "Mesedez egiaztatu Moduluak Eguneratzeko euskarria %s unitatean dagoela"
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
#, c-format
msgid "Updates"
msgstr "Eguneraketak"
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
#, c-format
msgid ""
"You now have the opportunity to download updated packages. These packages\n"
@@ -1345,28 +1298,28 @@ msgstr ""
"\n"
"Eguneratzeak instalatu nahi dituzu?"
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
#, c-format
msgid "%s on %s"
msgstr "%s - %s"
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
#, c-format
msgid "Hardware"
msgstr "Hardwarea"
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
#, c-format
msgid "Sound card"
msgstr "Soinu-txartela"
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
#, c-format
msgid "Do you have an ISA sound card?"
msgstr "ISA soinu-txartela duzu?"
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
#, c-format
msgid ""
"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1375,69 +1328,69 @@ msgstr ""
"Instalazioa egindakoan, exekutatu \"alsaconf\" edo \"sndconfig\" soinu-"
"txartela konfiguratzeko"
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
#, c-format
msgid "No sound card detected. Try \"harddrake\" after installation"
msgstr ""
"Ez da detektatu soinu-txartelik. Probatu \"harddrake\" instalazioa egin "
"ondoren"
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
#, c-format
msgid "Graphical interface"
msgstr "Interfaze grafikoa"
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
#, c-format
msgid "Network & Internet"
msgstr "Sarea eta Internet"
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
#, c-format
msgid "Proxies"
msgstr "Proxy-ak"
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
#, c-format
msgid "configured"
msgstr "konfiguratuta"
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
#, c-format
msgid "Security Level"
msgstr "Segurtasun-maila"
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
#, c-format
msgid "Firewall"
msgstr "Suebakia"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "activated"
msgstr "aktibatuta"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "disabled"
msgstr "desgaituta"
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
#, c-format
msgid "You have not configured X. Are you sure you really want this?"
msgstr "X ez duzu konfiguratu. Ziur zaude hori dela egin nahi duzuna?"
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
#, c-format
msgid "Preparing bootloader..."
msgstr "Abioko kargatzailea prestatzen..."
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
#, c-format
msgid "Be patient, this may take a while..."
msgstr "Pazientzia izan, pixka baterako dauka..."
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
#, c-format
msgid ""
"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1450,7 +1403,7 @@ msgstr ""
"abiatzeko beste bide bat erabili beharko duzu zure makina abiarazteko. Erro "
"fitxategi sistemarentzako nukleo argumentua honakoa da: root=%s"
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
#, c-format
msgid ""
"In this security level, access to the files in the Windows partition is "
@@ -1459,17 +1412,17 @@ msgstr ""
"Segurtasun-maila honetan, administratzaileak soilik du Windows partizioko "
"fitxategiak atzitzeko eskubidea."
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr "Sartu diskete huts bat %s unitatean"
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
#, c-format
msgid "Creating auto install floppy..."
msgstr "Auto-instalazioko disketea sortzen..."
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
#, c-format
msgid ""
"Some steps are not completed.\n"
@@ -1480,7 +1433,7 @@ msgstr ""
"\n"
"Ziur zaude orain irten nahi duzula?"
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
#, c-format
msgid "Congratulations"
msgstr "Zorionak"
@@ -1624,6 +1577,32 @@ msgid ""
"Exit"
msgstr "Irten"
+#~ msgid "Your desktop on a USB key"
+#~ msgstr "Zure idaztegia USB giltza batean"
+
+#~ msgid "The 100%% open source Mandriva Linux distribution"
+#~ msgstr "100%% iturburu irekia duen Mandriva Linux banaketa"
+
+#~ msgid "Explore Linux easily with Mandriva One"
+#~ msgstr "Esploratu Linux era errazean Mandriva One-kin"
+
+#~ msgid "A full Mandriva Linux desktop, with support"
+#~ msgstr "Mandriva Linux idaztegi oso bat, eukarriarekin"
+
+#~ msgid "Mandriva: distributions for everybody's needs"
+#~ msgstr "Mandriva: guztientzako beharrak asetzeko banaketak"
+
+#~ msgid "Downloading file %s..."
+#~ msgstr "%s fitxategiak jaisten..."
+
+#~ msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
+#~ msgstr ""
+#~ "32bit-eko banaketa batetik 64bit-ekora bertsio berritzea ez da onartzen"
+
+#~ msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
+#~ msgstr ""
+#~ "64bit-eko banaketa batetik 32bit-ekora bertsio berritzea ez da onartzen"
+
#~ msgid ""
#~ "You have selected the following server(s): %s\n"
#~ "\n"
@@ -1650,4 +1629,3 @@ msgstr "Irten"
#~ msgid "IceWm Desktop"
#~ msgstr "IceWm Idaztegia"
-
diff --git a/perl-install/install/share/po/fa.po b/perl-install/install/share/po/fa.po
index 7f90fb466..d8b057330 100644
--- a/perl-install/install/share/po/fa.po
+++ b/perl-install/install/share/po/fa.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: DrakX-fa\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
"PO-Revision-Date: 2005-02-26 06:31+0100\n"
"Last-Translator: Abbas Izad <abbasizad@hotmail.com>\n"
"Language-Team: Persian\n"
@@ -16,31 +16,6 @@ msgstr ""
"X-Generator: KBabel 1.3.1\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr ""
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr ""
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr ""
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr ""
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr ""
-
#: any.pm:109
#, c-format
msgid "Do you have further supplementary media?"
@@ -76,17 +51,17 @@ msgstr "شبکه (FTP)"
msgid "Network (NFS)"
msgstr ""
-#: any.pm:163
+#: any.pm:165
#, c-format
msgid "URL of the mirror?"
msgstr "نشانی اینترنتی آینه؟"
-#: any.pm:169
+#: any.pm:171
#, c-format
msgid "URL must start with ftp:// or http://"
msgstr ""
-#: any.pm:180
+#: any.pm:182
#, c-format
msgid ""
"Contacting Mandriva Linux web site to get the list of available mirrors..."
@@ -94,7 +69,7 @@ msgstr ""
"در حال تماس گرفتن با وب‌گاه لینوکس ماندریبا برای دریافت لیست پایگاه‌های "
"آینه‌های موجود..."
-#: any.pm:185
+#: any.pm:187
#, fuzzy, c-format
msgid ""
"Failed contacting Mandriva Linux web site to get the list of available "
@@ -103,69 +78,69 @@ msgstr ""
"در حال تماس گرفتن با وب‌گاه لینوکس ماندریبا برای دریافت لیست پایگاه‌های "
"آینه‌های موجود..."
-#: any.pm:195
+#: any.pm:197
#, c-format
msgid "Choose a mirror from which to get the packages"
msgstr "انتخاب آینه‌ای برای گرفتن بسته‌ها"
-#: any.pm:225
+#: any.pm:227
#, c-format
msgid "NFS setup"
msgstr ""
-#: any.pm:226
+#: any.pm:228
#, c-format
msgid "Please enter the hostname and directory of your NFS media"
msgstr ""
-#: any.pm:230
+#: any.pm:232
#, c-format
msgid "Hostname missing"
msgstr ""
-#: any.pm:231
+#: any.pm:233
#, c-format
msgid "Directory must begin with \"/\""
msgstr ""
-#: any.pm:235
+#: any.pm:237
#, c-format
msgid "Hostname of the NFS mount ?"
msgstr ""
-#: any.pm:236
+#: any.pm:238
#, c-format
msgid "Directory"
msgstr "شاخه"
-#: any.pm:258
+#: any.pm:260
#, c-format
msgid "Supplementary"
msgstr ""
-#: any.pm:293
+#: any.pm:295
#, c-format
msgid ""
"Can't find a package list file on this mirror. Make sure the location is "
"correct."
msgstr "نمیتوان پرونده hdlist را بر این آینه پیدا کرد"
-#: any.pm:328
+#: any.pm:334
#, c-format
msgid "Looking at packages already installed..."
msgstr "بررسی بسته‌های از قبل نصب شده..."
-#: any.pm:362
+#: any.pm:368
#, c-format
msgid "Finding packages to upgrade..."
msgstr "یافتن بسته‌های برای ارتقاء..."
-#: any.pm:381
+#: any.pm:387
#, c-format
msgid "Removing packages prior to upgrade..."
msgstr ""
-#: any.pm:402
+#: any.pm:408
#, c-format
msgid ""
"You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -177,18 +152,18 @@ msgid ""
"please reboot your system and upgrade using the Mandriva update applet."
msgstr ""
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
#, c-format
msgid "Reboot"
msgstr "آغازگری مجدد"
-#: any.pm:407
+#: any.pm:413
#, c-format
msgid "Proceed"
msgstr ""
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -201,72 +176,72 @@ msgstr ""
"\n"
"آیا واقعاً می‌خواهید این بسته‌ها را بردارید؟\n"
-#: any.pm:815
+#: any.pm:821
#, c-format
msgid "Error reading file %s"
msgstr "خطا در خواندن پرونده‌ی %s"
-#: any.pm:1022
+#: any.pm:1028
#, c-format
msgid "The following disk(s) were renamed:"
msgstr "دیسک(های) بدنبال تغییر نام داده شده‌اند:"
-#: any.pm:1024
+#: any.pm:1030
#, c-format
msgid "%s (previously named as %s)"
msgstr "%s (قبلا نامش %s بود("
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "HTTP"
msgstr "HTTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "FTP"
msgstr "FTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "NFS"
msgstr "NFS"
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
#, c-format
msgid "Network"
msgstr "شبکه"
-#: any.pm:1104
+#: any.pm:1110
#, c-format
msgid "Please choose a media"
msgstr "لطفاً رسانه‌ای را انتخاب کنید"
-#: any.pm:1120
+#: any.pm:1126
#, c-format
msgid "File already exists. Overwrite it?"
msgstr "پرونده از قبل وجود دارد. بازنویسی شود؟"
-#: any.pm:1124
+#: any.pm:1130
#, c-format
msgid "Permission denied"
msgstr "اجازه داده نشد"
-#: any.pm:1172
+#: any.pm:1178
#, c-format
msgid "Bad NFS name"
msgstr ""
-#: any.pm:1193
+#: any.pm:1199
#, c-format
msgid "Bad media %s"
msgstr "رسانه بد %s"
-#: any.pm:1236
+#: any.pm:1242
#, c-format
msgid "Can not make screenshots before partitioning"
msgstr "نمی‌توان قبل از قسمت‌بندی عکس‌صفحه گرفت"
-#: any.pm:1244
+#: any.pm:1250
#, c-format
msgid "Screenshots will be available after install in %s"
msgstr "عکس‌صفحه‌ها بعد از نصب در %s در دسترس خواهند بود"
@@ -277,11 +252,15 @@ msgid "Installation"
msgstr "نصب کردن"
#: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
#, c-format
msgid "Configuration"
msgstr "پیکربندی"
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
#: install2.pm:168
#, c-format
msgid "You must also format %s"
@@ -306,22 +285,22 @@ msgstr "بالا آوردن شبکه"
msgid "Bringing down the network"
msgstr "پایین آوردن شبکه"
-#: media.pm:402
+#: media.pm:399
#, c-format
msgid "Please wait, retrieving file"
msgstr ""
-#: media.pm:734
-#, fuzzy, c-format
-msgid "Downloading file %s..."
-msgstr "فرستادن پرونده‌ها..."
+#: media.pm:718
+#, c-format
+msgid "unable to add medium"
+msgstr ""
-#: media.pm:822
+#: media.pm:758
#, c-format
msgid "Copying some packages on disks for future use"
msgstr ""
-#: media.pm:875
+#: media.pm:811
#, c-format
msgid "Copying in progress"
msgstr "کپی کردن در حال انجام است"
@@ -363,27 +342,27 @@ msgstr ""
msgid "An error occurred:"
msgstr "خطائی رخ داد"
-#: pkgs.pm:776
+#: pkgs.pm:780
#, fuzzy, c-format
msgid "%d installation transactions failed"
msgstr "نصب شکست خورد"
-#: pkgs.pm:777
+#: pkgs.pm:781
#, fuzzy, c-format
msgid "Installation of packages failed:"
msgstr "نصب کردن بسته‌ی %s"
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
#, c-format
msgid "Workstation"
msgstr "ایستگاه‌کار"
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
#, c-format
msgid "Office Workstation"
msgstr "ایستگاه‌کار دفتری"
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
#, c-format
msgid ""
"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -392,7 +371,7 @@ msgstr ""
"برنامه های دفتری: واژه پردازان (OpenOffice.org Writer, Kword), spreadsheets "
"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
#, c-format
msgid ""
"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -401,262 +380,244 @@ msgstr ""
"برنامه‌های دفتری: واژه پردازها ((kword, abiword), برگ‌های حساب (kspread, "
"gnumeric), نماگرهای pdf و غیره"
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
#, c-format
msgid "Game station"
msgstr "ایستگاه بازی"
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
#, c-format
msgid "Amusement programs: arcade, boards, strategy, etc"
msgstr "برنامه‌های سرگرمی: آرکید، تخته‌ها، تاکتیکی، غیره"
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
#, c-format
msgid "Multimedia station"
msgstr "ایستگاه چندرسانه‌ای"
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
#, c-format
msgid "Sound and video playing/editing programs"
msgstr "برنامه‌های ویرایش/پخش ویدیو و صوت"
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
#, c-format
msgid "Internet station"
msgstr "ایستگاه اینترنت"
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
#, c-format
msgid ""
"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
"Web"
msgstr "مجموعه ابزار خواندن و ارسال پست و اخبار (mutt, tin..) و برای مرور وب"
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
#, c-format
msgid "Network Computer (client)"
msgstr "رایانه‌ی شبکه (کارگیر)"
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
#, c-format
msgid "Clients for different protocols including ssh"
msgstr "کارگیرها برای پایان‌نامه‌های گوناگون از جمله ssh"
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
#, c-format
msgid "Tools to ease the configuration of your computer"
msgstr "ابزارهای برای آسان‌ کردن پیکربندی رایانه‌اتان"
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
#, c-format
msgid "Console Tools"
msgstr "ابزارهای کنسول"
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
#, c-format
msgid "Editors, shells, file tools, terminals"
msgstr "ویرایش‌گرها، پوسته‌ها، ابزار پرونده، پایانه‌ها"
#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
#, c-format
msgid "Development"
msgstr "برنامه‌سازی"
#: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
#, c-format
msgid "C and C++ development libraries, programs and include files"
msgstr "کتابخانه‌های برنامه‌سازی C و C++، برنامه‌ها و پرونده‌های شامل"
#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
#, c-format
msgid "Documentation"
msgstr "نوشتار"
#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
#, c-format
msgid "Books and Howto's on Linux and Free Software"
msgstr "کتاب‌ها و چگونگی‌ها در لینوکس و نرم‌افزار آزاد"
#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
#, c-format
msgid "LSB"
msgstr "LSB"
#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
#, c-format
msgid "Linux Standard Base. Third party applications support"
msgstr "پایه‌ی استاندارد لینوکس. حمایت برنامه‌های شخص سوم"
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
#, c-format
msgid "Web Server"
msgstr "کارگزار‌ وب"
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
#, c-format
msgid "Apache"
msgstr "آپاچ"
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
#, c-format
msgid "Groupware"
msgstr "گروه افزار"
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
#, c-format
msgid "Kolab Server"
msgstr "کارگزار Kolab"
#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
#, c-format
msgid "Firewall/Router"
msgstr "دیوار‌آتش/مسیریاب"
#: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
#, c-format
msgid "Internet gateway"
msgstr "دروازه‌ی اینترنت"
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
#, c-format
msgid "Mail/News"
msgstr "پست/اخبار"
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
#, c-format
msgid "Postfix mail server, Inn news server"
msgstr "کارگزار پست Postfix، کارگزار اخبار Inn "
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
#, c-format
msgid "Directory Server"
msgstr "کارگزار شاخه"
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
#, c-format
msgid "FTP Server"
msgstr "کارگزار FTP"
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
#, c-format
msgid "ProFTPd"
msgstr "ProFTPd"
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
#, c-format
msgid "DNS/NIS"
msgstr "DNS/NIS"
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
#, c-format
msgid "Domain Name and Network Information Server"
msgstr "نام دامنه و کارگزار اطلاعات شبکه"
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
#, c-format
msgid "File and Printer Sharing Server"
msgstr "کارگزاراشتراک چاپگر و پرونده"
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
#, c-format
msgid "NFS Server, Samba server"
msgstr "کارگزار NFS، کارگزار Samba"
#: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
#, c-format
msgid "Database"
msgstr "بانک ‌اطلاعات"
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
#, c-format
msgid "PostgreSQL and MySQL Database Server"
msgstr "کارگزار پایگاه داده‌ی PostgreSQL و MySQL "
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
#, c-format
msgid "Web/FTP"
msgstr "Web/FTP"
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
#, c-format
msgid "Apache, Pro-ftpd"
msgstr "Apache, Pro-ftpd"
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
#, c-format
msgid "Mail"
msgstr "پست"
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
#, c-format
msgid "Postfix mail server"
msgstr "کارگزار پست Postfix "
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
#, c-format
msgid "PostgreSQL or MySQL database server"
msgstr "کارگزار بانک اطلاعاتی PostgreSQL یا MySQL "
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
#, c-format
msgid "Network Computer server"
msgstr "کارگزار شبکه‌ی رایانه"
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
#, c-format
msgid "NFS server, SMB server, Proxy server, ssh server"
msgstr "کارگزار NFS , کارگزار SMB , کارگزار Proxy , کارگزار ssh "
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
#, c-format
msgid "Graphical Environment"
msgstr "محیط گرافیکی"
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
#, c-format
msgid "KDE Workstation"
msgstr "ایستگاه‌کار KDE "
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
#, c-format
msgid ""
"The K Desktop Environment, the basic graphical environment with a collection "
"of accompanying tools"
msgstr "محیط رومیزی K، محیط گرافیکی پایه با مجموعه‌ای از ابزارهای ضمیمه"
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
#, c-format
msgid "GNOME Workstation"
msgstr "ایستگاه‌کار گنوم"
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
#, c-format
msgid ""
"A graphical environment with user-friendly set of applications and desktop "
"tools"
msgstr "محیط گرافیکی کاربر-دوستانه با مجموعه‌ای از برنامه‌ها و ابزارهای رومیزی"
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
#, fuzzy, c-format
msgid "LXDE Desktop"
msgstr "رومیزی Plucker"
@@ -668,54 +629,52 @@ msgid ""
"applications and desktop tools"
msgstr "محیط گرافیکی کاربر-دوستانه با مجموعه‌ای از برنامه‌ها و ابزارهای رومیزی"
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
#, c-format
msgid "Other Graphical Desktops"
msgstr "دیگر رومیزی‌های گرافیکی"
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
#, fuzzy, c-format
msgid "Window Maker, Enlightenment, Fvwm, etc"
msgstr "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
#, c-format
msgid "Utilities"
msgstr "وسایل"
#: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
#, c-format
msgid "SSH Server"
msgstr "کارگزار‌ SSH"
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
#, c-format
msgid "Webmin"
msgstr "Webmin"
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
#, c-format
msgid "Webmin Remote Configuration Server"
msgstr "کارگزار پیکربندی از راه دور Webmin "
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
#, c-format
msgid "Network Utilities/Monitoring"
msgstr "پایشگری/وسایل شبکه"
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
#, c-format
msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
msgstr "ابزار پایشگری، پروسه های حسابداری، tcpdump, nmap, ..."
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
#, c-format
msgid "Mandriva Wizards"
msgstr "جادوگران نرم افزار ماندریبا"
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
#, c-format
msgid "Wizards to configure server"
msgstr "جادوگران برای پیکربندی کارگزار"
@@ -816,17 +775,17 @@ msgstr ""
msgid "Click on images in order to see a bigger preview"
msgstr ""
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
#, c-format
msgid "Package Group Selection"
msgstr "گزینش گروه بسته"
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
#, c-format
msgid "Individual package selection"
msgstr "انتخاب بسته‌ی تکی"
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
#, c-format
msgid "Total size: %d / %d MB"
msgstr "اندازه‌ی کل: %d / %d مگابایت"
@@ -945,12 +904,12 @@ msgstr "نصب حداقل"
msgid "Software Management"
msgstr "مدیریت نرم‌افزار"
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
#, c-format
msgid "Choose the packages you want to install"
msgstr "بسته‌هایی را که می‌خواهید نصب کنید انتخاب کنید"
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
#, c-format
msgid "Installing"
msgstr "نصب کردن"
@@ -976,7 +935,7 @@ msgid "%d package"
msgid_plural "%d packages"
msgstr[0] "بسته‌های %d"
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
#, c-format
msgid "Summary"
msgstr "خلاصه"
@@ -986,7 +945,7 @@ msgstr "خلاصه"
msgid "Configure"
msgstr "پیکربندی"
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
#, c-format
msgid "not configured"
msgstr "پیکربندی نشده است"
@@ -996,7 +955,7 @@ msgstr "پیکربندی نشده است"
msgid "Media Selection"
msgstr "گزینش گروه بسته"
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
#, c-format
msgid ""
"The following installation media have been found.\n"
@@ -1005,7 +964,7 @@ msgstr ""
"رسانه نصب بدنبال آمده یافت شد.\n"
"اگر میخواهید بعضی از آنها را نادیده بگیرید میتوانید آنها را اکنون نگزینید."
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
#, c-format
msgid ""
"You have the option to copy the contents of the CDs onto the hard drive "
@@ -1017,7 +976,7 @@ msgstr ""
"سپس آن از دیسک سخت ادامه یافته و بسته‌ها وقتی که سیستم کاملا نصب گردید در "
"دسترس خواهند بود."
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
#, c-format
msgid "Copy whole CDs"
msgstr "کپی کردن تمام سی‌دی‌ها"
@@ -1037,59 +996,49 @@ msgstr "لطفاً طرح صفحه‌کلید خود را انتخاب کنید"
msgid "Here is the full list of available keyboards:"
msgstr "این لیست کامل صفحه‌کلیدهای در دسترس می‌باشد"
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
#, c-format
msgid "Install/Upgrade"
msgstr "نصب/ارتقاء"
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
#, c-format
msgid "Is this an install or an upgrade?"
msgstr "آیا این یک نصب است یا یک ارتقاء؟"
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
#, fuzzy, c-format
msgid ""
"_: This is a noun:\n"
"Install"
msgstr "نصب"
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
#, c-format
msgid "Upgrade %s"
msgstr "ارتقاء دادن %s"
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
#, c-format
msgid "Encryption key for %s"
msgstr "کلید رمزی برای %s"
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
#, c-format
msgid "Cancel installation, reboot system"
msgstr ""
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
#, fuzzy, c-format
msgid "New Installation"
msgstr "نصب کردن"
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
#, c-format
msgid "Upgrade previous installation (not recommended)"
msgstr ""
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
#, c-format
msgid ""
"Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1101,17 +1050,17 @@ msgid ""
"Installation\"."
msgstr ""
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "IDE"
msgstr "IDE"
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "Configuring IDE"
msgstr "پیکربندی IDE"
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
#, c-format
msgid ""
"No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1120,7 +1069,7 @@ msgstr ""
"هیچ فضای آزادی برای ۱ مگابایت تسمه‌ی آغازگری ! نصب ادامه پیدا خواهد کرد، ولی "
"باید قسمت‌بندی تسمه آغازگری را در DiskDrake ایجاد کنید"
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
#, c-format
msgid ""
"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1130,7 +1079,7 @@ msgstr ""
"شما نیاز به ایجاد یک تسمه‌ی آغازگری PPC PReP دارید! نصب ادامه پیدا خواهد کرد، "
"ولی باید قسمت‌بندی تسمه آغازگری را در DiskDrake ایجاد کنید"
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
#, c-format
msgid ""
"Change your Cd-Rom!\n"
@@ -1143,19 +1092,19 @@ msgstr ""
"فشار دهید. \n"
"اگر آن را ندارید، لغو را برای جلوگیری از نصب این سی‌دی-رم فشار دهید."
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
#, c-format
msgid "Looking for available packages..."
msgstr "جستجو برای بسته‌های موجود..."
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
#, c-format
msgid ""
"Your system does not have enough space left for installation or upgrade (%"
"dMB > %dMB)"
msgstr ""
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
#, c-format
msgid ""
"Please choose load or save package selection.\n"
@@ -1164,52 +1113,52 @@ msgstr ""
"لطفاً بارگذاری یا ذخیره‌ی مجموعه بسته را انتخاب کنید.\n"
"قالب همانند پرونده‌های تولید شده‌ی نصب-خودکار است."
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Load"
msgstr "بارگذاری"
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Save"
msgstr "ذخیره"
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
#, c-format
msgid "Bad file"
msgstr "پرونده بد"
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
#, fuzzy, c-format
msgid "KDE"
msgstr "IDE"
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
#, c-format
msgid "GNOME"
msgstr "گنوم"
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
#, fuzzy, c-format
msgid "Desktop Selection"
msgstr "گزینش گروه بسته"
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
#, c-format
msgid "You can choose your workstation desktop profile."
msgstr ""
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
#, c-format
msgid "Selected size is larger than available space"
msgstr "اندازه‌های انتخاب شده بزرگ‌تر از فضای موجود است"
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
#, c-format
msgid "Type of install"
msgstr "نوع نصب"
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
#, c-format
msgid ""
"You have not selected any group of packages.\n"
@@ -1218,82 +1167,82 @@ msgstr ""
"هیچ گروه از بسته‌ها را انتخاب نکرده‌اید.\n"
"لطفاً حداقل نصبی را که می‌خواهید انتخاب کنید:"
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
#, c-format
msgid "With X"
msgstr "با X"
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
#, c-format
msgid "With basic documentation (recommended!)"
msgstr "با نوشتارهای پایه (سفارش می‌شود!)"
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
#, c-format
msgid "Truly minimal install (especially no urpmi)"
msgstr "حقیقتاً حداقل نصب (مخصوصاً بدون urpmi)"
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
#, c-format
msgid "Preparing installation"
msgstr "آماده کردن نصب"
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
#, c-format
msgid "Installing package %s"
msgstr "نصب کردن بسته‌ی %s"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "There was an error ordering packages:"
msgstr "خطائی در مرتب کردن بسته‌ها رخ داد:"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "Go on anyway?"
msgstr "ادامه به هر حال؟"
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
#, c-format
msgid "Retry"
msgstr ""
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
#, c-format
msgid "Skip this package"
msgstr ""
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
#, c-format
msgid "Skip all packages from medium \"%s\""
msgstr ""
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
#, fuzzy, c-format
msgid "Go back to media and packages selection"
msgstr "ذخیره‌ی مجموعه بسته‌ها"
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
#, fuzzy, c-format
msgid "There was an error installing package %s."
msgstr "خطائی هنگام نصب بسته‌ها وجود داشت:"
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
#, c-format
msgid "Post-install configuration"
msgstr "پیکربندی بعد از نصب"
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
#, c-format
msgid "Please ensure the Update Modules media is in drive %s"
msgstr ""
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
#, c-format
msgid "Updates"
msgstr "بروزسازی‌ها"
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
#, c-format
msgid ""
"You now have the opportunity to download updated packages. These packages\n"
@@ -1313,28 +1262,28 @@ msgstr ""
"\n"
"آیا می‌خواهید بروزسازی‌ها را نصب کنید؟"
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
#, c-format
msgid "%s on %s"
msgstr "%s بر %s"
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
#, c-format
msgid "Hardware"
msgstr "سخت‌افزار"
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
#, c-format
msgid "Sound card"
msgstr "کارت صوتی"
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
#, c-format
msgid "Do you have an ISA sound card?"
msgstr "آیا کارت صوتی ISA دارید؟"
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
#, c-format
msgid ""
"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1343,67 +1292,67 @@ msgstr ""
"برای پیکربندی کارت صوتی خود بعد از نصب برنامه‌ی \"sndconfig\" یا \"alsaconf"
"\" را اجرا کنید"
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
#, c-format
msgid "No sound card detected. Try \"harddrake\" after installation"
msgstr "هیچ کارت صوتی شناسایی نشد. \"harddrake\" را بعد از نصب امتحان کنید"
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
#, c-format
msgid "Graphical interface"
msgstr "واسط گرافیکی"
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
#, c-format
msgid "Network & Internet"
msgstr "شبکه و اینترنت"
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
#, c-format
msgid "Proxies"
msgstr "پراکسی‌ها"
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
#, c-format
msgid "configured"
msgstr "پیکربندی شده"
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
#, c-format
msgid "Security Level"
msgstr "سطح امنیتی"
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
#, c-format
msgid "Firewall"
msgstr "دیوارآتش"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "activated"
msgstr "فعال شده"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "disabled"
msgstr "از کار افتاده"
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
#, c-format
msgid "You have not configured X. Are you sure you really want this?"
msgstr "شما ایکس را پیکربندی نکرده‌اید. آیا واقعاً مطمئنید که این را می‌خواهید؟"
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
#, c-format
msgid "Preparing bootloader..."
msgstr "آماده کردن بارگذار آغازگر..."
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
#, c-format
msgid "Be patient, this may take a while..."
msgstr ""
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
#, c-format
msgid ""
"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1417,7 +1366,7 @@ msgstr ""
"از BootX یا طریق دیگری برای آغازگری استفاده کنید. آرگومان هسته برای سیستم "
"پرونده ریشه: root=%s"
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
#, c-format
msgid ""
"In this security level, access to the files in the Windows partition is "
@@ -1425,17 +1374,17 @@ msgid ""
msgstr ""
"در این سطح امنیتی، دستیابی به پرونده‌های قسمت‌بندی ویندوز محدود به مدیر است."
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr "یک دیسکچه‌ی خالی را در گرداننده‌ی %s داخل کنید"
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
#, c-format
msgid "Creating auto install floppy..."
msgstr "ایجاد کردن دیسکچه‌ی نصب خودکار..."
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
#, c-format
msgid ""
"Some steps are not completed.\n"
@@ -1446,7 +1395,7 @@ msgstr ""
"\n"
"واقعاً می‌خواهید اکنون ترک کنید؟"
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
#, c-format
msgid "Congratulations"
msgstr "تبریک می‌گوئیم!"
@@ -1590,6 +1539,10 @@ msgid ""
"Exit"
msgstr "خروج"
+#, fuzzy
+#~ msgid "Downloading file %s..."
+#~ msgstr "فرستادن پرونده‌ها..."
+
#~ msgid ""
#~ "You have selected the following server(s): %s\n"
#~ "\n"
diff --git a/perl-install/install/share/po/fi.po b/perl-install/install/share/po/fi.po
index 70125b53c..f4bfc278a 100644
--- a/perl-install/install/share/po/fi.po
+++ b/perl-install/install/share/po/fi.po
@@ -14,7 +14,7 @@ msgid ""
msgstr ""
"Project-Id-Version: DrakX-fi\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
"PO-Revision-Date: 2008-10-02 21:39+0300\n"
"Last-Translator: Thomas Backlund <tmb@mandriva.org>\n"
"Language-Team: Finnish <fi@li.org>\n"
@@ -24,31 +24,6 @@ msgstr ""
"X-Generator: KBabel 1.11.4\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr "Työpöytäsi USB-tikulla"
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr "100%% vapaan lähdekoodin Mandriva Linux -jakelu"
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr "Tutustu Linuxiin helposti Mandriva Onella"
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr "Täysi Mandriva Linux -jakelu käyttäjätuella"
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr "Mandriva: jakeluja jokaisen tarpeisiin"
-
#: any.pm:109
#, c-format
msgid "Do you have further supplementary media?"
@@ -88,24 +63,24 @@ msgstr "Verkko (FTP)"
msgid "Network (NFS)"
msgstr "Verkko (NFS)"
-#: any.pm:163
+#: any.pm:165
#, c-format
msgid "URL of the mirror?"
msgstr "Peilipalvelimen URL?"
-#: any.pm:169
+#: any.pm:171
#, c-format
msgid "URL must start with ftp:// or http://"
msgstr "URL pitää alkaa ftp:// tai http://"
-#: any.pm:180
+#: any.pm:182
#, c-format
msgid ""
"Contacting Mandriva Linux web site to get the list of available mirrors..."
msgstr ""
"Otetaan yhteys Mandriva Linuxin sivustolle peilipalvelinlistan saamiseksi..."
-#: any.pm:185
+#: any.pm:187
#, c-format
msgid ""
"Failed contacting Mandriva Linux web site to get the list of available "
@@ -114,69 +89,69 @@ msgstr ""
"Yhteydenotto Mandriva Linuxin sivustolle peilipalvelinlistan saamiseksi "
"epäonnistui"
-#: any.pm:195
+#: any.pm:197
#, c-format
msgid "Choose a mirror from which to get the packages"
msgstr "Valitse peilipalvelin josta paketit haetaan"
-#: any.pm:225
+#: any.pm:227
#, c-format
msgid "NFS setup"
msgstr "NFS Asetus"
-#: any.pm:226
+#: any.pm:228
#, c-format
msgid "Please enter the hostname and directory of your NFS media"
msgstr "Syötä NFS-palvelimesi nimi ja hakemistopolku"
-#: any.pm:230
+#: any.pm:232
#, c-format
msgid "Hostname missing"
msgstr "Palvelimen osoite puuttuu"
-#: any.pm:231
+#: any.pm:233
#, c-format
msgid "Directory must begin with \"/\""
msgstr "Hakemistopolun täytyy alkaa \"/\"-merkillä"
-#: any.pm:235
+#: any.pm:237
#, c-format
msgid "Hostname of the NFS mount ?"
msgstr "NFS-liitoksen palvelimen nimi?"
-#: any.pm:236
+#: any.pm:238
#, c-format
msgid "Directory"
msgstr "Kansio"
-#: any.pm:258
+#: any.pm:260
#, c-format
msgid "Supplementary"
msgstr "Lisämedia"
-#: any.pm:293
+#: any.pm:295
#, c-format
msgid ""
"Can't find a package list file on this mirror. Make sure the location is "
"correct."
msgstr "En löydä hdlist tiedostoa tässä peilipalvelimessa."
-#: any.pm:328
+#: any.pm:334
#, c-format
msgid "Looking at packages already installed..."
msgstr "Etsitään jo asennettuja paketteja..."
-#: any.pm:362
+#: any.pm:368
#, c-format
msgid "Finding packages to upgrade..."
msgstr "Etsitään päivitettäviä paketteja..."
-#: any.pm:381
+#: any.pm:387
#, c-format
msgid "Removing packages prior to upgrade..."
msgstr "Poistetaan paketteja ennen päivitystä..."
-#: any.pm:402
+#: any.pm:408
#, c-format
msgid ""
"You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -195,18 +170,18 @@ msgstr ""
"asetuksesi, ole hyvä ja käynnistä tietokoneesi uudelleen ja päivitä\n"
"järjestelmäsi käyttäen MandrivaUpdate."
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
#, c-format
msgid "Reboot"
msgstr "Käynnistä uudelleen"
-#: any.pm:407
+#: any.pm:413
#, c-format
msgid "Proceed"
msgstr ""
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -219,72 +194,72 @@ msgstr ""
"\n"
"Haluatko varmasti poistaa nämä paketit?\n"
-#: any.pm:815
+#: any.pm:821
#, c-format
msgid "Error reading file %s"
msgstr "Virhe lukiessa tiedostoa %s"
-#: any.pm:1022
+#: any.pm:1028
#, c-format
msgid "The following disk(s) were renamed:"
msgstr "Seuraava(t) levy(t) uudelleennimettiin:"
-#: any.pm:1024
+#: any.pm:1030
#, c-format
msgid "%s (previously named as %s)"
msgstr "%s (oli ennen nimetty %s)"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "HTTP"
msgstr "HTTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "FTP"
msgstr "FTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "NFS"
msgstr "NFS"
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
#, c-format
msgid "Network"
msgstr "Verkko"
-#: any.pm:1104
+#: any.pm:1110
#, c-format
msgid "Please choose a media"
msgstr "Ole hyvä ja valitse media"
-#: any.pm:1120
+#: any.pm:1126
#, c-format
msgid "File already exists. Overwrite it?"
msgstr "Tiedosto jo olemassa. Korvaa?"
-#: any.pm:1124
+#: any.pm:1130
#, c-format
msgid "Permission denied"
msgstr "Ei oikeuksia"
-#: any.pm:1172
+#: any.pm:1178
#, c-format
msgid "Bad NFS name"
msgstr "Virheellinen NFS-nimi"
-#: any.pm:1193
+#: any.pm:1199
#, c-format
msgid "Bad media %s"
msgstr "Huono media %s"
-#: any.pm:1236
+#: any.pm:1242
#, c-format
msgid "Can not make screenshots before partitioning"
msgstr "Kuvakaappauksia ei voida tehdä ennen osiointia"
-#: any.pm:1244
+#: any.pm:1250
#, c-format
msgid "Screenshots will be available after install in %s"
msgstr "Kuvakaappaukset löytyvät asennuksen jälkeen hakemistosta %s"
@@ -295,11 +270,15 @@ msgid "Installation"
msgstr "Asennus"
#: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
#, c-format
msgid "Configuration"
msgstr "Asetustyökalut"
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
#: install2.pm:168
#, c-format
msgid "You must also format %s"
@@ -324,22 +303,22 @@ msgstr "Käynnistetään verkkoa"
msgid "Bringing down the network"
msgstr "Ajetaan alas verkkoa"
-#: media.pm:402
+#: media.pm:399
#, c-format
msgid "Please wait, retrieving file"
msgstr "Odota hetki, tiedostoa haetaan"
-#: media.pm:734
+#: media.pm:718
#, c-format
-msgid "Downloading file %s..."
-msgstr "Haetaan tiedosto %s ..."
+msgid "unable to add medium"
+msgstr ""
-#: media.pm:822
+#: media.pm:758
#, c-format
msgid "Copying some packages on disks for future use"
msgstr "Kopioin paketteja kovalevylle myöhempään käyttöön"
-#: media.pm:875
+#: media.pm:811
#, c-format
msgid "Copying in progress"
msgstr "Kopiointi käynnissä"
@@ -383,27 +362,27 @@ msgstr ""
msgid "An error occurred:"
msgstr "Ilmeni virhe"
-#: pkgs.pm:776
+#: pkgs.pm:780
#, c-format
msgid "%d installation transactions failed"
msgstr "%d asennustapahtumaa epäonnistui"
-#: pkgs.pm:777
+#: pkgs.pm:781
#, fuzzy, c-format
msgid "Installation of packages failed:"
msgstr "Asennetaan pakettia: %s"
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
#, c-format
msgid "Workstation"
msgstr "Työasema"
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
#, c-format
msgid "Office Workstation"
msgstr "Toimistotyöasema"
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
#, c-format
msgid ""
"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -412,7 +391,7 @@ msgstr ""
"Toimisto-ohjelmistot: tekstinkäsittely (OpenOffice.org Writer, Kword), "
"taulukkolaskenta (OpenOffice.org calc, Kspread), PDF-lukijat jne"
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
#, c-format
msgid ""
"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -421,32 +400,32 @@ msgstr ""
"Toimisto-ohjelmistot: tekstinkäsittely (kword, abiword), taulukkolaskenta "
"(kspread, gnumeric), pdf-lukijat jne"
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
#, c-format
msgid "Game station"
msgstr "Peliasema"
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
#, c-format
msgid "Amusement programs: arcade, boards, strategy, etc"
msgstr "Viihdeohjelmat: tasohyppely, korttipelit, strategia jne"
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
#, c-format
msgid "Multimedia station"
msgstr "Multimediatyöasema"
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
#, c-format
msgid "Sound and video playing/editing programs"
msgstr "Äänen sekä videon toisto- ja editointiohjelmat"
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
#, c-format
msgid "Internet station"
msgstr "Internettyöasema"
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
#, c-format
msgid ""
"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -455,213 +434,195 @@ msgstr ""
"Valikoima työkaluja sähköpostin ja uutisryhmien lukemiseen (mutt, tin...) "
"sekä Internetin selailuun"
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
#, c-format
msgid "Network Computer (client)"
msgstr "Verkkopääte (asiakas)"
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
#, c-format
msgid "Clients for different protocols including ssh"
msgstr "Asiakasohjelmat eri protokollille (SSH jne)"
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
#, c-format
msgid "Tools to ease the configuration of your computer"
msgstr "Työkalut, jotka helpottavat tietokoneesi asetusten muokkaamista"
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
#, c-format
msgid "Console Tools"
msgstr "Komentorivityökalut"
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
#, c-format
msgid "Editors, shells, file tools, terminals"
msgstr "Editorit, komentotulkit, tiedostotyökalut, päätteet"
#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
#, c-format
msgid "Development"
msgstr "Kehitysympäristö"
#: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
#, c-format
msgid "C and C++ development libraries, programs and include files"
msgstr "C ja C++ kehityskirjastot, ohjelmat ja include-tiedostot"
#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
#, c-format
msgid "Documentation"
msgstr "Dokumentaatio"
#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
#, c-format
msgid "Books and Howto's on Linux and Free Software"
msgstr "Kirjoja ja ohjeita Linuxista sekä vapaan lähdekoodin ohjelmista"
#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
#, c-format
msgid "LSB"
msgstr "LSB"
#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
#, c-format
msgid "Linux Standard Base. Third party applications support"
msgstr ""
"Linux Standard Base (Linux Standardi Perusta)\n"
" - Kolmannen osapuolen ohjelmistojen tuki"
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
#, c-format
msgid "Web Server"
msgstr "WWW-palvelin"
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
#, c-format
msgid "Apache"
msgstr "Apache"
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
#, c-format
msgid "Groupware"
msgstr "Groupware"
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
#, c-format
msgid "Kolab Server"
msgstr "Kolab palvelin"
#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
#, c-format
msgid "Firewall/Router"
msgstr "Palomuuri / Reititin"
#: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
#, c-format
msgid "Internet gateway"
msgstr "Internetin yhdyskäytävä"
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
#, c-format
msgid "Mail/News"
msgstr "Posti/Uutiset"
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
#, c-format
msgid "Postfix mail server, Inn news server"
msgstr "Postfix sähköpostipalvelin, Inn uutispalvelin"
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
#, c-format
msgid "Directory Server"
msgstr "Hakemisto-palvelin"
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
#, c-format
msgid "FTP Server"
msgstr "FTP-palvelin"
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
#, c-format
msgid "ProFTPd"
msgstr "ProFTPd"
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
#, c-format
msgid "DNS/NIS"
msgstr "DNS/NIS"
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
#, c-format
msgid "Domain Name and Network Information Server"
msgstr "Verkkoalueen nimipalvelin (DNS) ja verkon informaatio-palvelin"
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
#, c-format
msgid "File and Printer Sharing Server"
msgstr "Tiedosto- ja Tulostuspalvelin"
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
#, c-format
msgid "NFS Server, Samba server"
msgstr "NFS-palvelin, Samba-palvelin"
#: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
#, c-format
msgid "Database"
msgstr "Tietokanta"
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
#, c-format
msgid "PostgreSQL and MySQL Database Server"
msgstr "PostgreSQL ja MySQL tietokantapalvelin"
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
#, c-format
msgid "Web/FTP"
msgstr "Web/FTP"
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
#, c-format
msgid "Apache, Pro-ftpd"
msgstr "Apache WWW-palvelin ja Pro-ftpd FTP-palvelin"
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
#, c-format
msgid "Mail"
msgstr "Sähköposti"
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
#, c-format
msgid "Postfix mail server"
msgstr "Postfix sähköpostipalvelin"
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
#, c-format
msgid "PostgreSQL or MySQL database server"
msgstr "PostgreSQL tai MySQL tietokantapalvelin"
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
#, c-format
msgid "Network Computer server"
msgstr "Verkkotietokone (palvelin)"
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
#, c-format
msgid "NFS server, SMB server, Proxy server, ssh server"
msgstr "NFS-, SMB-, välitys- ja SSH-palvelin"
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
#, c-format
msgid "Graphical Environment"
msgstr "Graafinen ympäristö"
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
#, c-format
msgid "KDE Workstation"
msgstr "KDE-työasema"
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
#, c-format
msgid ""
"The K Desktop Environment, the basic graphical environment with a collection "
@@ -669,12 +630,12 @@ msgid ""
msgstr ""
"K-työpöytäympäristö. Graafinen perusympäristö ja sen mukana tulevat työkalut"
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
#, c-format
msgid "GNOME Workstation"
msgstr "GNOME-työasema"
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
#, c-format
msgid ""
"A graphical environment with user-friendly set of applications and desktop "
@@ -682,7 +643,7 @@ msgid ""
msgstr ""
"Graafinen ympäristö käyttäjäystävällisellä sovelluksilla ja työkaluilla."
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
#, fuzzy, c-format
msgid "LXDE Desktop"
msgstr "KDE Työpöytä"
@@ -695,54 +656,52 @@ msgid ""
msgstr ""
"Graafinen ympäristö käyttäjäystävällisellä sovelluksilla ja työkaluilla."
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
#, c-format
msgid "Other Graphical Desktops"
msgstr "Muut graafiset käyttöympäristöt"
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
#, c-format
msgid "Window Maker, Enlightenment, Fvwm, etc"
msgstr "Window Maker, Enlightenment, FVWM jne"
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
#, c-format
msgid "Utilities"
msgstr "Työkalut"
#: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
#, c-format
msgid "SSH Server"
msgstr "SSH-palvelin"
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
#, c-format
msgid "Webmin"
msgstr "Webmin"
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
#, c-format
msgid "Webmin Remote Configuration Server"
msgstr "Webmin Etäasetuspalvelin"
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
#, c-format
msgid "Network Utilities/Monitoring"
msgstr "Verkkotyökalut/Valvonta"
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
#, c-format
msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
msgstr "Valvontatyökalut, prosessihallinta, tcpdump, nmap, ..."
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
#, c-format
msgid "Mandriva Wizards"
msgstr "Mandriva Velhoja"
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
#, c-format
msgid "Wizards to configure server"
msgstr "Velhoja palvelimen asettamiseksi"
@@ -843,18 +802,18 @@ msgstr "Työpöydän '%s' esikatselu."
msgid "Click on images in order to see a bigger preview"
msgstr "Napsauta kuvia nähdäksesi suuremman esikatselun."
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
#, c-format
msgid "Package Group Selection"
msgstr "Pakettiryhmien valinta"
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
#, c-format
msgid "Individual package selection"
msgstr "Yksittäisten pakettien valinta"
# mat
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
#, c-format
msgid "Total size: %d / %d MB"
msgstr "Koko yhteensä: %d / %d Mt"
@@ -975,12 +934,12 @@ msgstr "Minimaalinen asennus"
msgid "Software Management"
msgstr "Ohjelmistohallinta"
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
#, c-format
msgid "Choose the packages you want to install"
msgstr "Valitse asennettavat paketit"
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
#, c-format
msgid "Installing"
msgstr "Asennetaan"
@@ -1008,7 +967,7 @@ msgstr[0] "%d paketti"
msgstr[1] "%d pakettia"
# Asennuksen sivuvalikko
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
#, c-format
msgid "Summary"
msgstr "Yhteenveto"
@@ -1018,7 +977,7 @@ msgstr "Yhteenveto"
msgid "Configure"
msgstr "Aseta"
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
#, c-format
msgid "not configured"
msgstr "ei asetettu"
@@ -1028,7 +987,7 @@ msgstr "ei asetettu"
msgid "Media Selection"
msgstr "Lähteiden valinta"
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
#, c-format
msgid ""
"The following installation media have been found.\n"
@@ -1037,7 +996,7 @@ msgstr ""
"Seuraavar asennusmediat on löydetty.\n"
"Jos haluat ohittaa joku niistä, voit poistaa niiden valinta nyt."
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
#, c-format
msgid ""
"You have the option to copy the contents of the CDs onto the hard drive "
@@ -1050,7 +1009,7 @@ msgstr ""
"Asennus jatkaa sen jälkeen kovalevyltä ja paketit ovat käytettävissä myös "
"asennuksen jälkeen."
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
#, c-format
msgid "Copy whole CDs"
msgstr "Kopioi koko CD"
@@ -1070,61 +1029,49 @@ msgstr "Valitse näppäimistösi asettelu"
msgid "Here is the full list of available keyboards:"
msgstr "Tässä on koko lista käytettävissä olevista näppäimistöistä:"
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
#, c-format
msgid "Install/Upgrade"
msgstr "Asenna/Päivitä"
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
#, c-format
msgid "Is this an install or an upgrade?"
msgstr "Onko tämä asennus vai päivitys?"
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
#, c-format
msgid ""
"_: This is a noun:\n"
"Install"
msgstr "Asennus"
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
#, c-format
msgid "Upgrade %s"
msgstr "Päivitä %s"
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr ""
-"Päivittäminen 32-bittisestä jakelusta 64-bittiseen jakeluun ei ole tuettu."
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr ""
-"Päivittäminen 64-bittisestä jakelusta 32-bittiseen jakeluun ei ole tuettu."
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
#, c-format
msgid "Encryption key for %s"
msgstr "Salausavain %s:lle"
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
#, c-format
msgid "Cancel installation, reboot system"
msgstr "Peruuta asennus, käynnistä järjestelmä uudelleen"
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
#, c-format
msgid "New Installation"
msgstr "Uusi asennus"
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
#, c-format
msgid "Upgrade previous installation (not recommended)"
msgstr "Päivitä edellinen asennus (ei suositella)"
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
#, c-format
msgid ""
"Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1144,17 +1091,17 @@ msgstr ""
"Varoitus: Varmuuskopioi kaikki omat tiedostosi ennen kuin valitset\n"
"\"Uusi asennus\"."
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "IDE"
msgstr "IDE"
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "Configuring IDE"
msgstr "Asetetaan IDE-levyä"
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
#, c-format
msgid ""
"No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1164,7 +1111,7 @@ msgstr ""
"käynnistääksesi järjestelmän sinun pitää luoda käynnistyslohko-osio "
"DiskDrake:ssa."
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
#, c-format
msgid ""
"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1175,7 +1122,7 @@ msgstr ""
"käynnistääksesi järjestelmän sinun pitää luoda käynnistyslohko-osio "
"DiskDrake:ssa."
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
#, c-format
msgid ""
"Change your Cd-Rom!\n"
@@ -1189,19 +1136,19 @@ msgstr ""
"Jos sinulla ei ole levyä, valitse Peruuta välttääksesi asennukset tältä "
"levyltä."
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
#, c-format
msgid "Looking for available packages..."
msgstr "Etsitään saatavilla olevia paketteja..."
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
#, c-format
msgid ""
"Your system does not have enough space left for installation or upgrade (%"
"dMB > %dMB)"
msgstr "Järjestelmässäsi ei ole riittävästi vapaata tilaa (%dMt > %dMt)"
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
#, c-format
msgid ""
"Please choose load or save package selection.\n"
@@ -1210,52 +1157,52 @@ msgstr ""
"Lataa tai tallenna pakettien valinta.\n"
"Muoto on sama kuin auto_install-toiminnon luomilla tiedostoilla."
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Load"
msgstr "Verkkokuorma"
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Save"
msgstr "Tallenna"
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
#, c-format
msgid "Bad file"
msgstr "Huono tiedosto"
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
#, c-format
msgid "KDE"
msgstr "KDE"
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
#, c-format
msgid "GNOME"
msgstr "GNOME"
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
#, c-format
msgid "Desktop Selection"
msgstr "Työpöydän valinta"
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
#, c-format
msgid "You can choose your workstation desktop profile."
msgstr "Voit valita asennettavan työpöytäprofiilin."
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
#, c-format
msgid "Selected size is larger than available space"
msgstr "Valittu koko on suurempi kuin käytettävissä oleva levytila"
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
#, c-format
msgid "Type of install"
msgstr "Asennuksen tyyppi"
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
#, c-format
msgid ""
"You have not selected any group of packages.\n"
@@ -1264,82 +1211,82 @@ msgstr ""
"Et ole valinnut yhtäkään pakettiryhmää.\n"
"Valitse haluamasi minimaalinen asennus"
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
#, c-format
msgid "With X"
msgstr "X-palvelimella"
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
#, c-format
msgid "With basic documentation (recommended!)"
msgstr "Perusdokumentaation kanssa (suositeltu!)"
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
#, c-format
msgid "Truly minimal install (especially no urpmi)"
msgstr "Vähimmäisasennus (erityisesti ei urpmi)"
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
#, c-format
msgid "Preparing installation"
msgstr "Valmistellaan asennusta"
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
#, c-format
msgid "Installing package %s"
msgstr "Asennetaan pakettia: %s"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "There was an error ordering packages:"
msgstr "Tapahtui virhe järjestettäessä paketteja:"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "Go on anyway?"
msgstr "Jatka kuitenkin?"
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
#, c-format
msgid "Retry"
msgstr "Yritä uudelleen"
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
#, c-format
msgid "Skip this package"
msgstr "Ohita tämä paketti"
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
#, c-format
msgid "Skip all packages from medium \"%s\""
msgstr "Ohita kaikki paketit medialta \"%s\""
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
#, c-format
msgid "Go back to media and packages selection"
msgstr "Siirry takaisin medioiden ja pakettien valintaan"
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
#, c-format
msgid "There was an error installing package %s."
msgstr "Paketin %s asentamisessa tapahtui virhe."
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
#, c-format
msgid "Post-install configuration"
msgstr "Asennuksen jälkeiset toiminnot"
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
#, c-format
msgid "Please ensure the Update Modules media is in drive %s"
msgstr "Varmista että Päivitetyt Moduulit media on asemassa %s"
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
#, c-format
msgid "Updates"
msgstr "Päivitykset"
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
#, c-format
msgid ""
"You now have the opportunity to download updated packages. These packages\n"
@@ -1359,28 +1306,28 @@ msgstr ""
"\n"
"Haluatko hakea ja asentaa päivitykset?"
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
#, c-format
msgid "%s on %s"
msgstr "%s kohteessa %s"
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
#, c-format
msgid "Hardware"
msgstr "Laitteisto"
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
#, c-format
msgid "Sound card"
msgstr "Äänikortti"
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
#, c-format
msgid "Do you have an ISA sound card?"
msgstr "Onko sinulla ISA-väylään liitettävä äänikortti?"
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
#, c-format
msgid ""
"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1389,68 +1336,68 @@ msgstr ""
"Suorita \"alsaconf\" tai \"sndconfig\" asennuksen jälkeen asettaaksesi "
"äänikorttisi."
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
#, c-format
msgid "No sound card detected. Try \"harddrake\" after installation"
msgstr ""
"Yhtäkään äänikorttia ei löydetty. Kokeile \"harddrake\" asennuksen jälkeen"
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
#, c-format
msgid "Graphical interface"
msgstr "Graafinen käyttöliittymä"
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
#, c-format
msgid "Network & Internet"
msgstr "Verkko & Internet"
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
#, c-format
msgid "Proxies"
msgstr "Välityspalvelimet"
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
#, c-format
msgid "configured"
msgstr "asetettu"
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
#, c-format
msgid "Security Level"
msgstr "Turvataso"
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
#, c-format
msgid "Firewall"
msgstr "Palomuuri"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "activated"
msgstr "aktivoitu"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "disabled"
msgstr "ei käytössä"
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
#, c-format
msgid "You have not configured X. Are you sure you really want this?"
msgstr "Et ole asettanut X-palvelinta. Oletko varma että haluat tehdä tämän?"
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
#, c-format
msgid "Preparing bootloader..."
msgstr "Valmistelen käyttöjärjestelmän lataajaa..."
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
#, c-format
msgid "Be patient, this may take a while..."
msgstr ""
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
#, c-format
msgid ""
"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1463,7 +1410,7 @@ msgstr ""
"käyttää BootX:ää koneesi käynnistämiseen. Ytimen paremetrit root "
"tiedostojärjestelmälle on: root=%s"
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
#, c-format
msgid ""
"In this security level, access to the files in the Windows partition is "
@@ -1473,17 +1420,17 @@ msgstr ""
"ylläpitäjälle."
# mat
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr "Aseta tyhjä levyke levykeasemaan %s"
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
#, c-format
msgid "Creating auto install floppy..."
msgstr "Valmistellaan automaattiasennuslevykettä..."
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
#, c-format
msgid ""
"Some steps are not completed.\n"
@@ -1494,7 +1441,7 @@ msgstr ""
"\n"
"Haluatko todella lopettaa?"
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
#, c-format
msgid "Congratulations"
msgstr "Onnittelut"
@@ -1641,6 +1588,32 @@ msgid ""
"Exit"
msgstr "Poistu"
+#~ msgid "Your desktop on a USB key"
+#~ msgstr "Työpöytäsi USB-tikulla"
+
+#~ msgid "The 100%% open source Mandriva Linux distribution"
+#~ msgstr "100%% vapaan lähdekoodin Mandriva Linux -jakelu"
+
+#~ msgid "Explore Linux easily with Mandriva One"
+#~ msgstr "Tutustu Linuxiin helposti Mandriva Onella"
+
+#~ msgid "A full Mandriva Linux desktop, with support"
+#~ msgstr "Täysi Mandriva Linux -jakelu käyttäjätuella"
+
+#~ msgid "Mandriva: distributions for everybody's needs"
+#~ msgstr "Mandriva: jakeluja jokaisen tarpeisiin"
+
+#~ msgid "Downloading file %s..."
+#~ msgstr "Haetaan tiedosto %s ..."
+
+#~ msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
+#~ msgstr ""
+#~ "Päivittäminen 32-bittisestä jakelusta 64-bittiseen jakeluun ei ole tuettu."
+
+#~ msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
+#~ msgstr ""
+#~ "Päivittäminen 64-bittisestä jakelusta 32-bittiseen jakeluun ei ole tuettu."
+
#~ msgid ""
#~ "You have selected the following server(s): %s\n"
#~ "\n"
diff --git a/perl-install/install/share/po/fr.po b/perl-install/install/share/po/fr.po
index d40dac19f..e9a1a9785 100644
--- a/perl-install/install/share/po/fr.po
+++ b/perl-install/install/share/po/fr.po
@@ -74,7 +74,7 @@ msgid ""
msgstr ""
"Project-Id-Version: DrakX-fr\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
"PO-Revision-Date: 2009-03-30 15:52+0200\n"
"Last-Translator: Christophe Berthelé <cpjc@free.fr>\n"
"Language-Team: French <cooker-i18n@mandrivalinux.org>\n"
@@ -84,31 +84,6 @@ msgstr ""
"X-Generator: KBabel 1.11.4\n"
"Plural-Forms: nplurals=2;plural=(n>1);\n"
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr "Votre bureau sur une clé USB"
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr "La distribution Mandriva Linux 100%% libre"
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr "Découvrez Linux facilement grâce à Mandriva One"
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr "Un bureau Mandriva Linux complet, avec support"
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr "Mandriva : les distributions couvrant les besoins de chacun"
-
#: any.pm:109
#, c-format
msgid "Do you have further supplementary media?"
@@ -149,17 +124,17 @@ msgstr "Réseau (FTP)"
msgid "Network (NFS)"
msgstr "Réseau (NFS)"
-#: any.pm:163
+#: any.pm:165
#, c-format
msgid "URL of the mirror?"
msgstr "URL du miroir ?"
-#: any.pm:169
+#: any.pm:171
#, c-format
msgid "URL must start with ftp:// or http://"
msgstr "L'URL doit commencer par ftp:// ou http://"
-#: any.pm:180
+#: any.pm:182
#, c-format
msgid ""
"Contacting Mandriva Linux web site to get the list of available mirrors..."
@@ -167,7 +142,7 @@ msgstr ""
"Connexion au site Web de Mandriva Linux pour obtenir la liste des serveurs "
"miroirs disponibles..."
-#: any.pm:185
+#: any.pm:187
#, c-format
msgid ""
"Failed contacting Mandriva Linux web site to get the list of available "
@@ -176,47 +151,47 @@ msgstr ""
"Echec de la connexion au site web de Mandriva Linux pour obtenir la liste "
"des miroirs disponibles"
-#: any.pm:195
+#: any.pm:197
#, c-format
msgid "Choose a mirror from which to get the packages"
msgstr "Choisissez un serveur miroir d'où télécharger les paquetages"
-#: any.pm:225
+#: any.pm:227
#, c-format
msgid "NFS setup"
msgstr "Configuration NFS"
-#: any.pm:226
+#: any.pm:228
#, c-format
msgid "Please enter the hostname and directory of your NFS media"
msgstr "Veuillez entrer le nom de machine et le répertoire de votre média NFS"
-#: any.pm:230
+#: any.pm:232
#, c-format
msgid "Hostname missing"
msgstr "Le nom d'hôte manque"
-#: any.pm:231
+#: any.pm:233
#, c-format
msgid "Directory must begin with \"/\""
msgstr "Le répertoire doit commencer par « / »"
-#: any.pm:235
+#: any.pm:237
#, c-format
msgid "Hostname of the NFS mount ?"
msgstr "Nom d'hôte du montage NFS ?"
-#: any.pm:236
+#: any.pm:238
#, c-format
msgid "Directory"
msgstr "Répertoire"
-#: any.pm:258
+#: any.pm:260
#, c-format
msgid "Supplementary"
msgstr "Supplémentaire"
-#: any.pm:293
+#: any.pm:295
#, c-format
msgid ""
"Can't find a package list file on this mirror. Make sure the location is "
@@ -225,22 +200,22 @@ msgstr ""
"Ne peut trouver le fichier de liste de paquets sur ce miroir. Vérifiez que "
"l'emplacement est correct."
-#: any.pm:328
+#: any.pm:334
#, c-format
msgid "Looking at packages already installed..."
msgstr "Recherche des paquetages déjà installés..."
-#: any.pm:362
+#: any.pm:368
#, c-format
msgid "Finding packages to upgrade..."
msgstr "Recherche des paquetages à mettre à jour..."
-#: any.pm:381
+#: any.pm:387
#, c-format
msgid "Removing packages prior to upgrade..."
msgstr "Suppression des paquetages avant la mise à jour ..."
-#: any.pm:402
+#: any.pm:408
#, c-format
msgid ""
"You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -262,18 +237,18 @@ msgstr ""
"système et effectuez cette opération via l'appliquette de mise à jour "
"Mandriva."
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
#, c-format
msgid "Reboot"
msgstr "Redémarrage"
-#: any.pm:407
+#: any.pm:413
#, c-format
msgid "Proceed"
msgstr "Poursuivre"
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -287,72 +262,72 @@ msgstr ""
"\n"
"Souhaitez-vous réellement les désinstaller ?\n"
-#: any.pm:815
+#: any.pm:821
#, c-format
msgid "Error reading file %s"
msgstr "Erreur lors de la lecture du fichier %s"
-#: any.pm:1022
+#: any.pm:1028
#, c-format
msgid "The following disk(s) were renamed:"
msgstr "Les disques suivants ont été renommés :"
-#: any.pm:1024
+#: any.pm:1030
#, c-format
msgid "%s (previously named as %s)"
msgstr "%s (précédemment nommé %s)"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "HTTP"
msgstr "HTTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "FTP"
msgstr "FTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "NFS"
msgstr "NFS"
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
#, c-format
msgid "Network"
msgstr "Réseau"
-#: any.pm:1104
+#: any.pm:1110
#, c-format
msgid "Please choose a media"
msgstr "Veuillez choisir un média"
-#: any.pm:1120
+#: any.pm:1126
#, c-format
msgid "File already exists. Overwrite it?"
msgstr "Le fichier existe déjà. Voulez-vous l'écraser ?"
-#: any.pm:1124
+#: any.pm:1130
#, c-format
msgid "Permission denied"
msgstr "Permission refusée"
-#: any.pm:1172
+#: any.pm:1178
#, c-format
msgid "Bad NFS name"
msgstr "Mauvais nom NFS"
-#: any.pm:1193
+#: any.pm:1199
#, c-format
msgid "Bad media %s"
msgstr "Média %s incorrect"
-#: any.pm:1236
+#: any.pm:1242
#, c-format
msgid "Can not make screenshots before partitioning"
msgstr "Impossible de faire des captures d'écran avant le partitionnement"
-#: any.pm:1244
+#: any.pm:1250
#, c-format
msgid "Screenshots will be available after install in %s"
msgstr "Les captures d'écran seront disponibles après l'installation dans %s"
@@ -363,11 +338,15 @@ msgid "Installation"
msgstr "Installation"
#: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
#, c-format
msgid "Configuration"
msgstr "Configuration"
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
#: install2.pm:168
#, c-format
msgid "You must also format %s"
@@ -393,23 +372,23 @@ msgstr "Démarrage de l'interface réseau..."
msgid "Bringing down the network"
msgstr "Arrêt de l'interface réseau..."
-#: media.pm:402
+#: media.pm:399
#, c-format
msgid "Please wait, retrieving file"
msgstr "Veuillez patienter, récupération du fichier en cours"
-#: media.pm:734
+#: media.pm:718
#, c-format
-msgid "Downloading file %s..."
-msgstr "Téléchargement du fichier %s ..."
+msgid "unable to add medium"
+msgstr ""
-#: media.pm:822
+#: media.pm:758
#, c-format
msgid "Copying some packages on disks for future use"
msgstr ""
"Copie de certains paquetages sur les disques pour une utilisation future"
-#: media.pm:875
+#: media.pm:811
#, c-format
msgid "Copying in progress"
msgstr "Copie en cours"
@@ -453,27 +432,27 @@ msgstr ""
msgid "An error occurred:"
msgstr "Une erreur est survenue :"
-#: pkgs.pm:776
+#: pkgs.pm:780
#, c-format
msgid "%d installation transactions failed"
msgstr "%d transactions ont échoué"
-#: pkgs.pm:777
+#: pkgs.pm:781
#, c-format
msgid "Installation of packages failed:"
msgstr "L'installation des paquets a échoué :"
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
#, c-format
msgid "Workstation"
msgstr "Station de travail"
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
#, c-format
msgid "Office Workstation"
msgstr "Poste bureautique"
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
#, c-format
msgid ""
"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -482,7 +461,7 @@ msgstr ""
"Programmes pour la bureautique : traitements de texte (OpenOffice.org "
"Writer, Kword), tableurs (OpenOffice.org Calc, Kspread), visualiseur pdf, etc"
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
#, c-format
msgid ""
"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -491,33 +470,33 @@ msgstr ""
"Programmes pour la bureautique : traitements de texte (kword, abiword), "
"tableurs (kspread, gnumeric), visualiseur pdf, etc"
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
#, c-format
msgid "Game station"
msgstr "Jeux"
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
#, c-format
msgid "Amusement programs: arcade, boards, strategy, etc"
msgstr ""
"Programmes de divertissement : jeux d'arcade, de plateau, de stratégie, etc"
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
#, c-format
msgid "Multimedia station"
msgstr "Multimédia"
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
#, c-format
msgid "Sound and video playing/editing programs"
msgstr "Programmes pour jouer/éditer du son et de la vidéo"
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
#, c-format
msgid "Internet station"
msgstr "Internet"
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
#, c-format
msgid ""
"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -526,212 +505,194 @@ msgstr ""
"Ensemble d'outils pour lire et envoyer des courriers électroniques et des "
"messages de forums (mutt, tin, ...), ainsi que pour naviguer sur Internet"
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
#, c-format
msgid "Network Computer (client)"
msgstr "Ordinateur réseau (client)"
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
#, c-format
msgid "Clients for different protocols including ssh"
msgstr "Clients pour différents protocoles, dont ssh"
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
#, c-format
msgid "Tools to ease the configuration of your computer"
msgstr "Outils pour faciliter la configuration de votre ordinateur"
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
#, c-format
msgid "Console Tools"
msgstr "Utilitaires console"
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
#, c-format
msgid "Editors, shells, file tools, terminals"
msgstr "Éditeurs, interpréteurs, outils fichiers, terminaux"
#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
#, c-format
msgid "Development"
msgstr "Développement"
#: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
#, c-format
msgid "C and C++ development libraries, programs and include files"
msgstr ""
"Bibliothèques de développement C et C++, programmes et fichiers d'en-tête"
#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
#, c-format
msgid "Documentation"
msgstr "Documentation"
#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
#, c-format
msgid "Books and Howto's on Linux and Free Software"
msgstr "Livres et Howto's sur Linux et le Logiciel Libre"
#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
#, c-format
msgid "LSB"
msgstr "LSB"
#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
#, c-format
msgid "Linux Standard Base. Third party applications support"
msgstr "« Linux Standard Base ». Support des programmes tiers"
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
#, c-format
msgid "Web Server"
msgstr "Serveur Web"
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
#, c-format
msgid "Apache"
msgstr "Apache"
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
#, c-format
msgid "Groupware"
msgstr "Groupware"
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
#, c-format
msgid "Kolab Server"
msgstr "Serveur Kolab"
#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
#, c-format
msgid "Firewall/Router"
msgstr "Pare Feu/Routeur"
#: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
#, c-format
msgid "Internet gateway"
msgstr "Passerelle internet"
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
#, c-format
msgid "Mail/News"
msgstr "Courriel/Nouvelles"
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
#, c-format
msgid "Postfix mail server, Inn news server"
msgstr "Serveur de courrier Postfix, serveur de nouvelles lnn"
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
#, c-format
msgid "Directory Server"
msgstr "Serveur d'annuaire"
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
#, c-format
msgid "FTP Server"
msgstr "Serveur FTP"
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
#, c-format
msgid "ProFTPd"
msgstr "ProFTPd"
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
#, c-format
msgid "DNS/NIS"
msgstr "DNS/NIS"
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
#, c-format
msgid "Domain Name and Network Information Server"
msgstr "Serveur de noms de domaine et d'information réseaux"
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
#, c-format
msgid "File and Printer Sharing Server"
msgstr "Serveur pour partage de fichiers et d'imprimantes"
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
#, c-format
msgid "NFS Server, Samba server"
msgstr "Serveur NFS, Serveur Samba"
#: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
#, c-format
msgid "Database"
msgstr "Base de Données"
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
#, c-format
msgid "PostgreSQL and MySQL Database Server"
msgstr "Serveurs de bases de données PostgreSQL ou MySQL"
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
#, c-format
msgid "Web/FTP"
msgstr "Web/FTP"
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
#, c-format
msgid "Apache, Pro-ftpd"
msgstr "Apache et Pro-ftpd"
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
#, c-format
msgid "Mail"
msgstr "Courriel"
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
#, c-format
msgid "Postfix mail server"
msgstr "Serveur de courrier Postfix"
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
#, c-format
msgid "PostgreSQL or MySQL database server"
msgstr "Serveurs de bases de données PostgreSQL ou MySQL"
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
#, c-format
msgid "Network Computer server"
msgstr "Serveur réseau"
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
#, c-format
msgid "NFS server, SMB server, Proxy server, ssh server"
msgstr "Serveur NFS, serveur SMB, serveur Proxy (mandataire), serveur SSH"
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
#, c-format
msgid "Graphical Environment"
msgstr "Environnement graphique"
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
#, c-format
msgid "KDE Workstation"
msgstr "Station de travail KDE"
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
#, c-format
msgid ""
"The K Desktop Environment, the basic graphical environment with a collection "
@@ -740,12 +701,12 @@ msgstr ""
"L'environnement graphique KDE (K Desktop Environment) avec sa collection "
"d'outils"
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
#, c-format
msgid "GNOME Workstation"
msgstr "Station de travail GNOME"
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
#, c-format
msgid ""
"A graphical environment with user-friendly set of applications and desktop "
@@ -754,7 +715,7 @@ msgstr ""
"Un environnement de bureau avec un ensemble de programmes et d'outils "
"intuitifs"
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
#, c-format
msgid "LXDE Desktop"
msgstr "Bureau LXDE"
@@ -764,56 +725,56 @@ msgstr "Bureau LXDE"
msgid ""
"A lightweight & fast graphical environment with user-friendly set of "
"applications and desktop tools"
-msgstr "Un environnement de bureau léger et rapide avec un ensemble de programmes et d'outils intuitifs"
+msgstr ""
+"Un environnement de bureau léger et rapide avec un ensemble de programmes et "
+"d'outils intuitifs"
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
#, c-format
msgid "Other Graphical Desktops"
msgstr "Autres Environnements de Bureau"
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
#, c-format
msgid "Window Maker, Enlightenment, Fvwm, etc"
msgstr "Window Maker, Enlightenment, Fvwm, etc"
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
#, c-format
msgid "Utilities"
msgstr "Utilitaires"
#: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
#, c-format
msgid "SSH Server"
msgstr "Serveur SSH"
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
#, c-format
msgid "Webmin"
msgstr "Webmin"
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
#, c-format
msgid "Webmin Remote Configuration Server"
msgstr "Serveur de configuration distante webmin"
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
#, c-format
msgid "Network Utilities/Monitoring"
msgstr "Utilitaires réseau/Surveillance du réseau"
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
#, c-format
msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
msgstr "Outils de surveillance, gestion de processus, tcpdump, nmap, ..."
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
#, c-format
msgid "Mandriva Wizards"
msgstr "Assistants Mandriva"
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
#, c-format
msgid "Wizards to configure server"
msgstr "Assistants pour configurer le serveur"
@@ -915,17 +876,17 @@ msgstr "Voici un aperçu du bureau « %s »."
msgid "Click on images in order to see a bigger preview"
msgstr "Veuillez cliquer sur l'image afin d'agrandir l'aperçu"
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
#, c-format
msgid "Package Group Selection"
msgstr "Sélection des groupes de paquetages"
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
#, c-format
msgid "Individual package selection"
msgstr "Sélection individuelle des paquetages"
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
#, c-format
msgid "Total size: %d / %d MB"
msgstr "Taille totale : %d / %d Mo"
@@ -1043,12 +1004,12 @@ msgstr "Installation minimale"
msgid "Software Management"
msgstr "Gestion des paquetages"
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
#, c-format
msgid "Choose the packages you want to install"
msgstr "Choisissez les paquetages que vous voulez installer"
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
#, c-format
msgid "Installing"
msgstr "Installation"
@@ -1075,7 +1036,7 @@ msgid_plural "%d packages"
msgstr[0] "%d paquetage"
msgstr[1] "%d paquetages"
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
#, c-format
msgid "Summary"
msgstr "Résumé"
@@ -1085,7 +1046,7 @@ msgstr "Résumé"
msgid "Configure"
msgstr "Configurer"
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
#, c-format
msgid "not configured"
msgstr "non configuré"
@@ -1095,7 +1056,7 @@ msgstr "non configuré"
msgid "Media Selection"
msgstr "Sélection des média"
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
#, c-format
msgid ""
"The following installation media have been found.\n"
@@ -1105,7 +1066,7 @@ msgstr ""
"Si vous ne désirez pas utiliser certains d'entre eux, vous pouvez les "
"désélectionner maintenant."
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
#, c-format
msgid ""
"You have the option to copy the contents of the CDs onto the hard drive "
@@ -1118,7 +1079,7 @@ msgstr ""
"Celle-ci s'effectuera alors à partir du disque dur et les paquetages "
"resteront disponibles une fois le système installé."
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
#, c-format
msgid "Copy whole CDs"
msgstr "Copier entièrement les CDs"
@@ -1138,59 +1099,49 @@ msgstr "Veuillez choisir votre type de clavier"
msgid "Here is the full list of available keyboards:"
msgstr "Voici la liste complète des claviers disponibles :"
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
#, c-format
msgid "Install/Upgrade"
msgstr "Installation/Mise à jour"
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
#, c-format
msgid "Is this an install or an upgrade?"
msgstr "Désirez-vous faire une installation ou une mise à jour ?"
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
#, c-format
msgid ""
"_: This is a noun:\n"
"Install"
msgstr "Installation"
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
#, c-format
msgid "Upgrade %s"
msgstr "Mettre à jour %s"
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr "La mise à jour d'une distribution 32bit vers 64bit n'est pas supportée"
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr "La mise à jour d'une distribution 64bit vers 32bit n'est pas supportée"
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
#, c-format
msgid "Encryption key for %s"
msgstr "Clé de chiffrement pour %s"
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
#, c-format
msgid "Cancel installation, reboot system"
msgstr "Annuler l'installation, relancer le système"
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
#, c-format
msgid "New Installation"
msgstr "Nouvelle installation"
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
#, c-format
msgid "Upgrade previous installation (not recommended)"
msgstr "Mettre à jour la précédente installation (non recommandé)"
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
#, c-format
msgid ""
"Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1209,17 +1160,17 @@ msgstr ""
"Attention, vous devriez sauvegarder vos informations personnelles\n"
"avant de choisir « Nouvelle installation »."
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "IDE"
msgstr "IDE"
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "Configuring IDE"
msgstr "Configuration IDE"
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
#, c-format
msgid ""
"No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1231,7 +1182,7 @@ msgstr ""
"de\n"
"créer la partition d'amorçage avec DiskDrake."
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
#, c-format
msgid ""
"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1244,7 +1195,7 @@ msgstr ""
"de\n"
"créer la partition d'amorçage avec DiskDrake."
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
#, c-format
msgid ""
"Change your Cd-Rom!\n"
@@ -1258,12 +1209,12 @@ msgstr ""
"Si vous ne le possédez pas, cliquez sur « Annuler » afin de ne rien installer "
"à partir de ce CD-ROM."
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
#, c-format
msgid "Looking for available packages..."
msgstr "Recherche des paquetages disponibles..."
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
#, c-format
msgid ""
"Your system does not have enough space left for installation or upgrade (%"
@@ -1272,7 +1223,7 @@ msgstr ""
"Votre système n'a pas assez d'espace libre pour installer ou de mettre à "
"jour (%dMo > %dMo)"
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
#, c-format
msgid ""
"Please choose load or save package selection.\n"
@@ -1282,52 +1233,52 @@ msgstr ""
"sélection des paquetages. Le format est le même que celui de l'installation "
"automatisée (auto_install)."
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Load"
msgstr "Charger"
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Save"
msgstr "Sauvegarder"
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
#, c-format
msgid "Bad file"
msgstr "Mauvais fichier"
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
#, c-format
msgid "KDE"
msgstr "KDE"
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
#, c-format
msgid "GNOME"
msgstr "GNOME"
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
#, c-format
msgid "Desktop Selection"
msgstr "Sélection du bureau"
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
#, c-format
msgid "You can choose your workstation desktop profile."
msgstr "Vous pouvez choisir un profil de bureau de station de travail ."
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
#, c-format
msgid "Selected size is larger than available space"
msgstr "La taille sélectionnée est plus importante que la place disponible"
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
#, c-format
msgid "Type of install"
msgstr "Type d'installation"
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
#, c-format
msgid ""
"You have not selected any group of packages.\n"
@@ -1336,83 +1287,83 @@ msgstr ""
"Vous n'avez sélectionné aucun groupe de paquetages.\n"
"Veuillez choisir l'installation minimale désirée :"
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
#, c-format
msgid "With X"
msgstr "Avec X"
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
#, c-format
msgid "With basic documentation (recommended!)"
msgstr "Avec la documentation de base (recommandé !)"
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
#, c-format
msgid "Truly minimal install (especially no urpmi)"
msgstr "Installation vraiment minimale (et en particulier pas d'urpmi)"
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
#, c-format
msgid "Preparing installation"
msgstr "Préparation de l'installation"
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
#, c-format
msgid "Installing package %s"
msgstr "Installation du paquetage %s"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "There was an error ordering packages:"
msgstr "Erreur lors du tri des paquetages :"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "Go on anyway?"
msgstr "Souhaitez-vous tout de même continuer ?"
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
#, c-format
msgid "Retry"
msgstr "Ré-essayer"
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
#, c-format
msgid "Skip this package"
msgstr "Ignorer ce paquetage"
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
#, c-format
msgid "Skip all packages from medium \"%s\""
msgstr "Ignorer tous les paquetages du média « %s »"
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
#, c-format
msgid "Go back to media and packages selection"
msgstr "Retourner à la sélection du média et des paquetages"
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
#, c-format
msgid "There was an error installing package %s."
msgstr "Erreur lors de l'installation du paquetage %s."
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
#, c-format
msgid "Post-install configuration"
msgstr "Configuration post-installation"
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
#, c-format
msgid "Please ensure the Update Modules media is in drive %s"
msgstr ""
"Assurez vous que le média de mise à jour des modules est dans le lecteur %s"
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
#, c-format
msgid "Updates"
msgstr "Mises à jour"
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
#, c-format
msgid ""
"You now have the opportunity to download updated packages. These packages\n"
@@ -1433,28 +1384,28 @@ msgstr ""
"\n"
"Souhaitez-vous installer les mises à jour ?"
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
#, c-format
msgid "%s on %s"
msgstr "%s sur %s"
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
#, c-format
msgid "Hardware"
msgstr "Matériel"
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
#, c-format
msgid "Sound card"
msgstr "Carte son"
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
#, c-format
msgid "Do you have an ISA sound card?"
msgstr "Possédez-vous une carte son ISA ?"
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
#, c-format
msgid ""
"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1463,70 +1414,70 @@ msgstr ""
"Lancez « alsaconf » ou « sndconfig » après l'installation pour configurer la "
"carte son"
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
#, c-format
msgid "No sound card detected. Try \"harddrake\" after installation"
msgstr ""
"Aucune carte son détectée. Essayez avec « harddrake » après l'installation"
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
#, c-format
msgid "Graphical interface"
msgstr "Interface graphique"
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
#, c-format
msgid "Network & Internet"
msgstr "Réseau et Internet"
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
#, c-format
msgid "Proxies"
msgstr "Proxys"
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
#, c-format
msgid "configured"
msgstr "configuré"
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
#, c-format
msgid "Security Level"
msgstr "Niveau de sécurité"
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
#, c-format
msgid "Firewall"
msgstr "Pare Feu"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "activated"
msgstr "activé"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "disabled"
msgstr "désactivé"
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
#, c-format
msgid "You have not configured X. Are you sure you really want this?"
msgstr ""
"Vous n'avez pas configuré le serveur d'affichage (X11). Êtes-vous sûr de ce "
"que vous faites ?"
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
#, c-format
msgid "Preparing bootloader..."
msgstr "Préparation du programme d'amorçage..."
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
#, c-format
msgid "Be patient, this may take a while..."
msgstr "Merci d'être patient, cela peut prendre quelques instants"
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
#, c-format
msgid ""
"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1541,7 +1492,7 @@ msgstr ""
"d'une autre méthode pour démarrer votre machine. Le paramètre pour la racine "
"du noyau est : root=%s"
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
#, c-format
msgid ""
"In this security level, access to the files in the Windows partition is "
@@ -1550,17 +1501,17 @@ msgstr ""
"A ce niveau de sécurité, l'accès aux fichiers de la partition Windows sera "
"restreint à l'administrateur."
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr "Insérez une disquette vierge dans le lecteur %s"
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
#, c-format
msgid "Creating auto install floppy..."
msgstr "Création de la disquette d'auto-installation..."
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
#, c-format
msgid ""
"Some steps are not completed.\n"
@@ -1571,7 +1522,7 @@ msgstr ""
"\n"
"Souhaitez-vous vraiment quitter maintenant ?"
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
#, c-format
msgid "Congratulations"
msgstr "Félicitations"
@@ -1714,3 +1665,29 @@ msgid ""
"_: Keep these entry short\n"
"Exit"
msgstr "Quitter"
+
+#~ msgid "Your desktop on a USB key"
+#~ msgstr "Votre bureau sur une clé USB"
+
+#~ msgid "The 100%% open source Mandriva Linux distribution"
+#~ msgstr "La distribution Mandriva Linux 100%% libre"
+
+#~ msgid "Explore Linux easily with Mandriva One"
+#~ msgstr "Découvrez Linux facilement grâce à Mandriva One"
+
+#~ msgid "A full Mandriva Linux desktop, with support"
+#~ msgstr "Un bureau Mandriva Linux complet, avec support"
+
+#~ msgid "Mandriva: distributions for everybody's needs"
+#~ msgstr "Mandriva : les distributions couvrant les besoins de chacun"
+
+#~ msgid "Downloading file %s..."
+#~ msgstr "Téléchargement du fichier %s ..."
+
+#~ msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
+#~ msgstr ""
+#~ "La mise à jour d'une distribution 32bit vers 64bit n'est pas supportée"
+
+#~ msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
+#~ msgstr ""
+#~ "La mise à jour d'une distribution 64bit vers 32bit n'est pas supportée"
diff --git a/perl-install/install/share/po/fur.po b/perl-install/install/share/po/fur.po
index a99990035..dc1866f8b 100644
--- a/perl-install/install/share/po/fur.po
+++ b/perl-install/install/share/po/fur.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: DrakX\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
"PO-Revision-Date: 2004-06-28 17:41+0200\n"
"Last-Translator: Andrea Gracco <graccoandrea@tin.it>\n"
"Language-Team: furlan <gft@freelists.org>\n"
@@ -15,31 +15,6 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.3\n"
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr ""
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr ""
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr ""
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr ""
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr ""
-
#: any.pm:109
#, c-format
msgid "Do you have further supplementary media?"
@@ -75,92 +50,92 @@ msgstr "Rêt"
msgid "Network (NFS)"
msgstr ""
-#: any.pm:163
+#: any.pm:165
#, c-format
msgid "URL of the mirror?"
msgstr ""
-#: any.pm:169
+#: any.pm:171
#, c-format
msgid "URL must start with ftp:// or http://"
msgstr ""
-#: any.pm:180
+#: any.pm:182
#, c-format
msgid ""
"Contacting Mandriva Linux web site to get the list of available mirrors..."
msgstr ""
-#: any.pm:185
+#: any.pm:187
#, c-format
msgid ""
"Failed contacting Mandriva Linux web site to get the list of available "
"mirrors"
msgstr ""
-#: any.pm:195
+#: any.pm:197
#, c-format
msgid "Choose a mirror from which to get the packages"
msgstr ""
-#: any.pm:225
+#: any.pm:227
#, c-format
msgid "NFS setup"
msgstr ""
-#: any.pm:226
+#: any.pm:228
#, c-format
msgid "Please enter the hostname and directory of your NFS media"
msgstr ""
-#: any.pm:230
+#: any.pm:232
#, c-format
msgid "Hostname missing"
msgstr ""
-#: any.pm:231
+#: any.pm:233
#, c-format
msgid "Directory must begin with \"/\""
msgstr ""
-#: any.pm:235
+#: any.pm:237
#, c-format
msgid "Hostname of the NFS mount ?"
msgstr ""
-#: any.pm:236
+#: any.pm:238
#, c-format
msgid "Directory"
msgstr "Cartele"
-#: any.pm:258
+#: any.pm:260
#, c-format
msgid "Supplementary"
msgstr ""
-#: any.pm:293
+#: any.pm:295
#, c-format
msgid ""
"Can't find a package list file on this mirror. Make sure the location is "
"correct."
msgstr ""
-#: any.pm:328
+#: any.pm:334
#, c-format
msgid "Looking at packages already installed..."
msgstr ""
-#: any.pm:362
+#: any.pm:368
#, c-format
msgid "Finding packages to upgrade..."
msgstr ""
-#: any.pm:381
+#: any.pm:387
#, c-format
msgid "Removing packages prior to upgrade..."
msgstr ""
-#: any.pm:402
+#: any.pm:408
#, c-format
msgid ""
"You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -172,18 +147,18 @@ msgid ""
"please reboot your system and upgrade using the Mandriva update applet."
msgstr ""
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
#, c-format
msgid "Reboot"
msgstr "Torne a inviâ"
-#: any.pm:407
+#: any.pm:413
#, c-format
msgid "Proceed"
msgstr ""
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -192,72 +167,72 @@ msgid ""
"Do you really want to remove these packages?\n"
msgstr ""
-#: any.pm:815
+#: any.pm:821
#, c-format
msgid "Error reading file %s"
msgstr ""
-#: any.pm:1022
+#: any.pm:1028
#, c-format
msgid "The following disk(s) were renamed:"
msgstr ""
-#: any.pm:1024
+#: any.pm:1030
#, c-format
msgid "%s (previously named as %s)"
msgstr ""
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "HTTP"
msgstr ""
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "FTP"
msgstr ""
-#: any.pm:1081
+#: any.pm:1087
#, fuzzy, c-format
msgid "NFS"
msgstr "HFS"
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
#, c-format
msgid "Network"
msgstr "Rêt"
-#: any.pm:1104
+#: any.pm:1110
#, fuzzy, c-format
msgid "Please choose a media"
msgstr "Par plasè sielç"
-#: any.pm:1120
+#: any.pm:1126
#, c-format
msgid "File already exists. Overwrite it?"
msgstr ""
-#: any.pm:1124
+#: any.pm:1130
#, c-format
msgid "Permission denied"
msgstr "Permès dineât"
-#: any.pm:1172
+#: any.pm:1178
#, c-format
msgid "Bad NFS name"
msgstr ""
-#: any.pm:1193
+#: any.pm:1199
#, fuzzy, c-format
msgid "Bad media %s"
msgstr "font zontade %s"
-#: any.pm:1236
+#: any.pm:1242
#, c-format
msgid "Can not make screenshots before partitioning"
msgstr ""
-#: any.pm:1244
+#: any.pm:1250
#, c-format
msgid "Screenshots will be available after install in %s"
msgstr ""
@@ -268,11 +243,15 @@ msgid "Installation"
msgstr "Instale"
#: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
#, c-format
msgid "Configuration"
msgstr "Configurazion"
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
#: install2.pm:168
#, c-format
msgid "You must also format %s"
@@ -295,22 +274,22 @@ msgstr ""
msgid "Bringing down the network"
msgstr ""
-#: media.pm:402
+#: media.pm:399
#, c-format
msgid "Please wait, retrieving file"
msgstr ""
-#: media.pm:734
+#: media.pm:718
#, c-format
-msgid "Downloading file %s..."
+msgid "unable to add medium"
msgstr ""
-#: media.pm:822
+#: media.pm:758
#, c-format
msgid "Copying some packages on disks for future use"
msgstr ""
-#: media.pm:875
+#: media.pm:811
#, fuzzy, c-format
msgid "Copying in progress"
msgstr "Instalazion in vore"
@@ -352,296 +331,278 @@ msgstr ""
msgid "An error occurred:"
msgstr "Al è intravignût un fal"
-#: pkgs.pm:776
+#: pkgs.pm:780
#, fuzzy, c-format
msgid "%d installation transactions failed"
msgstr "Instalazion falade"
-#: pkgs.pm:777
+#: pkgs.pm:781
#, fuzzy, c-format
msgid "Installation of packages failed:"
msgstr "Instale atualizazions"
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
#, fuzzy, c-format
msgid "Workstation"
msgstr "Viôt le Configurazion"
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
#, c-format
msgid "Office Workstation"
msgstr ""
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
#, c-format
msgid ""
"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
msgstr ""
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
#, c-format
msgid ""
"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
"gnumeric), pdf viewers, etc"
msgstr ""
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
#, c-format
msgid "Game station"
msgstr ""
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
#, c-format
msgid "Amusement programs: arcade, boards, strategy, etc"
msgstr ""
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
#, fuzzy, c-format
msgid "Multimedia station"
msgstr "Multimedia"
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
#, c-format
msgid "Sound and video playing/editing programs"
msgstr ""
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
#, fuzzy, c-format
msgid "Internet station"
msgstr "Internazionalizazion"
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
#, c-format
msgid ""
"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
"Web"
msgstr ""
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
#, fuzzy, c-format
msgid "Network Computer (client)"
msgstr "Informatiche"
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
#, c-format
msgid "Clients for different protocols including ssh"
msgstr ""
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
#, c-format
msgid "Tools to ease the configuration of your computer"
msgstr ""
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
#, fuzzy, c-format
msgid "Console Tools"
msgstr "Console"
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
#, c-format
msgid "Editors, shells, file tools, terminals"
msgstr ""
#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
#, c-format
msgid "Development"
msgstr "Svilup"
#: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
#, c-format
msgid "C and C++ development libraries, programs and include files"
msgstr ""
#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
#, c-format
msgid "Documentation"
msgstr "Documentazion"
#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
#, c-format
msgid "Books and Howto's on Linux and Free Software"
msgstr ""
#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
#, c-format
msgid "LSB"
msgstr ""
#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
#, c-format
msgid "Linux Standard Base. Third party applications support"
msgstr ""
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
#, c-format
msgid "Web Server"
msgstr "Server Web"
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
#, c-format
msgid "Apache"
msgstr ""
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
#, fuzzy, c-format
msgid "Groupware"
msgstr "Grop"
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
#, fuzzy, c-format
msgid "Kolab Server"
msgstr "Server Web"
#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
#, c-format
msgid "Firewall/Router"
msgstr ""
#: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
#, c-format
msgid "Internet gateway"
msgstr ""
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
#, fuzzy, c-format
msgid "Mail/News"
msgstr "/File/_Gnûf"
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
#, c-format
msgid "Postfix mail server, Inn news server"
msgstr ""
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
#, fuzzy, c-format
msgid "Directory Server"
msgstr "Ferme Server"
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
#, fuzzy, c-format
msgid "FTP Server"
msgstr "Server NTP"
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
#, c-format
msgid "ProFTPd"
msgstr ""
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
#, fuzzy, c-format
msgid "DNS/NIS"
msgstr "NIS"
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
#, c-format
msgid "Domain Name and Network Information Server"
msgstr ""
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
#, c-format
msgid "File and Printer Sharing Server"
msgstr ""
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
#, fuzzy, c-format
msgid "NFS Server, Samba server"
msgstr "Server Samba"
#: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
#, fuzzy, c-format
msgid "Database"
msgstr "Database"
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
#, c-format
msgid "PostgreSQL and MySQL Database Server"
msgstr ""
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
#, c-format
msgid "Web/FTP"
msgstr ""
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
#, c-format
msgid "Apache, Pro-ftpd"
msgstr ""
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
#, c-format
msgid "Mail"
msgstr "Mail"
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
#, c-format
msgid "Postfix mail server"
msgstr ""
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
#, c-format
msgid "PostgreSQL or MySQL database server"
msgstr ""
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
#, fuzzy, c-format
msgid "Network Computer server"
msgstr "Informatiche"
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
#, c-format
msgid "NFS server, SMB server, Proxy server, ssh server"
msgstr ""
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
#, c-format
msgid "Graphical Environment"
msgstr "Ambient Grafic"
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
#, c-format
msgid "KDE Workstation"
msgstr ""
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
#, c-format
msgid ""
"The K Desktop Environment, the basic graphical environment with a collection "
"of accompanying tools"
msgstr ""
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
#, c-format
msgid "GNOME Workstation"
msgstr ""
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
#, c-format
msgid ""
"A graphical environment with user-friendly set of applications and desktop "
"tools"
msgstr ""
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
#, fuzzy, c-format
msgid "LXDE Desktop"
msgstr "Desktop"
@@ -653,54 +614,52 @@ msgid ""
"applications and desktop tools"
msgstr ""
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
#, fuzzy, c-format
msgid "Other Graphical Desktops"
msgstr "Desktop grafic"
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
#, c-format
msgid "Window Maker, Enlightenment, Fvwm, etc"
msgstr ""
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
#, fuzzy, c-format
msgid "Utilities"
msgstr "Filipinis"
#: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
#, c-format
msgid "SSH Server"
msgstr ""
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
#, c-format
msgid "Webmin"
msgstr ""
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
#, fuzzy, c-format
msgid "Webmin Remote Configuration Server"
msgstr "Viôt le Configurazion"
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
#, c-format
msgid "Network Utilities/Monitoring"
msgstr ""
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
#, c-format
msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
msgstr ""
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
#, fuzzy, c-format
msgid "Mandriva Wizards"
msgstr "<b>Mandriva Expert</b>"
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
#, c-format
msgid "Wizards to configure server"
msgstr ""
@@ -792,17 +751,17 @@ msgstr ""
msgid "Click on images in order to see a bigger preview"
msgstr ""
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
#, c-format
msgid "Package Group Selection"
msgstr ""
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
#, c-format
msgid "Individual package selection"
msgstr ""
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
#, c-format
msgid "Total size: %d / %d MB"
msgstr ""
@@ -919,12 +878,12 @@ msgstr ""
msgid "Software Management"
msgstr "Gjestôr Software"
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
#, c-format
msgid "Choose the packages you want to install"
msgstr ""
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
#, c-format
msgid "Installing"
msgstr ""
@@ -951,7 +910,7 @@ msgid_plural "%d packages"
msgstr[0] "pachet no cognossût"
msgstr[1] "pachet no cognossût"
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
#, c-format
msgid "Summary"
msgstr ""
@@ -961,7 +920,7 @@ msgstr ""
msgid "Configure"
msgstr "Configure"
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
#, c-format
msgid "not configured"
msgstr ""
@@ -971,14 +930,14 @@ msgstr ""
msgid "Media Selection"
msgstr "Selezion dal percors"
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
#, c-format
msgid ""
"The following installation media have been found.\n"
"If you want to skip some of them, you can unselect them now."
msgstr ""
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
#, c-format
msgid ""
"You have the option to copy the contents of the CDs onto the hard drive "
@@ -987,7 +946,7 @@ msgid ""
"available once the system is fully installed."
msgstr ""
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
#, c-format
msgid "Copy whole CDs"
msgstr ""
@@ -1007,59 +966,49 @@ msgstr ""
msgid "Here is the full list of available keyboards:"
msgstr ""
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
#, c-format
msgid "Install/Upgrade"
msgstr ""
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
#, c-format
msgid "Is this an install or an upgrade?"
msgstr ""
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
#, fuzzy, c-format
msgid ""
"_: This is a noun:\n"
"Install"
msgstr "Instale"
-#: steps_interactive.pm:147
-#, c-format
-msgid "Upgrade %s"
-msgstr ""
-
#: steps_interactive.pm:151
#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
+msgid "Upgrade %s"
msgstr ""
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
#, c-format
msgid "Encryption key for %s"
msgstr ""
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
#, c-format
msgid "Cancel installation, reboot system"
msgstr ""
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
#, fuzzy, c-format
msgid "New Installation"
msgstr "Instale"
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
#, c-format
msgid "Upgrade previous installation (not recommended)"
msgstr ""
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
#, c-format
msgid ""
"Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1071,24 +1020,24 @@ msgid ""
"Installation\"."
msgstr ""
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "IDE"
msgstr ""
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "Configuring IDE"
msgstr ""
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
#, c-format
msgid ""
"No free space for 1MB bootstrap! Install will continue, but to boot your "
"system, you'll need to create the bootstrap partition in DiskDrake"
msgstr ""
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
#, c-format
msgid ""
"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1096,7 +1045,7 @@ msgid ""
"DiskDrake"
msgstr ""
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
#, c-format
msgid ""
"Change your Cd-Rom!\n"
@@ -1105,153 +1054,153 @@ msgid ""
"If you do not have it, press Cancel to avoid installation from this Cd-Rom."
msgstr ""
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
#, c-format
msgid "Looking for available packages..."
msgstr ""
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
#, c-format
msgid ""
"Your system does not have enough space left for installation or upgrade (%"
"dMB > %dMB)"
msgstr ""
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
#, c-format
msgid ""
"Please choose load or save package selection.\n"
"The format is the same as auto_install generated files."
msgstr ""
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, fuzzy, c-format
msgid "Load"
msgstr "Locâl"
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Save"
msgstr "Salve"
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
#, fuzzy, c-format
msgid "Bad file"
msgstr "Salve il file"
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
#, c-format
msgid "KDE"
msgstr "KDE"
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
#, c-format
msgid "GNOME"
msgstr "GNOME"
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
#, c-format
msgid "Desktop Selection"
msgstr ""
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
#, c-format
msgid "You can choose your workstation desktop profile."
msgstr ""
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
#, c-format
msgid "Selected size is larger than available space"
msgstr ""
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
#, c-format
msgid "Type of install"
msgstr ""
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
#, c-format
msgid ""
"You have not selected any group of packages.\n"
"Please choose the minimal installation you want:"
msgstr ""
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
#, c-format
msgid "With X"
msgstr ""
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
#, c-format
msgid "With basic documentation (recommended!)"
msgstr ""
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
#, c-format
msgid "Truly minimal install (especially no urpmi)"
msgstr ""
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
#, c-format
msgid "Preparing installation"
msgstr ""
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
#, c-format
msgid "Installing package %s"
msgstr ""
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "There was an error ordering packages:"
msgstr ""
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "Go on anyway?"
msgstr ""
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
#, c-format
msgid "Retry"
msgstr ""
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
#, c-format
msgid "Skip this package"
msgstr ""
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
#, c-format
msgid "Skip all packages from medium \"%s\""
msgstr ""
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
#, c-format
msgid "Go back to media and packages selection"
msgstr ""
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
#, c-format
msgid "There was an error installing package %s."
msgstr ""
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
#, c-format
msgid "Post-install configuration"
msgstr ""
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
#, c-format
msgid "Please ensure the Update Modules media is in drive %s"
msgstr ""
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
#, c-format
msgid "Updates"
msgstr "Atualizazions"
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
#, c-format
msgid ""
"You now have the opportunity to download updated packages. These packages\n"
@@ -1264,95 +1213,95 @@ msgid ""
"Do you want to install the updates?"
msgstr ""
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
#, c-format
msgid "%s on %s"
msgstr ""
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
#, c-format
msgid "Hardware"
msgstr "Hardware"
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
#, c-format
msgid "Sound card"
msgstr ""
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
#, c-format
msgid "Do you have an ISA sound card?"
msgstr ""
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
#, c-format
msgid ""
"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
"card"
msgstr ""
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
#, c-format
msgid "No sound card detected. Try \"harddrake\" after installation"
msgstr ""
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
#, c-format
msgid "Graphical interface"
msgstr ""
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
#, c-format
msgid "Network & Internet"
msgstr "Rêt & Internet"
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
#, c-format
msgid "Proxies"
msgstr ""
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
#, c-format
msgid "configured"
msgstr ""
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
#, c-format
msgid "Security Level"
msgstr "Nivel di Sigurece"
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
#, c-format
msgid "Firewall"
msgstr "Firewall"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "activated"
msgstr ""
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "disabled"
msgstr "disabilitât"
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
#, c-format
msgid "You have not configured X. Are you sure you really want this?"
msgstr ""
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
#, c-format
msgid "Preparing bootloader..."
msgstr ""
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
#, c-format
msgid "Be patient, this may take a while..."
msgstr ""
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
#, c-format
msgid ""
"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1361,24 +1310,24 @@ msgid ""
"root fs is: root=%s"
msgstr ""
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
#, c-format
msgid ""
"In this security level, access to the files in the Windows partition is "
"restricted to the administrator."
msgstr ""
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr ""
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
#, c-format
msgid "Creating auto install floppy..."
msgstr ""
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
#, c-format
msgid ""
"Some steps are not completed.\n"
@@ -1386,7 +1335,7 @@ msgid ""
"Do you really want to quit now?"
msgstr ""
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
#, c-format
msgid "Congratulations"
msgstr "Congratulazions"
diff --git a/perl-install/install/share/po/ga.po b/perl-install/install/share/po/ga.po
index c9d920709..2ed94d831 100644
--- a/perl-install/install/share/po/ga.po
+++ b/perl-install/install/share/po/ga.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: DrakX\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
"PO-Revision-Date: 2005-09-12 18:04+0200\n"
"Last-Translator: Alastair McKinstry <mckinstry@computer.org>\n"
"Language-Team: Irish <ga@li.org>\n"
@@ -13,31 +13,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr ""
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr ""
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr ""
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr ""
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr ""
-
#: any.pm:109
#, fuzzy, c-format
msgid "Do you have further supplementary media?"
@@ -73,92 +48,92 @@ msgstr "Líonra (FTP)"
msgid "Network (NFS)"
msgstr "Líonra (NFS)"
-#: any.pm:163
+#: any.pm:165
#, c-format
msgid "URL of the mirror?"
msgstr ""
-#: any.pm:169
+#: any.pm:171
#, c-format
msgid "URL must start with ftp:// or http://"
msgstr ""
-#: any.pm:180
+#: any.pm:182
#, c-format
msgid ""
"Contacting Mandriva Linux web site to get the list of available mirrors..."
msgstr ""
-#: any.pm:185
+#: any.pm:187
#, c-format
msgid ""
"Failed contacting Mandriva Linux web site to get the list of available "
"mirrors"
msgstr ""
-#: any.pm:195
+#: any.pm:197
#, c-format
msgid "Choose a mirror from which to get the packages"
msgstr ""
-#: any.pm:225
+#: any.pm:227
#, c-format
msgid "NFS setup"
msgstr "Cumraigh NFS"
-#: any.pm:226
+#: any.pm:228
#, c-format
msgid "Please enter the hostname and directory of your NFS media"
msgstr ""
-#: any.pm:230
+#: any.pm:232
#, c-format
msgid "Hostname missing"
msgstr ""
-#: any.pm:231
+#: any.pm:233
#, c-format
msgid "Directory must begin with \"/\""
msgstr ""
-#: any.pm:235
+#: any.pm:237
#, c-format
msgid "Hostname of the NFS mount ?"
msgstr ""
-#: any.pm:236
+#: any.pm:238
#, c-format
msgid "Directory"
msgstr "Comhadlann"
-#: any.pm:258
+#: any.pm:260
#, c-format
msgid "Supplementary"
msgstr ""
-#: any.pm:293
+#: any.pm:295
#, fuzzy, c-format
msgid ""
"Can't find a package list file on this mirror. Make sure the location is "
"correct."
msgstr "Earráid ag oscailt %s do scríobh: %s"
-#: any.pm:328
+#: any.pm:334
#, fuzzy, c-format
msgid "Looking at packages already installed..."
msgstr "Roghnaigh pacáistí ..."
-#: any.pm:362
+#: any.pm:368
#, c-format
msgid "Finding packages to upgrade..."
msgstr "Ag cúrdach pacáistí le húasgrádú..."
-#: any.pm:381
+#: any.pm:387
#, c-format
msgid "Removing packages prior to upgrade..."
msgstr ""
-#: any.pm:402
+#: any.pm:408
#, c-format
msgid ""
"You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -170,18 +145,18 @@ msgid ""
"please reboot your system and upgrade using the Mandriva update applet."
msgstr ""
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
#, c-format
msgid "Reboot"
msgstr "Atosaigh"
-#: any.pm:407
+#: any.pm:413
#, c-format
msgid "Proceed"
msgstr ""
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -190,72 +165,72 @@ msgid ""
"Do you really want to remove these packages?\n"
msgstr ""
-#: any.pm:815
+#: any.pm:821
#, c-format
msgid "Error reading file %s"
msgstr "Earráid ag léamh comhad %s"
-#: any.pm:1022
+#: any.pm:1028
#, fuzzy, c-format
msgid "The following disk(s) were renamed:"
msgstr "Roghnaigh pacáistí ..."
-#: any.pm:1024
+#: any.pm:1030
#, c-format
msgid "%s (previously named as %s)"
msgstr ""
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "HTTP"
msgstr "HTTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "FTP"
msgstr "FTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "NFS"
msgstr "NFS"
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
#, c-format
msgid "Network"
msgstr "Líonra"
-#: any.pm:1104
+#: any.pm:1110
#, fuzzy, c-format
msgid "Please choose a media"
msgstr "Roghnaight do theangam le do thoil."
-#: any.pm:1120
+#: any.pm:1126
#, c-format
msgid "File already exists. Overwrite it?"
msgstr "Tá an comhad ann cheana. Forscríobh?"
-#: any.pm:1124
+#: any.pm:1130
#, c-format
msgid "Permission denied"
msgstr "Cead diúltaithe"
-#: any.pm:1172
+#: any.pm:1178
#, c-format
msgid "Bad NFS name"
msgstr ""
-#: any.pm:1193
+#: any.pm:1199
#, fuzzy, c-format
msgid "Bad media %s"
msgstr "Tá comhad %s lódailte."
-#: any.pm:1236
+#: any.pm:1242
#, fuzzy, c-format
msgid "Can not make screenshots before partitioning"
msgstr "Ní féidir liom rann eile a cur isteach"
-#: any.pm:1244
+#: any.pm:1250
#, c-format
msgid "Screenshots will be available after install in %s"
msgstr ""
@@ -266,11 +241,15 @@ msgid "Installation"
msgstr "Suiteáil"
#: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
#, c-format
msgid "Configuration"
msgstr "cumraíocht"
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
#: install2.pm:168
#, c-format
msgid "You must also format %s"
@@ -293,22 +272,22 @@ msgstr "Ag tosnú suas an ghréasán"
msgid "Bringing down the network"
msgstr "Ag dúnadh síos an ghreasán"
-#: media.pm:402
+#: media.pm:399
#, c-format
msgid "Please wait, retrieving file"
msgstr ""
-#: media.pm:734
-#, fuzzy, c-format
-msgid "Downloading file %s..."
-msgstr "Sabháil i gcomhad"
+#: media.pm:718
+#, c-format
+msgid "unable to add medium"
+msgstr ""
-#: media.pm:822
+#: media.pm:758
#, c-format
msgid "Copying some packages on disks for future use"
msgstr ""
-#: media.pm:875
+#: media.pm:811
#, fuzzy, c-format
msgid "Copying in progress"
msgstr "Pointe taca dublach %s"
@@ -350,296 +329,278 @@ msgstr ""
msgid "An error occurred:"
msgstr "Tharla earráid"
-#: pkgs.pm:776
+#: pkgs.pm:780
#, fuzzy, c-format
msgid "%d installation transactions failed"
msgstr "Theip ag feistiú"
-#: pkgs.pm:777
+#: pkgs.pm:781
#, fuzzy, c-format
msgid "Installation of packages failed:"
msgstr "Ag feistiál pacáiste %s"
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
#, c-format
msgid "Workstation"
msgstr "Stáisiún Oibre"
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
#, c-format
msgid "Office Workstation"
msgstr "Stáisiún Oibre"
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
#, c-format
msgid ""
"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
msgstr ""
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
#, c-format
msgid ""
"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
"gnumeric), pdf viewers, etc"
msgstr ""
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
#, c-format
msgid "Game station"
msgstr "Stáisiún Cluichí"
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
#, c-format
msgid "Amusement programs: arcade, boards, strategy, etc"
msgstr ""
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
#, c-format
msgid "Multimedia station"
msgstr "Stáisiún ilmheánach"
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
#, c-format
msgid "Sound and video playing/editing programs"
msgstr ""
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
#, c-format
msgid "Internet station"
msgstr "Stáisiún Idirlíon"
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
#, c-format
msgid ""
"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
"Web"
msgstr ""
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
#, fuzzy, c-format
msgid "Network Computer (client)"
msgstr "Printéir Gréasán (lpd)"
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
#, c-format
msgid "Clients for different protocols including ssh"
msgstr ""
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
#, fuzzy, c-format
msgid "Tools to ease the configuration of your computer"
msgstr "An bhfuil tú ag iarraidh an cumraíocht a thrial?"
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
#, c-format
msgid "Console Tools"
msgstr "Uirlisí Consóil"
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
#, c-format
msgid "Editors, shells, file tools, terminals"
msgstr ""
#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
#, c-format
msgid "Development"
msgstr "Forbairt"
#: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
#, c-format
msgid "C and C++ development libraries, programs and include files"
msgstr ""
#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
#, c-format
msgid "Documentation"
msgstr "Doiciméadú"
#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
#, c-format
msgid "Books and Howto's on Linux and Free Software"
msgstr ""
#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
#, c-format
msgid "LSB"
msgstr ""
#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
#, c-format
msgid "Linux Standard Base. Third party applications support"
msgstr ""
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
#, c-format
msgid "Web Server"
msgstr "Freastalaí Lín"
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
#, c-format
msgid "Apache"
msgstr "Apache"
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
#, c-format
msgid "Groupware"
msgstr "Grúpearraí"
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
#, c-format
msgid "Kolab Server"
msgstr "Freastalaí Kolab"
#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
#, c-format
msgid "Firewall/Router"
msgstr ""
#: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
#, fuzzy, c-format
msgid "Internet gateway"
msgstr "suimiúil"
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
#, c-format
msgid "Mail/News"
msgstr "Ríomhphost/Nuacht"
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
#, fuzzy, c-format
msgid "Postfix mail server, Inn news server"
msgstr "Freastalaí Printéir"
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
#, c-format
msgid "Directory Server"
msgstr "Freastalaí Eolaire"
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
#, c-format
msgid "FTP Server"
msgstr "Freastalaí FTP:"
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
#, c-format
msgid "ProFTPd"
msgstr ""
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
#, fuzzy, c-format
msgid "DNS/NIS"
msgstr "DNS/NIS "
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
#, fuzzy, c-format
msgid "Domain Name and Network Information Server"
msgstr "Ainm Fearannas"
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
#, fuzzy, c-format
msgid "File and Printer Sharing Server"
msgstr "Freastalaí Printéir"
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
#, fuzzy, c-format
msgid "NFS Server, Samba server"
msgstr "Freastalaí NIS"
#: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
#, c-format
msgid "Database"
msgstr "Bunachar Sonraí"
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
#, c-format
msgid "PostgreSQL and MySQL Database Server"
msgstr ""
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
#, c-format
msgid "Web/FTP"
msgstr "Greasan/FTP"
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
#, c-format
msgid "Apache, Pro-ftpd"
msgstr "Apache, Pro-ftpd"
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
#, c-format
msgid "Mail"
msgstr "Post"
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
#, fuzzy, c-format
msgid "Postfix mail server"
msgstr "Freastalaí Printéir"
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
#, c-format
msgid "PostgreSQL or MySQL database server"
msgstr ""
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
#, fuzzy, c-format
msgid "Network Computer server"
msgstr "Cláréadan Gréasán"
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
#, c-format
msgid "NFS server, SMB server, Proxy server, ssh server"
msgstr ""
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
#, c-format
msgid "Graphical Environment"
msgstr "Timpeallacht Ghrafach"
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
#, c-format
msgid "KDE Workstation"
msgstr "Stáisiún KDE"
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
#, c-format
msgid ""
"The K Desktop Environment, the basic graphical environment with a collection "
"of accompanying tools"
msgstr ""
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
#, c-format
msgid "GNOME Workstation"
msgstr "Stáisiún Gnome"
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
#, c-format
msgid ""
"A graphical environment with user-friendly set of applications and desktop "
"tools"
msgstr ""
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
#, fuzzy, c-format
msgid "LXDE Desktop"
msgstr "Deasc"
@@ -651,54 +612,52 @@ msgid ""
"applications and desktop tools"
msgstr ""
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
#, c-format
msgid "Other Graphical Desktops"
msgstr "Deasc Graphaicí Eile"
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
#, c-format
msgid "Window Maker, Enlightenment, Fvwm, etc"
msgstr ""
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
#, c-format
msgid "Utilities"
msgstr "Uirlisí"
#: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
#, c-format
msgid "SSH Server"
msgstr "Freastalaí SSH"
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
#, fuzzy, c-format
msgid "Webmin"
msgstr "Seirbishí"
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
#, fuzzy, c-format
msgid "Webmin Remote Configuration Server"
msgstr "Cumraigh Idirlíon"
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
#, fuzzy, c-format
msgid "Network Utilities/Monitoring"
msgstr "Cumraíocht Gréasánú"
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
#, c-format
msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
msgstr ""
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
#, fuzzy, c-format
msgid "Mandriva Wizards"
msgstr "Bainteach le hIdirlíon"
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
#, fuzzy, c-format
msgid "Wizards to configure server"
msgstr "Cumraigh printéir"
@@ -790,17 +749,17 @@ msgstr ""
msgid "Click on images in order to see a bigger preview"
msgstr ""
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
#, c-format
msgid "Package Group Selection"
msgstr "Roghnú Grúpa Pacáistí"
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
#, c-format
msgid "Individual package selection"
msgstr ""
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
#, c-format
msgid "Total size: %d / %d MB"
msgstr "Méid iomlán: %d / %d MB"
@@ -917,12 +876,12 @@ msgstr "Eirigh as Feistiú"
msgid "Software Management"
msgstr "Bainistíocht Bhogearraí"
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
#, c-format
msgid "Choose the packages you want to install"
msgstr ""
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
#, c-format
msgid "Installing"
msgstr "Ag Feistiú"
@@ -949,7 +908,7 @@ msgid_plural "%d packages"
msgstr[0] "%d pacáistí"
msgstr[1] "%d pacáistí"
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
#, c-format
msgid "Summary"
msgstr "Coimriú"
@@ -959,7 +918,7 @@ msgstr "Coimriú"
msgid "Configure"
msgstr "Cumraigh"
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
#, fuzzy, c-format
msgid "not configured"
msgstr "Cumraigh"
@@ -969,14 +928,14 @@ msgstr "Cumraigh"
msgid "Media Selection"
msgstr "Roghnú Grúpa Pacáistí"
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
#, c-format
msgid ""
"The following installation media have been found.\n"
"If you want to skip some of them, you can unselect them now."
msgstr ""
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
#, c-format
msgid ""
"You have the option to copy the contents of the CDs onto the hard drive "
@@ -985,7 +944,7 @@ msgid ""
"available once the system is fully installed."
msgstr ""
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
#, c-format
msgid "Copy whole CDs"
msgstr ""
@@ -1005,59 +964,49 @@ msgstr "Roghnaigh leagan amach do mhéarchláir"
msgid "Here is the full list of available keyboards:"
msgstr ""
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
#, fuzzy, c-format
msgid "Install/Upgrade"
msgstr "Feistiúi/Uadgrádaigh"
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
#, fuzzy, c-format
msgid "Is this an install or an upgrade?"
msgstr "Feistigh nó uasgrádaigh ?"
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
#, fuzzy, c-format
msgid ""
"_: This is a noun:\n"
"Install"
msgstr "Feistiú"
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
#, fuzzy, c-format
msgid "Upgrade %s"
msgstr "Uasgrádaigh"
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
#, fuzzy, c-format
msgid "Encryption key for %s"
msgstr "Ní mar a chéile na pasfhocail"
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
#, c-format
msgid "Cancel installation, reboot system"
msgstr ""
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
#, fuzzy, c-format
msgid "New Installation"
msgstr "Suiteáil"
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
#, c-format
msgid "Upgrade previous installation (not recommended)"
msgstr ""
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
#, c-format
msgid ""
"Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1069,24 +1018,24 @@ msgid ""
"Installation\"."
msgstr ""
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "IDE"
msgstr "IDE"
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "Configuring IDE"
msgstr "Ag cumraigh IDE"
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
#, c-format
msgid ""
"No free space for 1MB bootstrap! Install will continue, but to boot your "
"system, you'll need to create the bootstrap partition in DiskDrake"
msgstr ""
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
#, c-format
msgid ""
"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1094,7 +1043,7 @@ msgid ""
"DiskDrake"
msgstr ""
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
#, c-format
msgid ""
"Change your Cd-Rom!\n"
@@ -1103,153 +1052,153 @@ msgid ""
"If you do not have it, press Cancel to avoid installation from this Cd-Rom."
msgstr ""
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
#, c-format
msgid "Looking for available packages..."
msgstr "Ag curdach do na pacáistí atá ar fáil..."
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
#, c-format
msgid ""
"Your system does not have enough space left for installation or upgrade (%"
"dMB > %dMB)"
msgstr ""
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
#, c-format
msgid ""
"Please choose load or save package selection.\n"
"The format is the same as auto_install generated files."
msgstr ""
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Load"
msgstr "Lód"
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Save"
msgstr "Sábháil"
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
#, fuzzy, c-format
msgid "Bad file"
msgstr "Lódáil comhad"
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
#, fuzzy, c-format
msgid "KDE"
msgstr "IDE"
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
#, c-format
msgid "GNOME"
msgstr "GNOME"
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
#, fuzzy, c-format
msgid "Desktop Selection"
msgstr "Roghnú Grúpa Pacáistí"
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
#, c-format
msgid "You can choose your workstation desktop profile."
msgstr ""
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
#, c-format
msgid "Selected size is larger than available space"
msgstr ""
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
#, fuzzy, c-format
msgid "Type of install"
msgstr "Roghnaigh pacáistí a feistiú ..."
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
#, c-format
msgid ""
"You have not selected any group of packages.\n"
"Please choose the minimal installation you want:"
msgstr ""
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
#, c-format
msgid "With X"
msgstr "Le X"
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
#, c-format
msgid "With basic documentation (recommended!)"
msgstr ""
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
#, c-format
msgid "Truly minimal install (especially no urpmi)"
msgstr ""
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
#, c-format
msgid "Preparing installation"
msgstr "Ag Ullmhaigh feistiú"
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
#, c-format
msgid "Installing package %s"
msgstr "Ag feistiál pacáiste %s"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "There was an error ordering packages:"
msgstr ""
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "Go on anyway?"
msgstr "Lean ar aghaidh ar aon nós?"
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
#, c-format
msgid "Retry"
msgstr "Atriail"
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
#, c-format
msgid "Skip this package"
msgstr ""
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
#, c-format
msgid "Skip all packages from medium \"%s\""
msgstr ""
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
#, fuzzy, c-format
msgid "Go back to media and packages selection"
msgstr "Roghnú Grúpa Pacáistí"
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
#, fuzzy, c-format
msgid "There was an error installing package %s."
msgstr "Ag feistiál pacáiste %s"
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
#, c-format
msgid "Post-install configuration"
msgstr "Cumraíocht Iar-feistú"
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
#, c-format
msgid "Please ensure the Update Modules media is in drive %s"
msgstr ""
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
#, c-format
msgid "Updates"
msgstr "Leasuithe"
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
#, c-format
msgid ""
"You now have the opportunity to download updated packages. These packages\n"
@@ -1262,95 +1211,95 @@ msgid ""
"Do you want to install the updates?"
msgstr ""
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
#, c-format
msgid "%s on %s"
msgstr "%s ar %s"
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
#, c-format
msgid "Hardware"
msgstr "Crua-earraí"
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
#, c-format
msgid "Sound card"
msgstr "Carta Fuaim"
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
#, fuzzy, c-format
msgid "Do you have an ISA sound card?"
msgstr "An bhfuil ceann eile agat?"
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
#, c-format
msgid ""
"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
"card"
msgstr ""
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
#, c-format
msgid "No sound card detected. Try \"harddrake\" after installation"
msgstr ""
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
#, c-format
msgid "Graphical interface"
msgstr "Comhéadan grafach"
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
#, c-format
msgid "Network & Internet"
msgstr "Gréasán agus Idirlíon"
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
#, c-format
msgid "Proxies"
msgstr "Ionadaithe"
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
#, c-format
msgid "configured"
msgstr "cumraithe"
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
#, c-format
msgid "Security Level"
msgstr "Leibhéal Slándála"
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
#, c-format
msgid "Firewall"
msgstr "Bac slándála"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "activated"
msgstr ""
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "disabled"
msgstr "díchumasaithe"
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
#, c-format
msgid "You have not configured X. Are you sure you really want this?"
msgstr ""
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
#, c-format
msgid "Preparing bootloader..."
msgstr "Ag Ullmhaigh ríomhchlar thosnaithe..."
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
#, c-format
msgid "Be patient, this may take a while..."
msgstr ""
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
#, c-format
msgid ""
"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1359,24 +1308,24 @@ msgid ""
"root fs is: root=%s"
msgstr ""
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
#, c-format
msgid ""
"In this security level, access to the files in the Windows partition is "
"restricted to the administrator."
msgstr ""
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr "Cur isteach diosca folamh sa dioscthiomant %s"
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
#, c-format
msgid "Creating auto install floppy..."
msgstr ""
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
#, c-format
msgid ""
"Some steps are not completed.\n"
@@ -1384,7 +1333,7 @@ msgid ""
"Do you really want to quit now?"
msgstr ""
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
#, c-format
msgid "Congratulations"
msgstr "Comhghairdeas"
@@ -1529,6 +1478,10 @@ msgid ""
msgstr "Scoir"
#, fuzzy
+#~ msgid "Downloading file %s..."
+#~ msgstr "Sabháil i gcomhad"
+
+#, fuzzy
#~ msgid "IceWm Desktop"
#~ msgstr "Deasc"
diff --git a/perl-install/install/share/po/gl.po b/perl-install/install/share/po/gl.po
index be1c8c85e..aa0be4fb7 100644
--- a/perl-install/install/share/po/gl.po
+++ b/perl-install/install/share/po/gl.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: DrakX-gl\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
"PO-Revision-Date: 2008-04-13 20:40+0100\n"
"Last-Translator: Leandro Regueiro <leandro DOT regueiro AT gmail DOT com>\n"
"Language-Team: Galician <proxecto@trasno.net>\n"
@@ -18,31 +18,6 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr "O seu escritorio nunha chave USB"
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr "A distribución de Mandriva Linux 100%% código aberto"
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr "Explore Linux de forma sinxela con Mandriva One"
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr "Un escritorio Mandriva Linux completo, son soporte"
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr "Mandriva: distribucións para as necesidades de cada un"
-
#: any.pm:109
#, c-format
msgid "Do you have further supplementary media?"
@@ -82,17 +57,17 @@ msgstr "Rede (FTP)"
msgid "Network (NFS)"
msgstr "Rede (NFS)"
-#: any.pm:163
+#: any.pm:165
#, c-format
msgid "URL of the mirror?"
msgstr "Cal é o URL do sitio espello?"
-#: any.pm:169
+#: any.pm:171
#, c-format
msgid "URL must start with ftp:// or http://"
msgstr "O URL debe comezar por ftp:// ou por http://"
-#: any.pm:180
+#: any.pm:182
#, c-format
msgid ""
"Contacting Mandriva Linux web site to get the list of available mirrors..."
@@ -100,7 +75,7 @@ msgstr ""
"Contactando co sitio web de Mandriva Linux para obte-la lista de sitios "
"espello dispoñibles..."
-#: any.pm:185
+#: any.pm:187
#, c-format
msgid ""
"Failed contacting Mandriva Linux web site to get the list of available "
@@ -109,47 +84,47 @@ msgstr ""
"Fallo ó contactar co sitio web de Mandriva Linux para obte-la lista de "
"sitios espello dispoñibles"
-#: any.pm:195
+#: any.pm:197
#, c-format
msgid "Choose a mirror from which to get the packages"
msgstr "Escolla un sitio espello dende o que obte-los paquetes"
-#: any.pm:225
+#: any.pm:227
#, c-format
msgid "NFS setup"
msgstr "Configuración de NFS"
-#: any.pm:226
+#: any.pm:228
#, c-format
msgid "Please enter the hostname and directory of your NFS media"
msgstr "Introduza o nome de máquina e o directorio do soporte NFS"
-#: any.pm:230
+#: any.pm:232
#, c-format
msgid "Hostname missing"
msgstr "Falta o nome de máquina"
-#: any.pm:231
+#: any.pm:233
#, c-format
msgid "Directory must begin with \"/\""
msgstr "O directorio debe comezar por \"/\""
-#: any.pm:235
+#: any.pm:237
#, fuzzy, c-format
msgid "Hostname of the NFS mount ?"
msgstr "Cal é o nome de máquina da montaxe NFS?"
-#: any.pm:236
+#: any.pm:238
#, c-format
msgid "Directory"
msgstr "Directorio"
-#: any.pm:258
+#: any.pm:260
#, c-format
msgid "Supplementary"
msgstr ""
-#: any.pm:293
+#: any.pm:295
#, c-format
msgid ""
"Can't find a package list file on this mirror. Make sure the location is "
@@ -158,22 +133,22 @@ msgstr ""
"Non se puido atopar un ficheiro de lista de paquetes neste sitio espello.\n"
"Asegúrese de que a localización é a correcta."
-#: any.pm:328
+#: any.pm:334
#, c-format
msgid "Looking at packages already installed..."
msgstr "Buscando os paquetes que xa están instalados..."
-#: any.pm:362
+#: any.pm:368
#, c-format
msgid "Finding packages to upgrade..."
msgstr "Buscando paquetes para actualizar..."
-#: any.pm:381
+#: any.pm:387
#, c-format
msgid "Removing packages prior to upgrade..."
msgstr "Eliminando paquetes antes de actualizar..."
-#: any.pm:402
+#: any.pm:408
#, c-format
msgid ""
"You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -185,18 +160,18 @@ msgid ""
"please reboot your system and upgrade using the Mandriva update applet."
msgstr ""
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
#, c-format
msgid "Reboot"
msgstr "Reiniciar"
-#: any.pm:407
+#: any.pm:413
#, c-format
msgid "Proceed"
msgstr ""
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -210,72 +185,72 @@ msgstr ""
"\n"
"Desexa eliminar estes paquetes?\n"
-#: any.pm:815
+#: any.pm:821
#, c-format
msgid "Error reading file %s"
msgstr "Erro ó le-lo ficheiro %s"
-#: any.pm:1022
+#: any.pm:1028
#, c-format
msgid "The following disk(s) were renamed:"
msgstr "Renomeáronse os seguintes discos:"
-#: any.pm:1024
+#: any.pm:1030
#, c-format
msgid "%s (previously named as %s)"
msgstr "%s (chamado anteriormente %s)"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "HTTP"
msgstr "HTTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "FTP"
msgstr "FTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "NFS"
msgstr "NFS"
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
#, c-format
msgid "Network"
msgstr "Rede"
-#: any.pm:1104
+#: any.pm:1110
#, c-format
msgid "Please choose a media"
msgstr "Escolla un soporte"
-#: any.pm:1120
+#: any.pm:1126
#, c-format
msgid "File already exists. Overwrite it?"
msgstr "O ficheiro xa existe. ¿Desexa sobreescribilo?"
-#: any.pm:1124
+#: any.pm:1130
#, c-format
msgid "Permission denied"
msgstr "Permiso denegado"
-#: any.pm:1172
+#: any.pm:1178
#, c-format
msgid "Bad NFS name"
msgstr "Nome NFS incorrecto"
-#: any.pm:1193
+#: any.pm:1199
#, c-format
msgid "Bad media %s"
msgstr "O soporte %s é incorrecto"
-#: any.pm:1236
+#: any.pm:1242
#, c-format
msgid "Can not make screenshots before partitioning"
msgstr "Non se pode captura-la pantalla antes de face-las particións"
-#: any.pm:1244
+#: any.pm:1250
#, c-format
msgid "Screenshots will be available after install in %s"
msgstr "Poderanse facer capturas de pantalla despois de instalar en %s"
@@ -286,11 +261,15 @@ msgid "Installation"
msgstr "Instalación"
#: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
#, c-format
msgid "Configuration"
msgstr "Configuración"
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
#: install2.pm:168
#, c-format
msgid "You must also format %s"
@@ -315,22 +294,22 @@ msgstr "Activando a rede"
msgid "Bringing down the network"
msgstr "Desactivando a rede"
-#: media.pm:402
+#: media.pm:399
#, c-format
msgid "Please wait, retrieving file"
msgstr ""
-#: media.pm:734
+#: media.pm:718
#, c-format
-msgid "Downloading file %s..."
-msgstr "Descargando o ficheiro %s..."
+msgid "unable to add medium"
+msgstr ""
-#: media.pm:822
+#: media.pm:758
#, c-format
msgid "Copying some packages on disks for future use"
msgstr "Copiando algúns paquetes dos discos para un uso posterior"
-#: media.pm:875
+#: media.pm:811
#, c-format
msgid "Copying in progress"
msgstr "Copiando"
@@ -374,27 +353,27 @@ msgstr ""
msgid "An error occurred:"
msgstr "Ocorreu un erro"
-#: pkgs.pm:776
+#: pkgs.pm:780
#, c-format
msgid "%d installation transactions failed"
msgstr "fallaron %d transaccións de instalación"
-#: pkgs.pm:777
+#: pkgs.pm:781
#, fuzzy, c-format
msgid "Installation of packages failed:"
msgstr "Instalando o paquete %s"
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
#, c-format
msgid "Workstation"
msgstr "Estación de traballo"
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
#, c-format
msgid "Office Workstation"
msgstr "Estación de Traballo de Oficina"
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
#, c-format
msgid ""
"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -403,7 +382,7 @@ msgstr ""
"Programas de oficina: procesadores de texto (OpenOffice.org Writer, Kword), "
"follas de cálculo (OpenOffice.org Calc, Kspread), visualizadores de pdf, etc"
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
#, c-format
msgid ""
"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -412,32 +391,32 @@ msgstr ""
"Programas de oficina: procesadores de texto (kword, abiword), follas de "
"cálculo (kspread, gnumeric), visualizadores de pdf, etc"
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
#, c-format
msgid "Game station"
msgstr "Estación de xogos"
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
#, c-format
msgid "Amusement programs: arcade, boards, strategy, etc"
msgstr "Programas de diversión: arcade, taboleiros, estratexia, etc"
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
#, c-format
msgid "Multimedia station"
msgstr "Estación multimedia"
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
#, c-format
msgid "Sound and video playing/editing programs"
msgstr "Programas de reproducción e edición de son e vídeo"
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
#, c-format
msgid "Internet station"
msgstr "Estación de Internet"
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
#, c-format
msgid ""
"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -446,212 +425,194 @@ msgstr ""
"Conxunto de ferramentas para ler e enviar correo-e e novas (mutt, tin...) e "
"para navegar pola Web"
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
#, c-format
msgid "Network Computer (client)"
msgstr "Ordenador de Rede (cliente)"
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
#, c-format
msgid "Clients for different protocols including ssh"
msgstr "Clientes para diferentes protocolos incluíndo ssh"
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
#, c-format
msgid "Tools to ease the configuration of your computer"
msgstr "Ferramentas para facilita-la configuración do ordenador"
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
#, c-format
msgid "Console Tools"
msgstr "Ferramentas de Consola"
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
#, c-format
msgid "Editors, shells, file tools, terminals"
msgstr "Editores, shells, ferramentas de ficheiro, terminais"
#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
#, c-format
msgid "Development"
msgstr "Desenvolvemento"
#: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
#, c-format
msgid "C and C++ development libraries, programs and include files"
msgstr ""
"Bibliotecas de desenvolvemento de C e C++, programas e ficheiros include"
#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
#, c-format
msgid "Documentation"
msgstr "Documentación"
#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
#, c-format
msgid "Books and Howto's on Linux and Free Software"
msgstr "Libros e Howtos sobre Linux e o Software Libre"
#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
#, c-format
msgid "LSB"
msgstr "LSB"
#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
#, c-format
msgid "Linux Standard Base. Third party applications support"
msgstr "Linux Standard Base. Soporte para aplicacións de terceiros"
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
#, c-format
msgid "Web Server"
msgstr "Servidor Web"
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
#, c-format
msgid "Apache"
msgstr "Apache"
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
#, c-format
msgid "Groupware"
msgstr "Groupware"
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
#, c-format
msgid "Kolab Server"
msgstr "Servidor Kolab"
#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
#, c-format
msgid "Firewall/Router"
msgstr "Cortalumes/Encamiñador"
#: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
#, c-format
msgid "Internet gateway"
msgstr "Pasarela de Internet"
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
#, c-format
msgid "Mail/News"
msgstr "Correo/Novas"
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
#, c-format
msgid "Postfix mail server, Inn news server"
msgstr "Servidor de correo Postfix, servidor de novas Inn"
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
#, c-format
msgid "Directory Server"
msgstr "Servidor de Directorio"
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
#, c-format
msgid "FTP Server"
msgstr "Servidor FTP"
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
#, c-format
msgid "ProFTPd"
msgstr "ProFTPd"
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
#, c-format
msgid "DNS/NIS"
msgstr "DNS/NIS"
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
#, c-format
msgid "Domain Name and Network Information Server"
msgstr "Servidor de Nomes de Dominio e Información de Rede"
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
#, c-format
msgid "File and Printer Sharing Server"
msgstr "Servidor de Compartimento de Impresoras e Ficheiros"
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
#, c-format
msgid "NFS Server, Samba server"
msgstr "Servidor NFS, servidor Samba"
#: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
#, c-format
msgid "Database"
msgstr "Bases de datos"
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
#, c-format
msgid "PostgreSQL and MySQL Database Server"
msgstr "Servidores de bases de datos PostgreSQL e MySQL"
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
#, c-format
msgid "Web/FTP"
msgstr "Web/FTP"
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
#, c-format
msgid "Apache, Pro-ftpd"
msgstr "Apache, Pro-ftpd"
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
#, c-format
msgid "Mail"
msgstr "Correo-e"
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
#, c-format
msgid "Postfix mail server"
msgstr "Servidor de correo Postfix"
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
#, c-format
msgid "PostgreSQL or MySQL database server"
msgstr "Servidores de bases de datos PostgreSQL ou MySQL"
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
#, c-format
msgid "Network Computer server"
msgstr "Servidor de Redes de Ordenadores"
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
#, c-format
msgid "NFS server, SMB server, Proxy server, ssh server"
msgstr "Servidor NFS, servidor SMB, servidor Proxy, servidor ssh"
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
#, c-format
msgid "Graphical Environment"
msgstr "Ambiente Gráfico"
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
#, c-format
msgid "KDE Workstation"
msgstr "Estación de Traballo KDE"
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
#, c-format
msgid ""
"The K Desktop Environment, the basic graphical environment with a collection "
@@ -660,12 +621,12 @@ msgstr ""
"O Ambiente de Escritorio KDE, o ambiente gráfico básico cunha colección de "
"ferramentas que o acompañan"
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
#, c-format
msgid "GNOME Workstation"
msgstr "Estación de Traballo GNOME"
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
#, c-format
msgid ""
"A graphical environment with user-friendly set of applications and desktop "
@@ -674,7 +635,7 @@ msgstr ""
"Un ambiente gráfico cun conxunto de aplicacións amigables e ferramentas de "
"escritorio"
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
#, fuzzy, c-format
msgid "LXDE Desktop"
msgstr "Escritorio IceWm"
@@ -688,55 +649,53 @@ msgstr ""
"Un ambiente gráfico cun conxunto de aplicacións amigables e ferramentas de "
"escritorio"
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
#, c-format
msgid "Other Graphical Desktops"
msgstr "Outros Escritorios Gráficos"
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
#, c-format
msgid "Window Maker, Enlightenment, Fvwm, etc"
msgstr "Window Maker, Enlightenment, Fvwm, etc"
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
#, c-format
msgid "Utilities"
msgstr "Utilidades"
#: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
#, c-format
msgid "SSH Server"
msgstr "Servidor SSH"
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
#, c-format
msgid "Webmin"
msgstr "Webmin"
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
#, c-format
msgid "Webmin Remote Configuration Server"
msgstr "Servidor de Configuración Remota Webmin"
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
#, c-format
msgid "Network Utilities/Monitoring"
msgstr "Monitorización/Utilidades de Rede"
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
#, c-format
msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
msgstr ""
"Ferramentas de monitorización, accounting de procesos, tcpdump, nmap, ..."
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
#, c-format
msgid "Mandriva Wizards"
msgstr "Asistentes de Mandriva"
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
#, c-format
msgid "Wizards to configure server"
msgstr "Asistentes para configurar o servidor"
@@ -836,17 +795,17 @@ msgstr ""
msgid "Click on images in order to see a bigger preview"
msgstr ""
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
#, c-format
msgid "Package Group Selection"
msgstr "Selección de Grupos de Paquetes"
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
#, c-format
msgid "Individual package selection"
msgstr "Selección individual de paquetes"
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
#, c-format
msgid "Total size: %d / %d MB"
msgstr "Tamaño total: %d / %d MB"
@@ -965,12 +924,12 @@ msgstr "Instalación mínima"
msgid "Software Management"
msgstr "Xestión do Software"
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
#, c-format
msgid "Choose the packages you want to install"
msgstr "Escolla os paquetes que desexa instalar"
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
#, c-format
msgid "Installing"
msgstr "Instalando"
@@ -997,7 +956,7 @@ msgid_plural "%d packages"
msgstr[0] "%d paquete"
msgstr[1] "%d paquetes"
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
#, c-format
msgid "Summary"
msgstr "Resumo"
@@ -1007,7 +966,7 @@ msgstr "Resumo"
msgid "Configure"
msgstr "Configurar"
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
#, c-format
msgid "not configured"
msgstr "non configurado"
@@ -1017,7 +976,7 @@ msgstr "non configurado"
msgid "Media Selection"
msgstr "Selección de Grupos de Paquetes"
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
#, c-format
msgid ""
"The following installation media have been found.\n"
@@ -1026,7 +985,7 @@ msgstr ""
"Atopáronse os seguintes soportes de instalación.\n"
"Se desexa saltar algún deles, pode deseleccionalo agora."
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
#, c-format
msgid ""
"You have the option to copy the contents of the CDs onto the hard drive "
@@ -1039,7 +998,7 @@ msgstr ""
"Esta continuará despois dende o disco duro e os paquetes permanecerán "
"dispoñibles unha vez que o sistema xa estea instalado."
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
#, c-format
msgid "Copy whole CDs"
msgstr "Copiar CDs enteiros"
@@ -1059,63 +1018,49 @@ msgstr "Escolla a disposición do seu teclado"
msgid "Here is the full list of available keyboards:"
msgstr "Esta é a lista completa dos teclados dispoñibles"
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
#, c-format
msgid "Install/Upgrade"
msgstr "Instalar/Actualizar"
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
#, c-format
msgid "Is this an install or an upgrade?"
msgstr "¿É unha instalación ou unha actualización?"
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
#, c-format
msgid ""
"_: This is a noun:\n"
"Install"
msgstr "Instalación"
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
#, c-format
msgid "Upgrade %s"
msgstr "Actualizar %s"
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr ""
-"Non está soportada a actualización dende unha distribución de 32 bits a unha "
-"de 64 bits"
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr ""
-"Non está soportada a actualización dende unha distribución de 64 bits a unha "
-"de 32 bits"
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
#, c-format
msgid "Encryption key for %s"
msgstr "Clave de cifrado para %s"
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
#, c-format
msgid "Cancel installation, reboot system"
msgstr ""
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
#, fuzzy, c-format
msgid "New Installation"
msgstr "Instalación"
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
#, c-format
msgid "Upgrade previous installation (not recommended)"
msgstr ""
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
#, c-format
msgid ""
"Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1127,17 +1072,17 @@ msgid ""
"Installation\"."
msgstr ""
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "IDE"
msgstr "IDE"
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "Configuring IDE"
msgstr "Configurando IDE"
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
#, c-format
msgid ""
"No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1147,7 +1092,7 @@ msgstr ""
"pero para arrincar o seu sistema, cómpre crear a partición bootstrap en "
"DiskDrake"
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
#, fuzzy, c-format
msgid ""
"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1158,7 +1103,7 @@ msgstr ""
"instalación vai continuar, pero para arrincar o sistema, terá que a "
"partición bootstrap con DiskDrake"
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
#, c-format
msgid ""
"Change your Cd-Rom!\n"
@@ -1170,12 +1115,12 @@ msgstr ""
"Insira o CD-ROM que teña a etiqueta \"%s\" na unidade e prema Aceptar.\n"
"Se non o ten, prema Cancelar para omiti-la instalación deste CD-ROM."
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
#, c-format
msgid "Looking for available packages..."
msgstr "Buscando os paquetes dispoñibles..."
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
#, c-format
msgid ""
"Your system does not have enough space left for installation or upgrade (%"
@@ -1184,7 +1129,7 @@ msgstr ""
"O seu sistema non ten espacio libre dabondo para a instalación ou "
"actualización (%dMB > %dMB)"
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
#, c-format
msgid ""
"Please choose load or save package selection.\n"
@@ -1193,54 +1138,54 @@ msgstr ""
"Elixa cargar ou gardar a selección de paquetes.\n"
"O formato é o mesmo có dos ficheiros xerados por auto_install."
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Load"
msgstr "Cargar"
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Save"
msgstr "Gardar"
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
#, c-format
msgid "Bad file"
msgstr "Ficheiro erróneo"
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
#, fuzzy, c-format
msgid "KDE"
msgstr "IDE"
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
#, c-format
msgid "GNOME"
msgstr "GNOME"
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
#, fuzzy, c-format
msgid "Desktop Selection"
msgstr "Selección de Grupos de Paquetes"
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
#, fuzzy, c-format
msgid "You can choose your workstation desktop profile."
msgstr ""
"Pode elixir o seu perfil de escritorio de estación de traballo: KDE, GNOME "
"ou Personalizado"
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
#, c-format
msgid "Selected size is larger than available space"
msgstr "O tamaño seleccionado é maior có tamaño dispoñible"
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
#, c-format
msgid "Type of install"
msgstr "Tipo de instalación"
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
#, c-format
msgid ""
"You have not selected any group of packages.\n"
@@ -1249,83 +1194,83 @@ msgstr ""
"Non seleccionou ningún grupo de paquetes.\n"
"Seleccione a instalación mínima que desexa:"
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
#, c-format
msgid "With X"
msgstr "Con X"
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
#, c-format
msgid "With basic documentation (recommended!)"
msgstr "Ca documentación básica (¡recomendado!)"
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
#, c-format
msgid "Truly minimal install (especially no urpmi)"
msgstr "Instalación realmente mínima (especialmente sen urpmi)"
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
#, c-format
msgid "Preparing installation"
msgstr "Preparando a instalación"
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
#, c-format
msgid "Installing package %s"
msgstr "Instalando o paquete %s"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "There was an error ordering packages:"
msgstr "Houbo un erro ó ordena-los paquetes:"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "Go on anyway?"
msgstr "¿Continuar de tódolos xeitos?"
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
#, c-format
msgid "Retry"
msgstr "Volver tentar"
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
#, c-format
msgid "Skip this package"
msgstr "Omitir este paquete"
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
#, c-format
msgid "Skip all packages from medium \"%s\""
msgstr "Omitir tódolos paquetes do soporte \"%s\""
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
#, c-format
msgid "Go back to media and packages selection"
msgstr "Volver a soportes e selección de paquetes"
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
#, c-format
msgid "There was an error installing package %s."
msgstr "Houbo un erro ó instala-ls paquetes %s."
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
#, c-format
msgid "Post-install configuration"
msgstr "Configuración trala instalación"
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
#, c-format
msgid "Please ensure the Update Modules media is in drive %s"
msgstr ""
"Asegúrese de que o soporte de Módulos de Actualización está na unidade %s"
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
#, c-format
msgid "Updates"
msgstr "Actualizacións"
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
#, c-format
msgid ""
"You now have the opportunity to download updated packages. These packages\n"
@@ -1346,28 +1291,28 @@ msgstr ""
"\n"
"Desexa instala-las actualizacións?"
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
#, c-format
msgid "%s on %s"
msgstr "%s en %s"
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
#, c-format
msgid "Hardware"
msgstr "Hardware"
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
#, c-format
msgid "Sound card"
msgstr "Tarxeta de son"
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
#, c-format
msgid "Do you have an ISA sound card?"
msgstr "Ten unha tarxeta de son ISA?"
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
#, c-format
msgid ""
"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1376,69 +1321,69 @@ msgstr ""
"Execute \"alsaconf\" ou \"sndconfig\" despois da instalación para configura-"
"la tarxeta de son"
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
#, c-format
msgid "No sound card detected. Try \"harddrake\" after installation"
msgstr ""
"Non se detectou ningunha tarxeta de son. Execute \"harddrake\" trala "
"instalación"
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
#, c-format
msgid "Graphical interface"
msgstr "Interface Gráfica"
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
#, c-format
msgid "Network & Internet"
msgstr "Rede & Internet"
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
#, c-format
msgid "Proxies"
msgstr "Proxys"
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
#, c-format
msgid "configured"
msgstr "configurado"
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
#, c-format
msgid "Security Level"
msgstr "Nivel de Seguridade"
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
#, c-format
msgid "Firewall"
msgstr "Cortalumes"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "activated"
msgstr "activado"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "disabled"
msgstr "desactivado"
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
#, c-format
msgid "You have not configured X. Are you sure you really want this?"
msgstr "Non configurou as X. Está seguro de que desexa isto?"
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
#, c-format
msgid "Preparing bootloader..."
msgstr "Preparando o cargador de arrinque..."
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
#, c-format
msgid "Be patient, this may take a while..."
msgstr ""
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
#, c-format
msgid ""
"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1451,7 +1396,7 @@ msgstr ""
"continuar, pero ha ter que usar BootX ou algún outro recurso para arrincar a "
"máquina. O argumento do kernel para o sistema de ficheiros raíz é: root=%s"
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
#, c-format
msgid ""
"In this security level, access to the files in the Windows partition is "
@@ -1460,17 +1405,17 @@ msgstr ""
"Con este nivel de seguridade, o acceso ós ficheiros da partición Windows "
"está restrinxido ó administrador."
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr "Insira un disquete baleiro na unidade %s"
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
#, c-format
msgid "Creating auto install floppy..."
msgstr "Creando un disquete de instalación automática..."
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
#, c-format
msgid ""
"Some steps are not completed.\n"
@@ -1481,7 +1426,7 @@ msgstr ""
"\n"
"Desexa saír agora?"
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
#, c-format
msgid "Congratulations"
msgstr "Noraboa"
@@ -1625,6 +1570,34 @@ msgid ""
"Exit"
msgstr "Sair"
+#~ msgid "Your desktop on a USB key"
+#~ msgstr "O seu escritorio nunha chave USB"
+
+#~ msgid "The 100%% open source Mandriva Linux distribution"
+#~ msgstr "A distribución de Mandriva Linux 100%% código aberto"
+
+#~ msgid "Explore Linux easily with Mandriva One"
+#~ msgstr "Explore Linux de forma sinxela con Mandriva One"
+
+#~ msgid "A full Mandriva Linux desktop, with support"
+#~ msgstr "Un escritorio Mandriva Linux completo, son soporte"
+
+#~ msgid "Mandriva: distributions for everybody's needs"
+#~ msgstr "Mandriva: distribucións para as necesidades de cada un"
+
+#~ msgid "Downloading file %s..."
+#~ msgstr "Descargando o ficheiro %s..."
+
+#~ msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
+#~ msgstr ""
+#~ "Non está soportada a actualización dende unha distribución de 32 bits a "
+#~ "unha de 64 bits"
+
+#~ msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
+#~ msgstr ""
+#~ "Non está soportada a actualización dende unha distribución de 64 bits a "
+#~ "unha de 32 bits"
+
#~ msgid ""
#~ "You have selected the following server(s): %s\n"
#~ "\n"
diff --git a/perl-install/install/share/po/he.po b/perl-install/install/share/po/he.po
index 4fa534768..25da0658e 100644
--- a/perl-install/install/share/po/he.po
+++ b/perl-install/install/share/po/he.po
@@ -14,7 +14,7 @@ msgid ""
msgstr ""
"Project-Id-Version: DrakX\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
"PO-Revision-Date: 2008-09-30 18:23+0200\n"
"Last-Translator: Dotan Kamber <kamberd@yahoo.com>\n"
"Language-Team: Hebrew\n"
@@ -24,31 +24,6 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: KBabel 1.11.4\n"
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr "שולחן העבודה שלך במפתח USB"
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr "הפצת מנדריבה לינוקס שהיא 100%% קוד פתוח"
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr "בדוק את לינוקס בקלות עם מנדריבה One"
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr "שולחן עבודה מלא של מנדריבה לינוקס, עם תמיכה"
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr "מנדריבה: הפצות לצרכים של כל אחד"
-
#: any.pm:109
#, c-format
msgid "Do you have further supplementary media?"
@@ -88,70 +63,70 @@ msgstr "רשת (FTP)"
msgid "Network (NFS)"
msgstr "רשת (NFS)"
-#: any.pm:163
+#: any.pm:165
#, c-format
msgid "URL of the mirror?"
msgstr "כתובת URL של אתר המראה?"
-#: any.pm:169
+#: any.pm:171
#, c-format
msgid "URL must start with ftp:// or http://"
msgstr "על הכתובת להתחיל ב-//:ftp או ב-//:http"
-#: any.pm:180
+#: any.pm:182
#, c-format
msgid ""
"Contacting Mandriva Linux web site to get the list of available mirrors..."
msgstr "מתחבר לאתר מנדריבה לינוקס בכדי לקבל רשימה של אתרי מראה זמינים..."
-#: any.pm:185
+#: any.pm:187
#, c-format
msgid ""
"Failed contacting Mandriva Linux web site to get the list of available "
"mirrors"
msgstr "כשל בחיבור לאתר מנדריבה לינוקס בכדי לקבל רשימה של אתרי מראה זמינים"
-#: any.pm:195
+#: any.pm:197
#, c-format
msgid "Choose a mirror from which to get the packages"
msgstr "עליך לבחור את אתר המראה ממנו יורדו החבילות"
-#: any.pm:225
+#: any.pm:227
#, c-format
msgid "NFS setup"
msgstr "הגדרת NFS"
-#: any.pm:226
+#: any.pm:228
#, c-format
msgid "Please enter the hostname and directory of your NFS media"
msgstr "נא להזין את שם המארח ואת התיקיה בה נמצא מקור ה-NFS"
-#: any.pm:230
+#: any.pm:232
#, c-format
msgid "Hostname missing"
msgstr "שם המארח חסר"
-#: any.pm:231
+#: any.pm:233
#, c-format
msgid "Directory must begin with \"/\""
msgstr "על התיקיה להתחיל ב=\"/\""
-#: any.pm:235
+#: any.pm:237
#, c-format
msgid "Hostname of the NFS mount ?"
msgstr "שם המארח של עיגון ה-NFS?"
-#: any.pm:236
+#: any.pm:238
#, c-format
msgid "Directory"
msgstr "ספרייה"
-#: any.pm:258
+#: any.pm:260
#, c-format
msgid "Supplementary"
msgstr "תוספים"
-#: any.pm:293
+#: any.pm:295
#, c-format
msgid ""
"Can't find a package list file on this mirror. Make sure the location is "
@@ -159,22 +134,22 @@ msgid ""
msgstr ""
"אין אפשרות למצוא קובץ המכיל רשימת חבילות במקור זה. נא לוודא שהכתובת תקינה."
-#: any.pm:328
+#: any.pm:334
#, c-format
msgid "Looking at packages already installed..."
msgstr "מחפש חבילות שכבר מותקנות..."
-#: any.pm:362
+#: any.pm:368
#, c-format
msgid "Finding packages to upgrade..."
msgstr "מאתר חבילות שיש לשדרג..."
-#: any.pm:381
+#: any.pm:387
#, c-format
msgid "Removing packages prior to upgrade..."
msgstr "מסיר חבילות לפני השדרוג..."
-#: any.pm:402
+#: any.pm:408
#, c-format
msgid ""
"You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -186,18 +161,18 @@ msgid ""
"please reboot your system and upgrade using the Mandriva update applet."
msgstr ""
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
#, c-format
msgid "Reboot"
msgstr "הפעלה מחדש"
-#: any.pm:407
+#: any.pm:413
#, c-format
msgid "Proceed"
msgstr ""
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -210,72 +185,72 @@ msgstr ""
"\n"
"האם באמת ברצונך להסיר חבילות אלה?\n"
-#: any.pm:815
+#: any.pm:821
#, c-format
msgid "Error reading file %s"
msgstr "שגיאה בקריאת הקובץ %s"
-#: any.pm:1022
+#: any.pm:1028
#, c-format
msgid "The following disk(s) were renamed:"
msgstr "שמות הכוננ(ים) הבאים שונו:"
-#: any.pm:1024
+#: any.pm:1030
#, c-format
msgid "%s (previously named as %s)"
msgstr "%s (השם הקודם הוא %s)"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "HTTP"
msgstr "HTTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "FTP"
msgstr "FTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "NFS"
msgstr "NFS"
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
#, c-format
msgid "Network"
msgstr "רשת"
-#: any.pm:1104
+#: any.pm:1110
#, c-format
msgid "Please choose a media"
msgstr "עליך לבחור מקור"
-#: any.pm:1120
+#: any.pm:1126
#, c-format
msgid "File already exists. Overwrite it?"
msgstr "הקובץ כבר קיים. לשכתב?"
-#: any.pm:1124
+#: any.pm:1130
#, c-format
msgid "Permission denied"
msgstr "הגישה נדחתה"
-#: any.pm:1172
+#: any.pm:1178
#, c-format
msgid "Bad NFS name"
msgstr "שם NFS לא-תקין"
-#: any.pm:1193
+#: any.pm:1199
#, c-format
msgid "Bad media %s"
msgstr "המקור %s אינו תקין"
-#: any.pm:1236
+#: any.pm:1242
#, c-format
msgid "Can not make screenshots before partitioning"
msgstr "אין אפשרות לשמור תמונות מסך לפני חלוקה למחיצות"
-#: any.pm:1244
+#: any.pm:1250
#, c-format
msgid "Screenshots will be available after install in %s"
msgstr "ניתן למצוא את תמונות המסך אחרי התקנה ב%s"
@@ -286,11 +261,15 @@ msgid "Installation"
msgstr "התקנה"
#: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
#, c-format
msgid "Configuration"
msgstr "הגדרות"
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
#: install2.pm:168
#, c-format
msgid "You must also format %s"
@@ -315,22 +294,22 @@ msgstr "מאתחל את שירותי הרשת"
msgid "Bringing down the network"
msgstr "מוריד את שירותי הרשת"
-#: media.pm:402
+#: media.pm:399
#, c-format
msgid "Please wait, retrieving file"
msgstr ""
-#: media.pm:734
+#: media.pm:718
#, c-format
-msgid "Downloading file %s..."
-msgstr "מוריד קובץ %s..."
+msgid "unable to add medium"
+msgstr ""
-#: media.pm:822
+#: media.pm:758
#, c-format
msgid "Copying some packages on disks for future use"
msgstr "מעתיק מספר חבילות על הכוננים לשימוש עתידי"
-#: media.pm:875
+#: media.pm:811
#, c-format
msgid "Copying in progress"
msgstr "מעתיק את התקליטור לכונן הקשיח"
@@ -374,27 +353,27 @@ msgstr ""
msgid "An error occurred:"
msgstr "חלה שגיאה"
-#: pkgs.pm:776
+#: pkgs.pm:780
#, c-format
msgid "%d installation transactions failed"
msgstr "%d התקנות נכשלו"
-#: pkgs.pm:777
+#: pkgs.pm:781
#, fuzzy, c-format
msgid "Installation of packages failed:"
msgstr "מתקין חבילה %s"
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
#, c-format
msgid "Workstation"
msgstr "תחנת עבודה"
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
#, c-format
msgid "Office Workstation"
msgstr "תחנת עבודה משרדית"
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
#, c-format
msgid ""
"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -403,7 +382,7 @@ msgstr ""
"תוכנות משרד: מעבדי תמלילים (כתבן אופן אופיס, Kword), גיליונות אלקטרונים "
"(גיליון אופן אופיס, Kspread),מציגי pdf, ועוד"
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
#, c-format
msgid ""
"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -412,32 +391,32 @@ msgstr ""
"תוכנות משרד: מעבדי טקסט (kword, abiword), גיליונות אלקטרונים (kspread, "
"gnumeric),מציגי pdf, ועוד"
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
#, c-format
msgid "Game station"
msgstr "תחנת עבודה למשחקים"
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
#, c-format
msgid "Amusement programs: arcade, boards, strategy, etc"
msgstr "תוכנות לבידור: ארקייד, לוח, אסטרטגיה, ועוד"
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
#, c-format
msgid "Multimedia station"
msgstr "תחנת עבודה למולטימדיה"
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
#, c-format
msgid "Sound and video playing/editing programs"
msgstr "תוכנות להשמעה או עריכה של קול ווידאו"
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
#, c-format
msgid "Internet station"
msgstr "תחנת עבודה לאינטרנט"
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
#, c-format
msgid ""
"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -445,230 +424,212 @@ msgid ""
msgstr ""
"ערכת כלים לקריאה וכתיבת דוא\"ל וחדשות (pine, mutt, tin..) ולגלישה באינטרנט"
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
#, c-format
msgid "Network Computer (client)"
msgstr "מחשב רשת (לקוח)"
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
#, c-format
msgid "Clients for different protocols including ssh"
msgstr "לקוחות לפרוטוקולים שונים כולל ssh"
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
#, c-format
msgid "Tools to ease the configuration of your computer"
msgstr "כלי עזר לביצוע הגדרות המחשב שלך"
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
#, c-format
msgid "Console Tools"
msgstr "כלי מסוף"
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
#, c-format
msgid "Editors, shells, file tools, terminals"
msgstr "עורכים, מעטפות, כלי קבצים, מסופים"
#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
#, c-format
msgid "Development"
msgstr "פיתוח"
#: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
#, c-format
msgid "C and C++ development libraries, programs and include files"
msgstr "ספריות פיתוח בC וC++, תוכנות וקבצי include"
#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
#, c-format
msgid "Documentation"
msgstr "מסמכים"
#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
#, c-format
msgid "Books and Howto's on Linux and Free Software"
msgstr "ספרים ומדריכים לשימוש בלינוקס ותוכנה חופשית"
#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
#, c-format
msgid "LSB"
msgstr "LSB"
#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
#, c-format
msgid "Linux Standard Base. Third party applications support"
msgstr "תמיכה בתוכנות צד שלישי. Linux Standard Base"
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
#, c-format
msgid "Web Server"
msgstr "שרת איחסון אתרים"
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
#, c-format
msgid "Apache"
msgstr "Apache"
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
#, c-format
msgid "Groupware"
msgstr "עבודה בקבוצה"
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
#, c-format
msgid "Kolab Server"
msgstr "שרת Kolab"
#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
#, c-format
msgid "Firewall/Router"
msgstr "חומת אש/נתב"
#: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
#, c-format
msgid "Internet gateway"
msgstr "הגנת המערכת בעת חיבור לאינטרנט"
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
#, c-format
msgid "Mail/News"
msgstr "דואר/קבוצות דיון"
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
#, c-format
msgid "Postfix mail server, Inn news server"
msgstr "שרת דואר Postfix, שרת קבוצות דיון Inn"
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
#, c-format
msgid "Directory Server"
msgstr "שרת ספרייה"
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
#, c-format
msgid "FTP Server"
msgstr "שרת FTP"
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
#, c-format
msgid "ProFTPd"
msgstr "ProFTPd"
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
#, c-format
msgid "DNS/NIS"
msgstr "DNS/NIS"
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
#, c-format
msgid "Domain Name and Network Information Server"
msgstr "שרת שמות מתחם ומידע רשת"
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
#, c-format
msgid "File and Printer Sharing Server"
msgstr "שרת שיתוף קבצים ומדפסות"
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
#, c-format
msgid "NFS Server, Samba server"
msgstr "שרת NFS, שרת סמבה"
#: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
#, c-format
msgid "Database"
msgstr "מסדי נתונים"
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
#, c-format
msgid "PostgreSQL and MySQL Database Server"
msgstr "שרת מסד נתונים MySQL או PostgreSQL"
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
#, c-format
msgid "Web/FTP"
msgstr "Web/FTP"
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
#, c-format
msgid "Apache, Pro-ftpd"
msgstr "Apache, Pro-ftpd"
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
#, c-format
msgid "Mail"
msgstr "דואר"
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
#, c-format
msgid "Postfix mail server"
msgstr "שרת דואר Postfix"
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
#, c-format
msgid "PostgreSQL or MySQL database server"
msgstr "שרת מסד נתונים MySQL או PostgreSQL"
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
#, c-format
msgid "Network Computer server"
msgstr "שרת מחשב רשת"
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
#, c-format
msgid "NFS server, SMB server, Proxy server, ssh server"
msgstr "שרת NFS, שרת SMB, שרת Proxy, שרת ssh"
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
#, c-format
msgid "Graphical Environment"
msgstr "סביבה גרפית"
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
#, c-format
msgid "KDE Workstation"
msgstr "סביבת העבודה KDE"
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
#, c-format
msgid ""
"The K Desktop Environment, the basic graphical environment with a collection "
"of accompanying tools"
msgstr "סביבת שולחן עבודה פופולרית וקלה לשימוש עם מגוון יישומים נלווים"
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
#, c-format
msgid "GNOME Workstation"
msgstr "סביבת העבודה GNOME"
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
#, c-format
msgid ""
"A graphical environment with user-friendly set of applications and desktop "
"tools"
msgstr "סביבת שולחן עבודה פופולרית וקלה לשימוש עם מגוון יישומים נלווים"
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
#, fuzzy, c-format
msgid "LXDE Desktop"
msgstr "שולחן עבודה IceWm"
@@ -680,54 +641,52 @@ msgid ""
"applications and desktop tools"
msgstr "סביבת שולחן עבודה פופולרית וקלה לשימוש עם מגוון יישומים נלווים"
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
#, c-format
msgid "Other Graphical Desktops"
msgstr "סביבות עבודה אחרות"
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
#, c-format
msgid "Window Maker, Enlightenment, Fvwm, etc"
msgstr "סביבות עבודה קלילות כגון Window Maker, Enlightenment, Fvwm, ועוד"
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
#, c-format
msgid "Utilities"
msgstr "תוכנות שרות"
#: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
#, c-format
msgid "SSH Server"
msgstr "שרת SSH"
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
#, c-format
msgid "Webmin"
msgstr "Webmin"
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
#, c-format
msgid "Webmin Remote Configuration Server"
msgstr "שרת הגדרה תצורה מרחוק Webmin"
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
#, c-format
msgid "Network Utilities/Monitoring"
msgstr "כלי הגדרת וניטור רשת"
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
#, c-format
msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
msgstr "כלי ניטור, בקרת תהליכים, tcpdump , nmap, ..."
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
#, c-format
msgid "Mandriva Wizards"
msgstr "אשפי מנדריבה"
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
#, c-format
msgid "Wizards to configure server"
msgstr "אשפים להגדרת השרת שלך"
@@ -825,17 +784,17 @@ msgstr ""
msgid "Click on images in order to see a bigger preview"
msgstr ""
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
#, c-format
msgid "Package Group Selection"
msgstr "בחירת קבוצת חבילות לפי נושא"
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
#, c-format
msgid "Individual package selection"
msgstr "בחירת חבילות באופן פרטני"
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
#, c-format
msgid "Total size: %d / %d MB"
msgstr "גודל כללי: %d / %d MB"
@@ -952,12 +911,12 @@ msgstr "התקנה מינימלית"
msgid "Software Management"
msgstr "תוכנות"
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
#, c-format
msgid "Choose the packages you want to install"
msgstr "עליך לבחור את החבילות שברצונך להתקין:"
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
#, c-format
msgid "Installing"
msgstr "מתקין"
@@ -984,7 +943,7 @@ msgid_plural "%d packages"
msgstr[0] "%d חבילה"
msgstr[1] "%d חבילות"
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
#, c-format
msgid "Summary"
msgstr "סיכום ובדיקת הגדרות"
@@ -994,7 +953,7 @@ msgstr "סיכום ובדיקת הגדרות"
msgid "Configure"
msgstr "הגדרות"
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
#, c-format
msgid "not configured"
msgstr "לא מוגדר"
@@ -1004,7 +963,7 @@ msgstr "לא מוגדר"
msgid "Media Selection"
msgstr "בחירת קבוצת חבילות לפי נושא"
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
#, c-format
msgid ""
"The following installation media have been found.\n"
@@ -1013,7 +972,7 @@ msgstr ""
"מקורות התוכנה הבאים זמינים להתקנה.\n"
"באפשרותך לדלג על חלק מהמקורות על ידי ביטול הסימונים המתאימים."
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
#, c-format
msgid ""
"You have the option to copy the contents of the CDs onto the hard drive "
@@ -1025,7 +984,7 @@ msgstr ""
"אם אפשרות זו מופעלת, ההתקנה תמשיך מהכונן הקשיח, וכל החבילות מתקליטורי ההתקנה "
"יהיו זמינות אחרי סיום ההתקנה מהכונן הקשיח."
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
#, c-format
msgid "Copy whole CDs"
msgstr "העתקת תקליטורים שלמים"
@@ -1045,59 +1004,49 @@ msgstr "בשלב זה עליך להגדיר את פרישת המקלדת שלך"
msgid "Here is the full list of available keyboards:"
msgstr "להלן הרשימה המלאה של המדפסות הזמינות"
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
#, c-format
msgid "Install/Upgrade"
msgstr "התקנה/עדכון"
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
#, c-format
msgid "Is this an install or an upgrade?"
msgstr "האם זו התקנה או שידרוג?"
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
#, c-format
msgid ""
"_: This is a noun:\n"
"Install"
msgstr "התקנה"
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
#, c-format
msgid "Upgrade %s"
msgstr "שידרוג %s"
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr "שדרוג מהפצת 32ביט להפצת 64ביט אינו נתמך"
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr "שרוג מהפצת 64ביט להפצת 32 ביט אינו נתמך"
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
#, c-format
msgid "Encryption key for %s"
msgstr "מפתח הצפנה עבור %s"
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
#, c-format
msgid "Cancel installation, reboot system"
msgstr ""
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
#, fuzzy, c-format
msgid "New Installation"
msgstr "התקנה"
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
#, c-format
msgid "Upgrade previous installation (not recommended)"
msgstr ""
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
#, c-format
msgid ""
"Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1109,17 +1058,17 @@ msgid ""
"Installation\"."
msgstr ""
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "IDE"
msgstr "IDE"
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "Configuring IDE"
msgstr "מגדיר IDE"
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
#, c-format
msgid ""
"No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1128,7 +1077,7 @@ msgstr ""
"לא נמצא מקום פנוי עבור bootstrap בגודל 1MB! ההתקנה תמשיך, אבל בכדי לאתחל את "
"המערכת שלך, יהיה עליך ליצור מחיצת bootstrap באופן ידני בעזרת DiskDrake"
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
#, c-format
msgid ""
"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1138,7 +1087,7 @@ msgstr ""
"עליך ליצור PPC PReP Boot bootstrap! ההתקנה תמשיך, אבל בכדי לאתחל את המערכת "
"יהיה עליך ליצור מחיצת bootstrap באופן ידני בעזרת DiskDrak "
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
#, c-format
msgid ""
"Change your Cd-Rom!\n"
@@ -1152,19 +1101,19 @@ msgstr ""
"ולאחר מכן ללחוץ על כפתור \"אישור\". אם תקליטור זה אינו ברשותך,\n"
"עליך ללחוץ על כפתור \"ביטול\" בכדי לדלג על התקנת חבילות אלו."
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
#, c-format
msgid "Looking for available packages..."
msgstr "מחפש חבילות זמינות..."
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
#, c-format
msgid ""
"Your system does not have enough space left for installation or upgrade (%"
"dMB > %dMB)"
msgstr "למערכת שלך לא נותר די מקום להתקנה או שדרוג (%dMB > %dMB)"
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
#, c-format
msgid ""
"Please choose load or save package selection.\n"
@@ -1173,53 +1122,53 @@ msgstr ""
"עליך לבחור באם לטעון או לשמור את בחירת החבילות.\n"
"מבנה הקובץ זהה לקובץ auto_install הנוצר באופן אוטומטי."
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Load"
msgstr "הספק"
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Save"
msgstr "שמור"
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
#, c-format
msgid "Bad file"
msgstr "קובץ לא-תקין"
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
#, fuzzy, c-format
msgid "KDE"
msgstr "IDE"
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
#, c-format
msgid "GNOME"
msgstr "GNOME"
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
#, fuzzy, c-format
msgid "Desktop Selection"
msgstr "בחירת קבוצת חבילות לפי נושא"
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
#, fuzzy, c-format
msgid "You can choose your workstation desktop profile."
msgstr ""
"באפשרותך לבחור את מתאר שולחן העבודה של התחנה שלך: KDE, GNOME או מותאם אישית"
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
#, c-format
msgid "Selected size is larger than available space"
msgstr "הגודל הנבחר גדול יותר מהמקום הזמין"
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
#, c-format
msgid "Type of install"
msgstr "סוג ההתקנה"
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
#, c-format
msgid ""
"You have not selected any group of packages.\n"
@@ -1228,82 +1177,82 @@ msgstr ""
"לא נבחרה אף קבוצה של חבילות.\n"
"נא לבחור את ההתקנה המינימלית שברצונך לבצע:"
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
#, c-format
msgid "With X"
msgstr "עם סביבה גרפית (X)"
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
#, c-format
msgid "With basic documentation (recommended!)"
msgstr "עם מסמכים בסיסיים (מומלץ!)"
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
#, c-format
msgid "Truly minimal install (especially no urpmi)"
msgstr "התקנה מינימלית אמיתית (בייחוד לא urpmi)"
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
#, c-format
msgid "Preparing installation"
msgstr "מכין את ההתקנה"
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
#, c-format
msgid "Installing package %s"
msgstr "מתקין חבילה %s"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "There was an error ordering packages:"
msgstr "התרחשה שגיאה בסידור חבילות:"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "Go on anyway?"
msgstr "האם להמשיך בכל מקרה?"
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
#, c-format
msgid "Retry"
msgstr "ניסיון נוסף"
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
#, c-format
msgid "Skip this package"
msgstr "דלג על חבילה זו"
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
#, c-format
msgid "Skip all packages from medium \"%s\""
msgstr "דלג על כל החבילות ממקור \"%s\""
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
#, c-format
msgid "Go back to media and packages selection"
msgstr "חזרה לבחירת מקורות וחבילות"
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
#, c-format
msgid "There was an error installing package %s."
msgstr "חלה שגיאה בהתקנת החבילה %s"
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
#, c-format
msgid "Post-install configuration"
msgstr "מבצע הגדרות לאחר-התקנה"
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
#, c-format
msgid "Please ensure the Update Modules media is in drive %s"
msgstr "נא לודא שהמקור לעידכונים בכונן %s"
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
#, c-format
msgid "Updates"
msgstr "עדכונים"
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
#, c-format
msgid ""
"You now have the opportunity to download updated packages. These packages\n"
@@ -1322,28 +1271,28 @@ msgstr ""
"להורדת חבילות אלה נדרש חיבור אינטרנט עובד. האם ברצונך לעדכן את המערכת בשלב "
"זה ?"
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
#, c-format
msgid "%s on %s"
msgstr "%s על %s"
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
#, c-format
msgid "Hardware"
msgstr "חומרה"
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
#, c-format
msgid "Sound card"
msgstr "כרטיס קול"
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
#, c-format
msgid "Do you have an ISA sound card?"
msgstr "האם יש לך כרטיס קול ISA?"
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
#, c-format
msgid ""
"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1352,67 +1301,67 @@ msgstr ""
"עליך להריץ את \"alsaconf\" או \"sndconfig\" אחרי ההתקנה בכדי להגדיר את כרטיס "
"הקול שלך"
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
#, c-format
msgid "No sound card detected. Try \"harddrake\" after installation"
msgstr "לא זוהו כרטיסי קול. יש לנסות את האשף \"harddrake\" לאחר ההתקנה"
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
#, c-format
msgid "Graphical interface"
msgstr "ממשק גרפי"
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
#, c-format
msgid "Network & Internet"
msgstr "רשת ואינטרנט"
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
#, c-format
msgid "Proxies"
msgstr "שרתים מתווכים"
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
#, c-format
msgid "configured"
msgstr "מוגדר"
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
#, c-format
msgid "Security Level"
msgstr "סף האבטחה המבוקש:"
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
#, c-format
msgid "Firewall"
msgstr "חומת אש"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "activated"
msgstr "פועל"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "disabled"
msgstr "מנותק"
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
#, c-format
msgid "You have not configured X. Are you sure you really want this?"
msgstr "לא הוגדר ממשק גרפי (X). האם אכן ברצונך לבחור אפשרות זו?"
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
#, c-format
msgid "Preparing bootloader..."
msgstr "מכין את מנהל האתחול..."
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
#, c-format
msgid "Be patient, this may take a while..."
msgstr ""
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
#, c-format
msgid ""
"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1424,24 +1373,24 @@ msgstr ""
"במקרה זה. ההתקנה תמשך אבל יהיה עליך להשתמש ב-BootX או באמצעי אחר לאתחול "
"המערכת. משנה גלעין המערכת למערכת קבצי השורש הוא: root=%s"
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
#, c-format
msgid ""
"In this security level, access to the files in the Windows partition is "
"restricted to the administrator."
msgstr "ברמת אבטחה זו, גישה לקבצים במחיצת החלונות תתאפשר רק למנהל המערכת."
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr "נא להכניס תקליטון ריק לכונן %s"
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
#, c-format
msgid "Creating auto install floppy..."
msgstr "יוצר תקליטון הפעלה אוטומטית..."
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
#, c-format
msgid ""
"Some steps are not completed.\n"
@@ -1452,7 +1401,7 @@ msgstr ""
"\n"
"האם באמת ברצונך לצאת עכשיו?"
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
#, c-format
msgid "Congratulations"
msgstr "ברכותינו!"
@@ -1596,6 +1545,30 @@ msgid ""
"Exit"
msgstr "יציאה"
+#~ msgid "Your desktop on a USB key"
+#~ msgstr "שולחן העבודה שלך במפתח USB"
+
+#~ msgid "The 100%% open source Mandriva Linux distribution"
+#~ msgstr "הפצת מנדריבה לינוקס שהיא 100%% קוד פתוח"
+
+#~ msgid "Explore Linux easily with Mandriva One"
+#~ msgstr "בדוק את לינוקס בקלות עם מנדריבה One"
+
+#~ msgid "A full Mandriva Linux desktop, with support"
+#~ msgstr "שולחן עבודה מלא של מנדריבה לינוקס, עם תמיכה"
+
+#~ msgid "Mandriva: distributions for everybody's needs"
+#~ msgstr "מנדריבה: הפצות לצרכים של כל אחד"
+
+#~ msgid "Downloading file %s..."
+#~ msgstr "מוריד קובץ %s..."
+
+#~ msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
+#~ msgstr "שדרוג מהפצת 32ביט להפצת 64ביט אינו נתמך"
+
+#~ msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
+#~ msgstr "שרוג מהפצת 64ביט להפצת 32 ביט אינו נתמך"
+
#~ msgid ""
#~ "You have selected the following server(s): %s\n"
#~ "\n"
diff --git a/perl-install/install/share/po/hi.po b/perl-install/install/share/po/hi.po
index 7505e2a94..f7a4f80ee 100644
--- a/perl-install/install/share/po/hi.po
+++ b/perl-install/install/share/po/hi.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: DrakX-hi\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
"PO-Revision-Date: 2004-04-04 21:54+0530\n"
"Last-Translator: धनञ्जय शर्मा (Dhananjaya Sharma) <dysxhi@yahoo.co.in>\n"
"Language-Team: हिन्दी (Hindi) <dysxhi@yahoo.co.in>\n"
@@ -16,31 +16,6 @@ msgstr ""
"X-Generator: KBabel 1.3\n"
"Plural-Forms: nplurals=2; plural=(n!=1);\n"
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr ""
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr ""
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr ""
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr ""
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr ""
-
#: any.pm:109
#, fuzzy, c-format
msgid "Do you have further supplementary media?"
@@ -76,17 +51,17 @@ msgstr "%s नेटवर्क"
msgid "Network (NFS)"
msgstr ""
-#: any.pm:163
+#: any.pm:165
#, c-format
msgid "URL of the mirror?"
msgstr ""
-#: any.pm:169
+#: any.pm:171
#, c-format
msgid "URL must start with ftp:// or http://"
msgstr ""
-#: any.pm:180
+#: any.pm:182
#, c-format
msgid ""
"Contacting Mandriva Linux web site to get the list of available mirrors..."
@@ -94,7 +69,7 @@ msgstr ""
"उपलब्ध मिररों की सूची को प्राप्त करने के लिए मैनड्रिव लिनक्स वेब-स्थल से सम्पर्क किया जा "
"रहा है..."
-#: any.pm:185
+#: any.pm:187
#, fuzzy, c-format
msgid ""
"Failed contacting Mandriva Linux web site to get the list of available "
@@ -103,69 +78,69 @@ msgstr ""
"उपलब्ध मिररों की सूची को प्राप्त करने के लिए मैनड्रिव लिनक्स वेब-स्थल से सम्पर्क किया जा "
"रहा है..."
-#: any.pm:195
+#: any.pm:197
#, c-format
msgid "Choose a mirror from which to get the packages"
msgstr "एक मिरर का चयन करें जहाँ से पैकेजों को प्राप्त करना है"
-#: any.pm:225
+#: any.pm:227
#, c-format
msgid "NFS setup"
msgstr ""
-#: any.pm:226
+#: any.pm:228
#, c-format
msgid "Please enter the hostname and directory of your NFS media"
msgstr ""
-#: any.pm:230
+#: any.pm:232
#, c-format
msgid "Hostname missing"
msgstr ""
-#: any.pm:231
+#: any.pm:233
#, c-format
msgid "Directory must begin with \"/\""
msgstr ""
-#: any.pm:235
+#: any.pm:237
#, c-format
msgid "Hostname of the NFS mount ?"
msgstr ""
-#: any.pm:236
+#: any.pm:238
#, c-format
msgid "Directory"
msgstr "डिरेक्ट्री"
-#: any.pm:258
+#: any.pm:260
#, c-format
msgid "Supplementary"
msgstr ""
-#: any.pm:293
+#: any.pm:295
#, fuzzy, c-format
msgid ""
"Can't find a package list file on this mirror. Make sure the location is "
"correct."
msgstr "%s को %s पर नहीं पाया जा सका"
-#: any.pm:328
+#: any.pm:334
#, c-format
msgid "Looking at packages already installed..."
msgstr "पहिले से संसाधित पैकेजों को देखा जा रहा है..."
-#: any.pm:362
+#: any.pm:368
#, c-format
msgid "Finding packages to upgrade..."
msgstr "उन्नयन के लिये पैकेजों को खोजा जा रहा है..."
-#: any.pm:381
+#: any.pm:387
#, c-format
msgid "Removing packages prior to upgrade..."
msgstr ""
-#: any.pm:402
+#: any.pm:408
#, c-format
msgid ""
"You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -177,18 +152,18 @@ msgid ""
"please reboot your system and upgrade using the Mandriva update applet."
msgstr ""
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
#, c-format
msgid "Reboot"
msgstr "रीबूट"
-#: any.pm:407
+#: any.pm:413
#, c-format
msgid "Proceed"
msgstr ""
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -201,72 +176,72 @@ msgstr ""
"\n"
"क्या वास्तव में इन पैकेजों को हटाना चाहते है?\n"
-#: any.pm:815
+#: any.pm:821
#, c-format
msgid "Error reading file %s"
msgstr "%s संचिका को पढ़ने में त्रुटि"
-#: any.pm:1022
+#: any.pm:1028
#, fuzzy, c-format
msgid "The following disk(s) were renamed:"
msgstr "निम्नलिखित पैकेजों का संसाधन करना आवश्यक है:\n"
-#: any.pm:1024
+#: any.pm:1030
#, c-format
msgid "%s (previously named as %s)"
msgstr ""
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "HTTP"
msgstr "एचटीटीपी"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "FTP"
msgstr "एफटीपी"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "NFS"
msgstr "एनएफ़एस"
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
#, c-format
msgid "Network"
msgstr "नेटवर्क"
-#: any.pm:1104
+#: any.pm:1110
#, fuzzy, c-format
msgid "Please choose a media"
msgstr "कृपया चयन करें"
-#: any.pm:1120
+#: any.pm:1126
#, fuzzy, c-format
msgid "File already exists. Overwrite it?"
msgstr "फाईल पहले से है पुन बनाएँ"
-#: any.pm:1124
+#: any.pm:1130
#, c-format
msgid "Permission denied"
msgstr "अनुमति नहीं है"
-#: any.pm:1172
+#: any.pm:1178
#, c-format
msgid "Bad NFS name"
msgstr ""
-#: any.pm:1193
+#: any.pm:1199
#, fuzzy, c-format
msgid "Bad media %s"
msgstr "%s माध्यम को जोड़ा गया"
-#: any.pm:1236
+#: any.pm:1242
#, c-format
msgid "Can not make screenshots before partitioning"
msgstr "विभाजनीकरण के पूर्व स्क्रीन-चित्र-माला को नहीं लिया जा सकता है"
-#: any.pm:1244
+#: any.pm:1250
#, c-format
msgid "Screenshots will be available after install in %s"
msgstr "%s में संसाधन के उपरान्त स्क्रीन चित्र-माला उपलब्ध होगी"
@@ -277,11 +252,15 @@ msgid "Installation"
msgstr "संसाधन हो रहा है"
#: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
#, c-format
msgid "Configuration"
msgstr "संरचना"
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
#: install2.pm:168
#, c-format
msgid "You must also format %s"
@@ -307,22 +286,22 @@ msgstr "नेटवर्क को लाया जा रहा है"
msgid "Bringing down the network"
msgstr "नेटवर्क को लाया जा रहा है"
-#: media.pm:402
+#: media.pm:399
#, c-format
msgid "Please wait, retrieving file"
msgstr ""
-#: media.pm:734
-#, fuzzy, c-format
-msgid "Downloading file %s..."
-msgstr "संचिकायें प्रेषित की जा रही..."
+#: media.pm:718
+#, c-format
+msgid "unable to add medium"
+msgstr ""
-#: media.pm:822
+#: media.pm:758
#, c-format
msgid "Copying some packages on disks for future use"
msgstr ""
-#: media.pm:875
+#: media.pm:811
#, fuzzy, c-format
msgid "Copying in progress"
msgstr "खोज जारी है"
@@ -364,27 +343,27 @@ msgstr ""
msgid "An error occurred:"
msgstr "एक त्रुटि हो गयी है"
-#: pkgs.pm:776
+#: pkgs.pm:780
#, c-format
msgid "%d installation transactions failed"
msgstr "%d संसाधन क्रिया-कलाप असफ़ल"
-#: pkgs.pm:777
+#: pkgs.pm:781
#, fuzzy, c-format
msgid "Installation of packages failed:"
msgstr "%s पैकेज का संसाधन हो रहा है"
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
#, c-format
msgid "Workstation"
msgstr "कार्यकेंद्र"
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
#, c-format
msgid "Office Workstation"
msgstr "ऑफ़िस कार्यकेन्द्र"
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
#, fuzzy, c-format
msgid ""
"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -393,7 +372,7 @@ msgstr ""
"ऑफ़िस के कार्यक्रम: शब्दसंसाधक (केवर्ड, आबीवर्ड), स्प्रेडशीट (केस्प्रेड, जीन्यूमेरिक), पीडीएफ़ "
"अवलोक्क, इत्यादि"
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
#, c-format
msgid ""
"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -402,32 +381,32 @@ msgstr ""
"ऑफ़िस के कार्यक्रम: शब्दसंसाधक (केवर्ड, आबीवर्ड), स्प्रेडशीट (केस्प्रेड, जीन्यूमेरिक), पीडीएफ़ "
"अवलोक्क, इत्यादि"
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
#, c-format
msgid "Game station"
msgstr "खेल स्टेशन"
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
#, c-format
msgid "Amusement programs: arcade, boards, strategy, etc"
msgstr "मनोरंजक कार्यक्रम: आरकेड, बोर्ड, व्यूह-रचना, इत्यादि "
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
#, c-format
msgid "Multimedia station"
msgstr "मल्टीमीडीया केन्द्र"
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
#, c-format
msgid "Sound and video playing/editing programs"
msgstr "ध्वनि और वीडीयो के खेलने वाले/संपादन करने वाले कार्यक्रम"
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
#, c-format
msgid "Internet station"
msgstr "इन्टरनेट केन्द्र"
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
#, c-format
msgid ""
"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -436,223 +415,205 @@ msgstr ""
"विपत्र और समाचारों को पढ़ने और भेजने के लिए (मट, टिन...) और वेब को ब्राउज़ करने के लिए "
"औज़ारों का समूह"
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
#, c-format
msgid "Network Computer (client)"
msgstr "नेटवर्क कम्प्यूटर (ग्राहक)"
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
#, c-format
msgid "Clients for different protocols including ssh"
msgstr "एस०एस०एच० को शामिल करते हुए विभिन्न प्रोटोकॉलों के लिए ग्राहक"
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
#, c-format
msgid "Tools to ease the configuration of your computer"
msgstr "आपके कम्प्यूटर की संरचना कार्य को सहज बनाने हेतु अनेक औजार"
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
#, c-format
msgid "Console Tools"
msgstr "कन्सोल के औज़ार"
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
#, c-format
msgid "Editors, shells, file tools, terminals"
msgstr "अनेकों संपादक, कोश, संचिका औजार, टर्मिनल"
#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
#, c-format
msgid "Development"
msgstr "विकास"
#: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
#, c-format
msgid "C and C++ development libraries, programs and include files"
msgstr "सी और सी++ विकास लेखागार, कार्यक्रम और इन्क्लूड संचिकायें"
#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
#, c-format
msgid "Documentation"
msgstr "प्रलेखन"
#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
#, c-format
msgid "Books and Howto's on Linux and Free Software"
msgstr "लिनक्स और मुक्त सॉफ़्टवेयर पर किताबें और कैसे-करेंअस्तकें"
#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
#, c-format
msgid "LSB"
msgstr "एल०एस०बी०"
#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
#, c-format
msgid "Linux Standard Base. Third party applications support"
msgstr "लिनक्स मानकीकरण आधार ! त्रितीय पक्ष कार्यक्रमों को समर्थन"
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
#, c-format
msgid "Web Server"
msgstr "वेब सर्वर"
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
#, fuzzy, c-format
msgid "Apache"
msgstr "रास्ता"
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
#, c-format
msgid "Groupware"
msgstr "ग्रुपवेयर"
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
#, c-format
msgid "Kolab Server"
msgstr "कोलाब सर्वर"
#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
#, c-format
msgid "Firewall/Router"
msgstr "अग्नि-भीतिका/रूटर"
#: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
#, c-format
msgid "Internet gateway"
msgstr "इन्टरनेट गेटवे"
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
#, fuzzy, c-format
msgid "Mail/News"
msgstr "/संचिका (F)/नवीन (_N)"
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
#, fuzzy, c-format
msgid "Postfix mail server, Inn news server"
msgstr "पोस्टफ़िक्स विपत्र सर्वर"
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
#, fuzzy, c-format
msgid "Directory Server"
msgstr "निर्देशिका जिससे पुनःस्थापन करना है"
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
#, fuzzy, c-format
msgid "FTP Server"
msgstr "एन०टी०पी० सर्वर"
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
#, c-format
msgid "ProFTPd"
msgstr ""
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
#, fuzzy, c-format
msgid "DNS/NIS"
msgstr "डीएनएस"
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
#, fuzzy, c-format
msgid "Domain Name and Network Information Server"
msgstr "डोमेन नाम सर्वर"
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
#, fuzzy, c-format
msgid "File and Printer Sharing Server"
msgstr "प्रिंटर सर्वर"
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
#, fuzzy, c-format
msgid "NFS Server, Samba server"
msgstr "सॉबा सर्वर"
#: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
#, c-format
msgid "Database"
msgstr "डाटाबेस"
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
#, fuzzy, c-format
msgid "PostgreSQL and MySQL Database Server"
msgstr "पोस्टग्रीसीक्यूअल या माईसीक्यूअल डाटाबेस सर्वर"
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
#, c-format
msgid "Web/FTP"
msgstr "वेब/एफ़०टी०पी०"
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
#, c-format
msgid "Apache, Pro-ftpd"
msgstr "आपाचे, प्रो-एफ़०टी०पी०डी०"
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
#, c-format
msgid "Mail"
msgstr "विपत्र"
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
#, c-format
msgid "Postfix mail server"
msgstr "पोस्टफ़िक्स विपत्र सर्वर"
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
#, c-format
msgid "PostgreSQL or MySQL database server"
msgstr "पोस्टग्रीसीक्यूअल या माईसीक्यूअल डाटाबेस सर्वर"
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
#, c-format
msgid "Network Computer server"
msgstr "नेटवर्क कम्प्यूटर सर्वर"
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
#, c-format
msgid "NFS server, SMB server, Proxy server, ssh server"
msgstr "एन०एफ़०एस० सर्वर, एस०एम०बी० सर्वर, प्रोक्सी सर्वर, एस०एस०एच० सर्वर"
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
#, c-format
msgid "Graphical Environment"
msgstr "सचित्र वातावरण"
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
#, c-format
msgid "KDE Workstation"
msgstr "केडीई कार्यकेन्द्र"
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
#, c-format
msgid ""
"The K Desktop Environment, the basic graphical environment with a collection "
"of accompanying tools"
msgstr "के डेस्कटाप वातावरण, मूलभूत सचित्र वातावरणसंलग्न औजारों के एक समूह के साथ"
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
#, c-format
msgid "GNOME Workstation"
msgstr "गनोम कार्यकेन्द्र"
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
#, c-format
msgid ""
"A graphical environment with user-friendly set of applications and desktop "
@@ -660,7 +621,7 @@ msgid ""
msgstr ""
"एक सचित्र वातावरण, उपयोगकर्ता-मित्रवत कार्यक्रमों के समुच्चय और डेस्कटाप औजारों के साथ"
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
#, fuzzy, c-format
msgid "LXDE Desktop"
msgstr "डेस्कटाप"
@@ -673,54 +634,52 @@ msgid ""
msgstr ""
"एक सचित्र वातावरण, उपयोगकर्ता-मित्रवत कार्यक्रमों के समुच्चय और डेस्कटाप औजारों के साथ"
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
#, c-format
msgid "Other Graphical Desktops"
msgstr "अन्य सचित्र डेस्कटाप"
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
#, fuzzy, c-format
msgid "Window Maker, Enlightenment, Fvwm, etc"
msgstr "आईसीडब्लूएम, विण्डो मेकर, एनलाइटमेन्ट, एफ़वीडब्लूएम, इत्यादि"
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
#, c-format
msgid "Utilities"
msgstr "यूटिलिटीज़"
#: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
#, c-format
msgid "SSH Server"
msgstr "एसएसएच सर्वर"
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
#, fuzzy, c-format
msgid "Webmin"
msgstr "वेबकैम"
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
#, fuzzy, c-format
msgid "Webmin Remote Configuration Server"
msgstr "टर्मिनल सर्वर संरचना"
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
#, fuzzy, c-format
msgid "Network Utilities/Monitoring"
msgstr "नेटवर्क मॉनीट्रिंग"
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
#, c-format
msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
msgstr ""
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
#, fuzzy, c-format
msgid "Mandriva Wizards"
msgstr "<b>मैनड्रिव स्टोर</b>"
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
#, fuzzy, c-format
msgid "Wizards to configure server"
msgstr "\"%s\" प्रिंटर की संरचना में असफ़ल !"
@@ -821,17 +780,17 @@ msgstr ""
msgid "Click on images in order to see a bigger preview"
msgstr ""
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
#, c-format
msgid "Package Group Selection"
msgstr "पैकेज समूह चयन"
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
#, c-format
msgid "Individual package selection"
msgstr "अलग-अलग पैकेजों का चयन"
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
#, c-format
msgid "Total size: %d / %d MB"
msgstr "कुल आकार: %d / %d एम०बी०"
@@ -948,12 +907,12 @@ msgstr "निम्नतम संसाधन"
msgid "Software Management"
msgstr "सॉफ़्टवेयर प्रबंधक"
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
#, c-format
msgid "Choose the packages you want to install"
msgstr "उन पैकेजों का चयन करें जिन्हें आप संसाधित करना चाहते है"
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
#, c-format
msgid "Installing"
msgstr "संसाधन हो रहा है"
@@ -980,7 +939,7 @@ msgid_plural "%d packages"
msgstr[0] "%d पैकेज"
msgstr[1] "%d पैकेज"
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
#, c-format
msgid "Summary"
msgstr "सारांश"
@@ -990,7 +949,7 @@ msgstr "सारांश"
msgid "Configure"
msgstr "संरचना"
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
#, c-format
msgid "not configured"
msgstr "संरचित नहीं"
@@ -1000,14 +959,14 @@ msgstr "संरचित नहीं"
msgid "Media Selection"
msgstr "पैकेज समूह चयन"
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
#, c-format
msgid ""
"The following installation media have been found.\n"
"If you want to skip some of them, you can unselect them now."
msgstr ""
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
#, c-format
msgid ""
"You have the option to copy the contents of the CDs onto the hard drive "
@@ -1016,7 +975,7 @@ msgid ""
"available once the system is fully installed."
msgstr ""
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
#, c-format
msgid "Copy whole CDs"
msgstr ""
@@ -1036,59 +995,49 @@ msgstr "कृपया अपने की-बोर्ड खाका का
msgid "Here is the full list of available keyboards:"
msgstr "यह है उपलब्ध देशों की सम्पूर्ण सूची"
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
#, c-format
msgid "Install/Upgrade"
msgstr "संसाधन/उन्नयन"
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
#, c-format
msgid "Is this an install or an upgrade?"
msgstr "यह एक संसाधन या एक उन्नयन है?"
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
#, fuzzy, c-format
msgid ""
"_: This is a noun:\n"
"Install"
msgstr "संसाधन"
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
#, c-format
msgid "Upgrade %s"
msgstr "उन्नयन %s"
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
#, c-format
msgid "Encryption key for %s"
msgstr "%s के लिए गूढ़लिखित कुँजी"
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
#, c-format
msgid "Cancel installation, reboot system"
msgstr ""
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
#, fuzzy, c-format
msgid "New Installation"
msgstr "संसाधन हो रहा है"
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
#, c-format
msgid "Upgrade previous installation (not recommended)"
msgstr ""
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
#, c-format
msgid ""
"Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1100,17 +1049,17 @@ msgid ""
"Installation\"."
msgstr ""
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "IDE"
msgstr "आई०डी०ई०"
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "Configuring IDE"
msgstr "आईडीई की संरचना की जा रही है"
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
#, c-format
msgid ""
"No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1119,7 +1068,7 @@ msgstr ""
"१ एमबी बूटस्ट्रैप के लिए कोई मुक्त स्थान नहीं ! संसाधन जारी रहेगा, परन्तु आपके तंत्र को बूट "
"करने के लिए, आपको डिस्कड्रैक से एक बूटस्ट्रैप विभाजन का निर्माण करना होगा "
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
#, fuzzy, c-format
msgid ""
"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1129,7 +1078,7 @@ msgstr ""
"१ एमबी बूटस्ट्रैप के लिए कोई मुक्त स्थान नहीं ! संसाधन जारी रहेगा, परन्तु आपके तंत्र को बूट "
"करने के लिए, आपको डिस्कड्रैक से एक बूटस्ट्रैप विभाजन का निर्माण करना होगा "
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
#, fuzzy, c-format
msgid ""
"Change your Cd-Rom!\n"
@@ -1143,19 +1092,19 @@ msgstr ""
"दबायें ठीक को दबायें ।\n"
"यदि आपके पास यह नहीं है, तो इस सीडी-रॉम से संसाधन ना करने के लिए निरस्त को दबायें ।"
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
#, c-format
msgid "Looking for available packages..."
msgstr "उपलब्ध पैकेजों को खोज़ा जा रहा है..."
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
#, c-format
msgid ""
"Your system does not have enough space left for installation or upgrade (%"
"dMB > %dMB)"
msgstr ""
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
#, fuzzy, c-format
msgid ""
"Please choose load or save package selection.\n"
@@ -1164,52 +1113,52 @@ msgstr ""
"कृपया चयन करें कि फ़्लापी पर पैकेजों को अधिभारण या सुरक्षित किया जायें ।\n"
"इसका प्रारूप स्वतः_संसाधन के लिए निर्मित फ़्लापियों की भांति होता है ।"
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Load"
msgstr "लोड"
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Save"
msgstr "सुरक्षित"
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
#, fuzzy, c-format
msgid "Bad file"
msgstr "फ़ाइल लोड करें"
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
#, fuzzy, c-format
msgid "KDE"
msgstr "आई०डी०ई०"
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
#, c-format
msgid "GNOME"
msgstr "गनोम"
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
#, fuzzy, c-format
msgid "Desktop Selection"
msgstr "पैकेज समूह चयन"
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
#, c-format
msgid "You can choose your workstation desktop profile."
msgstr ""
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
#, c-format
msgid "Selected size is larger than available space"
msgstr "चयनित आकार उपलब्ध स्थान से ज्यादा है"
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
#, c-format
msgid "Type of install"
msgstr "संसाधन का प्रकार"
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
#, c-format
msgid ""
"You have not selected any group of packages.\n"
@@ -1218,82 +1167,82 @@ msgstr ""
"आपने पैकेजों के किसी भी समूह का चयन नहीं किया है ।\n"
"कृपया कम-से-कम जितना आप चाहते है उतने संसाधन का चयन करें:"
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
#, c-format
msgid "With X"
msgstr "एक्स के साथ"
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
#, c-format
msgid "With basic documentation (recommended!)"
msgstr "आधार-भूत प्रलेखन के साथ (संस्तुति की जाती है !)"
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
#, c-format
msgid "Truly minimal install (especially no urpmi)"
msgstr "वास्तविक निम्नत्तम संसाधन (विशेषकर कोई यू०आर०पी०एम०आई० नहीं)"
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
#, c-format
msgid "Preparing installation"
msgstr "संसाधन का निर्माण किया जा रहा है"
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
#, c-format
msgid "Installing package %s"
msgstr "%s पैकेज का संसाधन हो रहा है"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "There was an error ordering packages:"
msgstr "पैकेजों के आदेश देने में एक त्रुटि हो गयी है:"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "Go on anyway?"
msgstr "कुछ भी हो जारी रहा जायें?"
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
#, c-format
msgid "Retry"
msgstr ""
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
#, c-format
msgid "Skip this package"
msgstr ""
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
#, c-format
msgid "Skip all packages from medium \"%s\""
msgstr ""
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
#, fuzzy, c-format
msgid "Go back to media and packages selection"
msgstr "पैकेजों के चयन को सुरक्षित करें"
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
#, fuzzy, c-format
msgid "There was an error installing package %s."
msgstr "पैकेजों के संसाधन में एक त्रुटि हो गयी है:"
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
#, c-format
msgid "Post-install configuration"
msgstr "संसाधन-उपरान्त संरचना"
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
#, c-format
msgid "Please ensure the Update Modules media is in drive %s"
msgstr ""
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
#, c-format
msgid "Updates"
msgstr "उन्नयन"
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
#, c-format
msgid ""
"You now have the opportunity to download updated packages. These packages\n"
@@ -1314,96 +1263,96 @@ msgstr ""
"\n"
"क्या आप इन अपडेटों को संसाधित करना चाहते है ?"
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
#, c-format
msgid "%s on %s"
msgstr "%s पर %s"
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
#, c-format
msgid "Hardware"
msgstr "हार्डवेयर"
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
#, c-format
msgid "Sound card"
msgstr "सांउड कार्ड"
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
#, c-format
msgid "Do you have an ISA sound card?"
msgstr "क्या आपके पास एक आई०एस०ऐ० सांउड कार्ड है?"
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
#, fuzzy, c-format
msgid ""
"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
"card"
msgstr "संसाधन के उपरान्त \"sndconfig\" को अपने साउण्ड कार्ड को संरचित करने के लिए चलायें"
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
#, c-format
msgid "No sound card detected. Try \"harddrake\" after installation"
msgstr ""
"कोई साउण्ड कार्ड नहीं खोजा जा सका । संसाधन के उपरान्त \"harddrake\" को उपयोग करके देखें"
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
#, c-format
msgid "Graphical interface"
msgstr "सचित्र इन्टरफ़ेस"
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
#, c-format
msgid "Network & Internet"
msgstr "नेटवर्क और इन्टरनेट"
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
#, c-format
msgid "Proxies"
msgstr "प्रोक्सियां"
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
#, c-format
msgid "configured"
msgstr "संरचित"
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
#, c-format
msgid "Security Level"
msgstr "सुरक्षा स्तर"
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
#, c-format
msgid "Firewall"
msgstr "अग्नि-भीतिका"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "activated"
msgstr "सक्रिय है"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "disabled"
msgstr "निष्क्रिय"
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
#, c-format
msgid "You have not configured X. Are you sure you really want this?"
msgstr "आपने एक्स को संरचित नहीं किया है । क्या आप वास्तव में ऐसा चाहते है?"
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
#, c-format
msgid "Preparing bootloader..."
msgstr "बूटलोडर को तैयार किया जा रहा है..."
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
#, c-format
msgid "Be patient, this may take a while..."
msgstr ""
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
#, fuzzy, c-format
msgid ""
"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1416,24 +1365,24 @@ msgstr ""
"संसाधन जारी रहेगा, परन्तु आपको अपनी मशीन को बूट करने के लिए, \n"
"बूट-एक्स या किसी अन्य साधन की आवश्यकता होगी"
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
#, c-format
msgid ""
"In this security level, access to the files in the Windows partition is "
"restricted to the administrator."
msgstr "इस सुरक्षा स्तर में, विण्डो विभाजन में संचिकाओं तक पहुँच सिर्फ़ प्रबंधक को हीप्राप्त है।"
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr "%s में एक खाली फ़्लापी डालें"
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
#, c-format
msgid "Creating auto install floppy..."
msgstr "स्वतः संसाधन फ़्लापी का निर्माण किया जा रहा है..."
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
#, c-format
msgid ""
"Some steps are not completed.\n"
@@ -1444,7 +1393,7 @@ msgstr ""
"\n"
"क्या आप वास्तव में बाहर निकलना चाहते है?"
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
#, c-format
msgid "Congratulations"
msgstr "बधाई हो"
@@ -1588,6 +1537,10 @@ msgid ""
"Exit"
msgstr "निकास"
+#, fuzzy
+#~ msgid "Downloading file %s..."
+#~ msgstr "संचिकायें प्रेषित की जा रही..."
+
#~ msgid ""
#~ "You have selected the following server(s): %s\n"
#~ "\n"
diff --git a/perl-install/install/share/po/hr.po b/perl-install/install/share/po/hr.po
index e2204b887..47afcedc7 100644
--- a/perl-install/install/share/po/hr.po
+++ b/perl-install/install/share/po/hr.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: DrakX 0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
"PO-Revision-Date: 2005-01-04 21:25+CET\n"
"Last-Translator: auto\n"
"Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -16,31 +16,6 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;;\n"
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr ""
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr ""
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr ""
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr ""
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr ""
-
#: any.pm:109
#, fuzzy, c-format
msgid "Do you have further supplementary media?"
@@ -76,24 +51,24 @@ msgstr "Mreža"
msgid "Network (NFS)"
msgstr ""
-#: any.pm:163
+#: any.pm:165
#, c-format
msgid "URL of the mirror?"
msgstr ""
-#: any.pm:169
+#: any.pm:171
#, c-format
msgid "URL must start with ftp:// or http://"
msgstr ""
-#: any.pm:180
+#: any.pm:182
#, c-format
msgid ""
"Contacting Mandriva Linux web site to get the list of available mirrors..."
msgstr ""
"Kontaktiram Mandriva Linux web site za dobivanje popisa raspoloživih mirrora"
-#: any.pm:185
+#: any.pm:187
#, fuzzy, c-format
msgid ""
"Failed contacting Mandriva Linux web site to get the list of available "
@@ -101,69 +76,69 @@ msgid ""
msgstr ""
"Kontaktiram Mandriva Linux web site za dobivanje popisa raspoloživih mirrora"
-#: any.pm:195
+#: any.pm:197
#, c-format
msgid "Choose a mirror from which to get the packages"
msgstr "Izaberite mirror sa kojeg želite skinuti pakete"
-#: any.pm:225
+#: any.pm:227
#, c-format
msgid "NFS setup"
msgstr ""
-#: any.pm:226
+#: any.pm:228
#, c-format
msgid "Please enter the hostname and directory of your NFS media"
msgstr ""
-#: any.pm:230
+#: any.pm:232
#, c-format
msgid "Hostname missing"
msgstr ""
-#: any.pm:231
+#: any.pm:233
#, c-format
msgid "Directory must begin with \"/\""
msgstr ""
-#: any.pm:235
+#: any.pm:237
#, c-format
msgid "Hostname of the NFS mount ?"
msgstr ""
-#: any.pm:236
+#: any.pm:238
#, c-format
msgid "Directory"
msgstr "Direktorij"
-#: any.pm:258
+#: any.pm:260
#, c-format
msgid "Supplementary"
msgstr ""
-#: any.pm:293
+#: any.pm:295
#, fuzzy, c-format
msgid ""
"Can't find a package list file on this mirror. Make sure the location is "
"correct."
msgstr "Ne mogu otvoriti %s: %s\n"
-#: any.pm:328
+#: any.pm:334
#, fuzzy, c-format
msgid "Looking at packages already installed..."
msgstr "Ne možete odznačiti ovaj paket budući da je već instaliran"
-#: any.pm:362
+#: any.pm:368
#, c-format
msgid "Finding packages to upgrade..."
msgstr "Tražim pakete koje mogu nadograditi"
-#: any.pm:381
+#: any.pm:387
#, c-format
msgid "Removing packages prior to upgrade..."
msgstr ""
-#: any.pm:402
+#: any.pm:408
#, c-format
msgid ""
"You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -175,18 +150,18 @@ msgid ""
"please reboot your system and upgrade using the Mandriva update applet."
msgstr ""
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
#, c-format
msgid "Reboot"
msgstr "Ponovno pokretanje sustava"
-#: any.pm:407
+#: any.pm:413
#, c-format
msgid "Proceed"
msgstr ""
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -195,72 +170,72 @@ msgid ""
"Do you really want to remove these packages?\n"
msgstr ""
-#: any.pm:815
+#: any.pm:821
#, c-format
msgid "Error reading file %s"
msgstr "Greška prilikom čitanja datoteke %s"
-#: any.pm:1022
+#: any.pm:1028
#, fuzzy, c-format
msgid "The following disk(s) were renamed:"
msgstr "Slijedeći paketi će biti instalirani"
-#: any.pm:1024
+#: any.pm:1030
#, c-format
msgid "%s (previously named as %s)"
msgstr ""
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "HTTP"
msgstr "HTTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "FTP"
msgstr "FTP"
-#: any.pm:1081
+#: any.pm:1087
#, fuzzy, c-format
msgid "NFS"
msgstr "FS"
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
#, c-format
msgid "Network"
msgstr "Mreža"
-#: any.pm:1104
+#: any.pm:1110
#, fuzzy, c-format
msgid "Please choose a media"
msgstr "Molim odaberite"
-#: any.pm:1120
+#: any.pm:1126
#, fuzzy, c-format
msgid "File already exists. Overwrite it?"
msgstr "Datoteka već postoji. Da li da nju upotrijebim?"
-#: any.pm:1124
+#: any.pm:1130
#, c-format
msgid "Permission denied"
msgstr "Pristup odbijen"
-#: any.pm:1172
+#: any.pm:1178
#, c-format
msgid "Bad NFS name"
msgstr ""
-#: any.pm:1193
+#: any.pm:1199
#, fuzzy, c-format
msgid "Bad media %s"
msgstr "dodan medij %s"
-#: any.pm:1236
+#: any.pm:1242
#, c-format
msgid "Can not make screenshots before partitioning"
msgstr "Ne mogu napraviti screenshotove prije particioniranja"
-#: any.pm:1244
+#: any.pm:1250
#, c-format
msgid "Screenshots will be available after install in %s"
msgstr "Screenshotovi će biti raspoloživi poslije instalaciju u %s"
@@ -271,11 +246,15 @@ msgid "Installation"
msgstr "Instaliram"
#: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
#, c-format
msgid "Configuration"
msgstr "Postavke"
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
#: install2.pm:168
#, c-format
msgid "You must also format %s"
@@ -300,22 +279,22 @@ msgstr "Podižem mrežu"
msgid "Bringing down the network"
msgstr "Onemogućujem mrežu"
-#: media.pm:402
+#: media.pm:399
#, c-format
msgid "Please wait, retrieving file"
msgstr ""
-#: media.pm:734
-#, fuzzy, c-format
-msgid "Downloading file %s..."
-msgstr "Šaljem datoteke..."
+#: media.pm:718
+#, c-format
+msgid "unable to add medium"
+msgstr ""
-#: media.pm:822
+#: media.pm:758
#, c-format
msgid "Copying some packages on disks for future use"
msgstr ""
-#: media.pm:875
+#: media.pm:811
#, fuzzy, c-format
msgid "Copying in progress"
msgstr "detektiran na portu %s"
@@ -357,27 +336,27 @@ msgstr ""
msgid "An error occurred:"
msgstr "Pojavila se greška"
-#: pkgs.pm:776
+#: pkgs.pm:780
#, fuzzy, c-format
msgid "%d installation transactions failed"
msgstr "instalacijske intrukcije"
-#: pkgs.pm:777
+#: pkgs.pm:781
#, fuzzy, c-format
msgid "Installation of packages failed:"
msgstr "Instaliram paket %s"
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
#, c-format
msgid "Workstation"
msgstr "Radna stanica"
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
#, c-format
msgid "Office Workstation"
msgstr "Uredska radna stanica"
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
#, c-format
msgid ""
"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -386,7 +365,7 @@ msgstr ""
"Uredski programi: tekst procesori (OpenOffice.org Writer, Kword), tablični "
"kalkulatori (OpenOffice.org Calc, Kspread), pdf preglednici, itd"
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
#, c-format
msgid ""
"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -395,32 +374,32 @@ msgstr ""
"Uredski programi: tekst procesori (kword, abiword), tablični kalkulatori "
"(kspread, gnumeric), pdf preglednici, itd"
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
#, c-format
msgid "Game station"
msgstr "Igračka radna stanica"
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
#, c-format
msgid "Amusement programs: arcade, boards, strategy, etc"
msgstr "Zabavni programi: arkade, ploče, strategije, itd"
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
#, c-format
msgid "Multimedia station"
msgstr "Multimedijska stanica"
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
#, c-format
msgid "Sound and video playing/editing programs"
msgstr "Zvučni i video svirački/uređivački programi"
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
#, c-format
msgid "Internet station"
msgstr "Internet stanica"
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
#, fuzzy, c-format
msgid ""
"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -429,211 +408,193 @@ msgstr ""
"Pribor alata za čitanje i slanje mail-a i news-a (pine, mutt, tin..) i za "
"pregled Web-a"
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
#, c-format
msgid "Network Computer (client)"
msgstr "Mrežno računalo (klijent)"
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
#, c-format
msgid "Clients for different protocols including ssh"
msgstr "Klijenti za razne protokole uključujući ssh"
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
#, c-format
msgid "Tools to ease the configuration of your computer"
msgstr "Alati za lako podešavanje vašeg računala"
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
#, c-format
msgid "Console Tools"
msgstr "Konzolni Alati"
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
#, c-format
msgid "Editors, shells, file tools, terminals"
msgstr "Uređivači, ljuske, datotečni alati, terminali"
#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
#, c-format
msgid "Development"
msgstr "Razvoj"
#: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
#, c-format
msgid "C and C++ development libraries, programs and include files"
msgstr "C i C++ razvojne biblioteke, programi i uključujuće datoteke"
#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
#, c-format
msgid "Documentation"
msgstr "Dokumentacija"
#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
#, c-format
msgid "Books and Howto's on Linux and Free Software"
msgstr "Knjige i Howto-i o Linux-u i slobodnom software-u"
#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
#, c-format
msgid "LSB"
msgstr "LSB"
#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
#, c-format
msgid "Linux Standard Base. Third party applications support"
msgstr ""
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
#, c-format
msgid "Web Server"
msgstr "Posljužitelj weba"
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
#, c-format
msgid "Apache"
msgstr "Apache"
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
#, c-format
msgid "Groupware"
msgstr "Groupware"
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
#, fuzzy, c-format
msgid "Kolab Server"
msgstr "NIS Poslužitelj"
#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
#, c-format
msgid "Firewall/Router"
msgstr "Vatrozid/Ruter"
#: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
#, c-format
msgid "Internet gateway"
msgstr "Internet gateway"
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
#, fuzzy, c-format
msgid "Mail/News"
msgstr "/Datoteka/_Nova"
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
#, c-format
msgid "Postfix mail server, Inn news server"
msgstr "Postfix mail poslužitelj, Inn news poslužitelj"
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
#, c-format
msgid "Directory Server"
msgstr "Poslužitelj imenika"
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
#, fuzzy, c-format
msgid "FTP Server"
msgstr "NTP Poslužitelj"
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
#, c-format
msgid "ProFTPd"
msgstr ""
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
#, fuzzy, c-format
msgid "DNS/NIS"
msgstr "DNS/NIS "
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
#, c-format
msgid "Domain Name and Network Information Server"
msgstr "Ime Domene i Mrežni Informacijki Poslužitelj (NIS)"
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
#, fuzzy, c-format
msgid "File and Printer Sharing Server"
msgstr "Ispisni poslužitelj"
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
#, fuzzy, c-format
msgid "NFS Server, Samba server"
msgstr "NIS Poslužitelj"
#: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
#, c-format
msgid "Database"
msgstr "Baza podataka"
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
#, fuzzy, c-format
msgid "PostgreSQL and MySQL Database Server"
msgstr "PostgreSQL ili MySQL poslužitelj baza"
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
#, c-format
msgid "Web/FTP"
msgstr "Web/FTP"
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
#, c-format
msgid "Apache, Pro-ftpd"
msgstr "Apache i Pro-ftpd"
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
#, c-format
msgid "Mail"
msgstr "Pošta"
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
#, c-format
msgid "Postfix mail server"
msgstr "Postfix poslužitelj pošte"
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
#, c-format
msgid "PostgreSQL or MySQL database server"
msgstr "PostgreSQL ili MySQL poslužitelj baza"
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
#, c-format
msgid "Network Computer server"
msgstr "Mrežni računalni poslužitelj"
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
#, c-format
msgid "NFS server, SMB server, Proxy server, ssh server"
msgstr "NFS poslužitelj, SMB poslužitelj, Proxy poslužitelj, SSH poslužitelj"
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
#, c-format
msgid "Graphical Environment"
msgstr "Grafičko Okružje"
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
#, c-format
msgid "KDE Workstation"
msgstr "KDE radna stanica"
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
#, c-format
msgid ""
"The K Desktop Environment, the basic graphical environment with a collection "
@@ -641,12 +602,12 @@ msgid ""
msgstr ""
"K Radno Okružje, osnovno grafičko okružje sa kolekcijom pripadajućih alata"
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
#, c-format
msgid "GNOME Workstation"
msgstr "Gnome radna stanica"
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
#, c-format
msgid ""
"A graphical environment with user-friendly set of applications and desktop "
@@ -655,7 +616,7 @@ msgstr ""
"Grafička okružja sa korisnički prijateljskim skupom aplikacija i alatima za "
"radno okružje"
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
#, fuzzy, c-format
msgid "LXDE Desktop"
msgstr "Radna površina"
@@ -669,54 +630,52 @@ msgstr ""
"Grafička okružja sa korisnički prijateljskim skupom aplikacija i alatima za "
"radno okružje"
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
#, c-format
msgid "Other Graphical Desktops"
msgstr "Druga grafička radna okružja"
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
#, fuzzy, c-format
msgid "Window Maker, Enlightenment, Fvwm, etc"
msgstr "Icewm, Window Maker, Enlightenment, Fvwm, itd"
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
#, c-format
msgid "Utilities"
msgstr "Pomoćni programi"
#: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
#, fuzzy, c-format
msgid "SSH Server"
msgstr "NIS Poslužitelj"
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
#, fuzzy, c-format
msgid "Webmin"
msgstr "Servisi"
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
#, fuzzy, c-format
msgid "Webmin Remote Configuration Server"
msgstr "Prebaci postavke pisača"
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
#, fuzzy, c-format
msgid "Network Utilities/Monitoring"
msgstr "Mrežne postavke"
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
#, c-format
msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
msgstr ""
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
#, fuzzy, c-format
msgid "Mandriva Wizards"
msgstr "Mandriva Linux Kontrolni Centar"
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
#, fuzzy, c-format
msgid "Wizards to configure server"
msgstr "Podešavam pisač \"%s\" ..."
@@ -815,17 +774,17 @@ msgstr ""
msgid "Click on images in order to see a bigger preview"
msgstr ""
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
#, c-format
msgid "Package Group Selection"
msgstr "Odabir grupe paketa"
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
#, c-format
msgid "Individual package selection"
msgstr "Individualan odabir paketa"
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
#, c-format
msgid "Total size: %d / %d MB"
msgstr "Ukupna veličina: %d / %d MB"
@@ -944,12 +903,12 @@ msgstr "Minimalna instalacija"
msgid "Software Management"
msgstr "Upravitelj Softwareom"
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
#, c-format
msgid "Choose the packages you want to install"
msgstr "Odaberite pakete koje želite instalirati"
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
#, c-format
msgid "Installing"
msgstr "Instaliram"
@@ -977,7 +936,7 @@ msgstr[0] "%d paketa"
msgstr[1] "%d paketa"
msgstr[2] "%d paketa"
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
#, c-format
msgid "Summary"
msgstr "Sažetak"
@@ -987,7 +946,7 @@ msgstr "Sažetak"
msgid "Configure"
msgstr "Podešavanje"
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
#, fuzzy, c-format
msgid "not configured"
msgstr "ponovno postavi"
@@ -997,14 +956,14 @@ msgstr "ponovno postavi"
msgid "Media Selection"
msgstr "Odabir grupe paketa"
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
#, c-format
msgid ""
"The following installation media have been found.\n"
"If you want to skip some of them, you can unselect them now."
msgstr ""
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
#, c-format
msgid ""
"You have the option to copy the contents of the CDs onto the hard drive "
@@ -1013,7 +972,7 @@ msgid ""
"available once the system is fully installed."
msgstr ""
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
#, c-format
msgid "Copy whole CDs"
msgstr ""
@@ -1033,59 +992,49 @@ msgstr "Molim, izaberite raspored tipkovnice"
msgid "Here is the full list of available keyboards:"
msgstr "Ovdje je cijeli popis raspoloživih tipkovnica"
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
#, fuzzy, c-format
msgid "Install/Upgrade"
msgstr "Instaliraj/Nadogradi"
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
#, fuzzy, c-format
msgid "Is this an install or an upgrade?"
msgstr "Da li je ovo instalacija ili nadogradnja?"
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
#, fuzzy, c-format
msgid ""
"_: This is a noun:\n"
"Install"
msgstr "Instaliraj"
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
#, fuzzy, c-format
msgid "Upgrade %s"
msgstr "Dogradnja"
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
#, fuzzy, c-format
msgid "Encryption key for %s"
msgstr "Enkripcijski ključ"
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
#, c-format
msgid "Cancel installation, reboot system"
msgstr ""
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
#, fuzzy, c-format
msgid "New Installation"
msgstr "Instaliram"
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
#, c-format
msgid "Upgrade previous installation (not recommended)"
msgstr ""
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
#, c-format
msgid ""
"Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1097,17 +1046,17 @@ msgid ""
"Installation\"."
msgstr ""
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "IDE"
msgstr "IDE"
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "Configuring IDE"
msgstr "Podešavam IDE"
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
#, c-format
msgid ""
"No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1117,7 +1066,7 @@ msgstr ""
"podizanje vašeg sustava, trebati ćete napraviti bootstrap particiju u "
"DiskDrake-u"
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
#, fuzzy, c-format
msgid ""
"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1128,7 +1077,7 @@ msgstr ""
"podizanje vašeg sustava, trebati ćete napraviti bootstrap particiju u "
"DiskDrake-u"
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
#, fuzzy, c-format
msgid ""
"Change your Cd-Rom!\n"
@@ -1143,19 +1092,19 @@ msgstr ""
"Ukoliko ga nemate, pritisnite Odustani kako bi izbjegli instalaciju sa ovog "
"Cd-Rom-a."
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
#, c-format
msgid "Looking for available packages..."
msgstr "Tražim dostupne pakete"
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
#, c-format
msgid ""
"Your system does not have enough space left for installation or upgrade (%"
"dMB > %dMB)"
msgstr ""
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
#, fuzzy, c-format
msgid ""
"Please choose load or save package selection.\n"
@@ -1164,52 +1113,52 @@ msgstr ""
"Molimo izaberite učitivanje ili spremanje izbora paketa na disketu.\n"
"Format je isto kao auto_install napravljene diskete."
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Load"
msgstr "Učitaj"
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Save"
msgstr "Spremi"
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
#, fuzzy, c-format
msgid "Bad file"
msgstr "Učitaj datoteku"
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
#, fuzzy, c-format
msgid "KDE"
msgstr "IDE"
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
#, c-format
msgid "GNOME"
msgstr "GNOME"
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
#, fuzzy, c-format
msgid "Desktop Selection"
msgstr "Odabir grupe paketa"
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
#, c-format
msgid "You can choose your workstation desktop profile."
msgstr ""
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
#, c-format
msgid "Selected size is larger than available space"
msgstr "Izabrana veličina je veća nego raspoloživ prostor"
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
#, c-format
msgid "Type of install"
msgstr "Tip instalacije"
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
#, c-format
msgid ""
"You have not selected any group of packages.\n"
@@ -1218,82 +1167,82 @@ msgstr ""
"Niste izabrali niti jednu grupu paketa\n"
"Izaberite minimalnu instalaciju ako želite"
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
#, c-format
msgid "With X"
msgstr "Sa X-ima"
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
#, c-format
msgid "With basic documentation (recommended!)"
msgstr "Sa osnovnom dokumentacijom (preporučeno!)"
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
#, c-format
msgid "Truly minimal install (especially no urpmi)"
msgstr "Stvarno malena instalacija (posebice bez urpmia)"
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
#, c-format
msgid "Preparing installation"
msgstr "Pripremam instalaciju"
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
#, c-format
msgid "Installing package %s"
msgstr "Instaliram paket %s"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "There was an error ordering packages:"
msgstr "Javila se greška prilikom sortiranja paketa:"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "Go on anyway?"
msgstr "Da ipak nastavim?"
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
#, c-format
msgid "Retry"
msgstr ""
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
#, c-format
msgid "Skip this package"
msgstr ""
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
#, c-format
msgid "Skip all packages from medium \"%s\""
msgstr ""
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
#, fuzzy, c-format
msgid "Go back to media and packages selection"
msgstr "Spremi odabir paketa"
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
#, fuzzy, c-format
msgid "There was an error installing package %s."
msgstr "Pojavila se greška kod instalacije paketa:"
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
#, c-format
msgid "Post-install configuration"
msgstr "Postava nakon instalacije"
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
#, c-format
msgid "Please ensure the Update Modules media is in drive %s"
msgstr ""
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
#, c-format
msgid "Updates"
msgstr "Nadogradnje"
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
#, fuzzy, c-format
msgid ""
"You now have the opportunity to download updated packages. These packages\n"
@@ -1313,28 +1262,28 @@ msgstr ""
"\n"
"Da li želite instalirati dogradnju?"
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
#, c-format
msgid "%s on %s"
msgstr "%s na %s"
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
#, c-format
msgid "Hardware"
msgstr "Sklopovlje"
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
#, c-format
msgid "Sound card"
msgstr "Zvučna kartica"
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
#, c-format
msgid "Do you have an ISA sound card?"
msgstr "Da li imate ISA zvučnu karticu?"
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
#, fuzzy, c-format
msgid ""
"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1343,68 +1292,68 @@ msgstr ""
"Pokrenite \"sndconfig\" poslije instalacije za podešavanje vaše zvučne "
"kartice"
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
#, c-format
msgid "No sound card detected. Try \"harddrake\" after installation"
msgstr ""
"Nije pronađena zvučna kartica. Probajte \"harddrake\" poslije instalacije"
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
#, fuzzy, c-format
msgid "Graphical interface"
msgstr "X kod pokretanja sustava"
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
#, c-format
msgid "Network & Internet"
msgstr "Mreža i Internet"
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
#, fuzzy, c-format
msgid "Proxies"
msgstr "Profil: "
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
#, fuzzy, c-format
msgid "configured"
msgstr "ponovno postavi"
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
#, c-format
msgid "Security Level"
msgstr "Sigurnosna Razina"
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
#, c-format
msgid "Firewall"
msgstr "Vatrozid"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, fuzzy, c-format
msgid "activated"
msgstr "Aktiviraj sada"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "disabled"
msgstr "onemogućeno"
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
#, c-format
msgid "You have not configured X. Are you sure you really want this?"
msgstr ""
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
#, c-format
msgid "Preparing bootloader..."
msgstr "Pripremam bootloader"
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
#, c-format
msgid "Be patient, this may take a while..."
msgstr ""
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
#, fuzzy, c-format
msgid ""
"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1417,24 +1366,24 @@ msgstr ""
"Instalacija će nastaviti, ali ćete morati\n"
" koristiti BootX da podignete vaše računalo"
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
#, c-format
msgid ""
"In this security level, access to the files in the Windows partition is "
"restricted to the administrator."
msgstr ""
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr "Umetnite praznu disketu u pogon %s"
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
#, c-format
msgid "Creating auto install floppy..."
msgstr "Pravim auto instalacijsku disketu"
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
#, c-format
msgid ""
"Some steps are not completed.\n"
@@ -1445,7 +1394,7 @@ msgstr ""
"\n"
"Želite li zaista završiti?"
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
#, c-format
msgid "Congratulations"
msgstr "Čestitamo, pobijedili ste!"
@@ -1590,6 +1539,10 @@ msgid ""
msgstr "Izađi"
#, fuzzy
+#~ msgid "Downloading file %s..."
+#~ msgstr "Šaljem datoteke..."
+
+#, fuzzy
#~ msgid ""
#~ "You have selected the following server(s): %s\n"
#~ "\n"
diff --git a/perl-install/install/share/po/hu.po b/perl-install/install/share/po/hu.po
index b99c92563..ae50d0b43 100644
--- a/perl-install/install/share/po/hu.po
+++ b/perl-install/install/share/po/hu.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: DrakX-2009.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
"PO-Revision-Date: 2009-03-31 12:08+0100\n"
"Last-Translator: Gergely Lónyai <aleph@mandriva.org>\n"
"Language-Team: Hungarian <aleph@mandriva.org>\n"
@@ -22,31 +22,6 @@ msgstr ""
"X-Poedit-Country: HUNGARY\n"
"X-Poedit-SourceCharset: utf-8\n"
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr "Az Ön munkaasztala egy USB kulcson"
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr "A 100%%-ban nyílt forráskódú Mandriva Linux disztribúció"
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr "A Linux könnyed kipróbálása: Mandriva One"
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr "Egy teljes Mandriva Linux munkaasztal, támogatással"
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr "Mandriva: disztribúciók minden igényre"
-
#: any.pm:109
#, c-format
msgid "Do you have further supplementary media?"
@@ -61,7 +36,8 @@ msgid ""
"\n"
"Do you have a supplementary installation medium to configure?"
msgstr ""
-"A telepítő a következő adathordozókat találta - ezeket fogja használni a telepítéshez: %s.\n"
+"A telepítő a következő adathordozókat találta - ezeket fogja használni a "
+"telepítéshez: %s.\n"
"\n"
"\n"
"Van beállítandó kiegészítő telepítési adathordozója?"
@@ -86,114 +62,128 @@ msgstr "Hálózat (FTP)"
msgid "Network (NFS)"
msgstr "Hálózat (NFS)"
-#: any.pm:163
+#: any.pm:165
#, c-format
msgid "URL of the mirror?"
msgstr "A tükörkiszolgáló címe?"
-#: any.pm:169
+#: any.pm:171
#, c-format
msgid "URL must start with ftp:// or http://"
msgstr "Az URL-nek ftp:// vagy http:// előtaggal kell kezdődnie"
-#: any.pm:180
+#: any.pm:182
#, c-format
-msgid "Contacting Mandriva Linux web site to get the list of available mirrors..."
-msgstr "Kapcsolódás a Mandriva Linux webkiszolgálójához; az elérhető tükörkiszolgálók listájának lekérdezése..."
+msgid ""
+"Contacting Mandriva Linux web site to get the list of available mirrors..."
+msgstr ""
+"Kapcsolódás a Mandriva Linux webkiszolgálójához; az elérhető "
+"tükörkiszolgálók listájának lekérdezése..."
-#: any.pm:185
+#: any.pm:187
#, c-format
-msgid "Failed contacting Mandriva Linux web site to get the list of available mirrors"
-msgstr "Nem sikerült lekérdezni az elérhető tükörkiszolgálók listáját a Mandriva Linux webkiszolgálójától"
+msgid ""
+"Failed contacting Mandriva Linux web site to get the list of available "
+"mirrors"
+msgstr ""
+"Nem sikerült lekérdezni az elérhető tükörkiszolgálók listáját a Mandriva "
+"Linux webkiszolgálójától"
-#: any.pm:195
+#: any.pm:197
#, c-format
msgid "Choose a mirror from which to get the packages"
msgstr "Válasszon tükörkiszolgálót, ahonnan letölti a csomagokat"
-#: any.pm:225
+#: any.pm:227
#, c-format
msgid "NFS setup"
msgstr "NFS-beállítás"
-#: any.pm:226
+#: any.pm:228
#, c-format
msgid "Please enter the hostname and directory of your NFS media"
msgstr "Adja meg az NFS-adathordozó gépnevét és könyvtárát"
-#: any.pm:230
+#: any.pm:232
#, c-format
msgid "Hostname missing"
msgstr "Gépnév hiányzik"
-#: any.pm:231
+#: any.pm:233
#, c-format
msgid "Directory must begin with \"/\""
msgstr "A könyvtárnak \"/\" jellel kell kezdődnie"
-#: any.pm:235
+#: any.pm:237
#, c-format
msgid "Hostname of the NFS mount ?"
msgstr "Az NFS-csatolás gépneve?"
-#: any.pm:236
+#: any.pm:238
#, c-format
msgid "Directory"
msgstr "Könyvtár"
-#: any.pm:258
+#: any.pm:260
#, c-format
msgid "Supplementary"
msgstr "Kiegészítő"
-#: any.pm:293
+#: any.pm:295
#, c-format
-msgid "Can't find a package list file on this mirror. Make sure the location is correct."
+msgid ""
+"Can't find a package list file on this mirror. Make sure the location is "
+"correct."
msgstr "A tükörkiszolgálón nem található fejléclista"
-#: any.pm:328
+#: any.pm:334
#, c-format
msgid "Looking at packages already installed..."
msgstr "A már telepített csomagok vizsgálata..."
-#: any.pm:362
+#: any.pm:368
#, c-format
msgid "Finding packages to upgrade..."
msgstr "A frissítendő csomagok keresése..."
-#: any.pm:381
+#: any.pm:387
#, c-format
msgid "Removing packages prior to upgrade..."
msgstr "Csomagok eltávolítása a frissítés előtt..."
-#: any.pm:402
+#: any.pm:408
#, c-format
msgid ""
"You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
-"on your system. This installer cannot preserve KDE 3.5 in an upgrade. If you choose to proceed, \n"
-"KDE 4 will replace KDE 3, and you will lose your personal KDE configuration settings. \n"
+"on your system. This installer cannot preserve KDE 3.5 in an upgrade. If you "
+"choose to proceed, \n"
+"KDE 4 will replace KDE 3, and you will lose your personal KDE configuration "
+"settings. \n"
"To upgrade with KDE 3.5 and your personal settings preserved, \n"
"please reboot your system and upgrade using the Mandriva update applet."
msgstr ""
-"A rendszer %s kiadásra frissítését választotta. KDE 3.5 található a jelenlegi rendszerén. \n"
-"Ez a telepítő nem tudja a KDE 3.5-öt biztonságosan frissíteni. Ha folytatja ezt a műveletet, \n"
-"akkor a KDE 4 le fogja cserélni a KDE 3.5-öt, de minden személyes KDE beállítása el fog veszni. \n"
+"A rendszer %s kiadásra frissítését választotta. KDE 3.5 található a "
+"jelenlegi rendszerén. \n"
+"Ez a telepítő nem tudja a KDE 3.5-öt biztonságosan frissíteni. Ha folytatja "
+"ezt a műveletet, \n"
+"akkor a KDE 4 le fogja cserélni a KDE 3.5-öt, de minden személyes KDE "
+"beállítása el fog veszni. \n"
"A KDE 3.5 frissítéséhez, illetve a személyes adatainak a megőrzéséhez \n"
-"kérjük indítsa el a saját rendszerét, és használja a Mandriva frissítő alkalmazását."
+"kérjük indítsa el a saját rendszerét, és használja a Mandriva frissítő "
+"alkalmazását."
-#: any.pm:407
-#: steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
#, c-format
msgid "Reboot"
msgstr "Újraindítás"
-#: any.pm:407
+#: any.pm:413
#, c-format
msgid "Proceed"
msgstr "Feldolgozva"
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -206,73 +196,72 @@ msgstr ""
"\n"
"Szeretné eltávolítani ezeket a csomagokat?\n"
-#: any.pm:815
+#: any.pm:821
#, c-format
msgid "Error reading file %s"
msgstr "Hiba a(z) %s fájl olvasása közben"
-#: any.pm:1022
+#: any.pm:1028
#, c-format
msgid "The following disk(s) were renamed:"
msgstr "A következő lemezek át lettek nevezve:"
-#: any.pm:1024
+#: any.pm:1030
#, c-format
msgid "%s (previously named as %s)"
msgstr "%s (korábbi név: %s)"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "HTTP"
msgstr "HTTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "FTP"
msgstr "FTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "NFS"
msgstr "NFS"
-#: any.pm:1100
-#: steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
#, c-format
msgid "Network"
msgstr "Hálózat"
-#: any.pm:1104
+#: any.pm:1110
#, c-format
msgid "Please choose a media"
msgstr "Válasszon egy adatforrást"
-#: any.pm:1120
+#: any.pm:1126
#, c-format
msgid "File already exists. Overwrite it?"
msgstr "A fájl már létezik. Felülírja?"
-#: any.pm:1124
+#: any.pm:1130
#, c-format
msgid "Permission denied"
msgstr "Hozzáférés megtagadva"
-#: any.pm:1172
+#: any.pm:1178
#, c-format
msgid "Bad NFS name"
msgstr "Helytelen NFS-név"
-#: any.pm:1193
+#: any.pm:1199
#, c-format
msgid "Bad media %s"
msgstr "\"%s\": hibás adatforrás"
-#: any.pm:1236
+#: any.pm:1242
#, c-format
msgid "Can not make screenshots before partitioning"
msgstr "Partícionálás előtt nem készíthetők képernyőfelvételek"
-#: any.pm:1244
+#: any.pm:1250
#, c-format
msgid "Screenshots will be available after install in %s"
msgstr "A képernyőfelvételek a telepítés után itt lesznek elérhetők: %s"
@@ -282,13 +271,16 @@ msgstr "A képernyőfelvételek a telepítés után itt lesznek elérhetők: %s"
msgid "Installation"
msgstr "Telepítés"
-#: gtk.pm:134
-#: share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
+#: gtk.pm:134 share/meta-task/compssUsers.pl:44
#, c-format
msgid "Configuration"
msgstr "Beállítás"
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
#: install2.pm:168
#, c-format
msgid "You must also format %s"
@@ -313,22 +305,22 @@ msgstr "A hálózatkezelés elindítása"
msgid "Bringing down the network"
msgstr "A hálózatkezelés leállítása"
-#: media.pm:402
+#: media.pm:399
#, c-format
msgid "Please wait, retrieving file"
msgstr "Kérem várjon, fájl betöltése"
-#: media.pm:734
+#: media.pm:718
#, c-format
-msgid "Downloading file %s..."
-msgstr "%s fájl letöltése..."
+msgid "unable to add medium"
+msgstr ""
-#: media.pm:822
+#: media.pm:758
#, c-format
msgid "Copying some packages on disks for future use"
msgstr "Bizonyos csomagok lemezre másolása későbbi használatra"
-#: media.pm:875
+#: media.pm:811
#, c-format
msgid "Copying in progress"
msgstr "Másolás folyamatban"
@@ -378,405 +370,345 @@ msgstr ""
msgid "An error occurred:"
msgstr "Hiba lépett fel:"
-#: pkgs.pm:776
+#: pkgs.pm:780
#, c-format
msgid "%d installation transactions failed"
msgstr "%d telepítési művelet nem sikerült"
-#: pkgs.pm:777
+#: pkgs.pm:781
#, c-format
msgid "Installation of packages failed:"
msgstr "Sikertelen csomagtelepítések:"
#: share/meta-task/compssUsers.pl:13
-#: share/meta-task/compssUsers.pl.orig:13
#, c-format
msgid "Workstation"
msgstr "Munkaállomás"
#: share/meta-task/compssUsers.pl:15
-#: share/meta-task/compssUsers.pl.orig:15
#, c-format
msgid "Office Workstation"
msgstr "Irodai munkaállomás"
#: share/meta-task/compssUsers.pl:17
-#: share/meta-task/compssUsers.pl.orig:17
#, c-format
-msgid "Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets (OpenOffice.org Calc, Kspread), PDF viewers, etc"
-msgstr "Irodai programok: szövegszerkesztők (OpenOffice.org Writer, KWord), táblázatkezelők (OpenOffice.org Calc, KSpread), PDF-megjelenítők, ..."
+msgid ""
+"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
+"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
+msgstr ""
+"Irodai programok: szövegszerkesztők (OpenOffice.org Writer, KWord), "
+"táblázatkezelők (OpenOffice.org Calc, KSpread), PDF-megjelenítők, ..."
#: share/meta-task/compssUsers.pl:18
-#: share/meta-task/compssUsers.pl.orig:18
#, c-format
-msgid "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, gnumeric), pdf viewers, etc"
-msgstr "Irodai programok: szövegszerkesztők (KWord, AbiWord), táblázatkezelők (KSpread, Gnumeric), PDF-nézegetők, ..."
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+"Irodai programok: szövegszerkesztők (KWord, AbiWord), táblázatkezelők "
+"(KSpread, Gnumeric), PDF-nézegetők, ..."
#: share/meta-task/compssUsers.pl:23
-#: share/meta-task/compssUsers.pl.orig:23
#, c-format
msgid "Game station"
msgstr "Játékgép"
#: share/meta-task/compssUsers.pl:24
-#: share/meta-task/compssUsers.pl.orig:24
#, c-format
msgid "Amusement programs: arcade, boards, strategy, etc"
msgstr "Játékprogramok: lövöldözős, táblás, stratégiai, ..."
#: share/meta-task/compssUsers.pl:27
-#: share/meta-task/compssUsers.pl.orig:27
#, c-format
msgid "Multimedia station"
msgstr "Multimédiás munkaállomás"
#: share/meta-task/compssUsers.pl:28
-#: share/meta-task/compssUsers.pl.orig:28
#, c-format
msgid "Sound and video playing/editing programs"
msgstr "Lejátszó- és szerkesztőprogramok hang- és videóanyagokhoz"
#: share/meta-task/compssUsers.pl:33
-#: share/meta-task/compssUsers.pl.orig:33
#, c-format
msgid "Internet station"
msgstr "Internetes munkaállomás"
#: share/meta-task/compssUsers.pl:34
-#: share/meta-task/compssUsers.pl.orig:34
#, c-format
-msgid "Set of tools to read and send mail and news (mutt, tin..) and to browse the Web"
-msgstr "Eszközök levelezéshez, hírkezeléshez (mutt, tin, ...) és a web böngészéséhez"
+msgid ""
+"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
+"Web"
+msgstr ""
+"Eszközök levelezéshez, hírkezeléshez (mutt, tin, ...) és a web böngészéséhez"
#: share/meta-task/compssUsers.pl:39
-#: share/meta-task/compssUsers.pl.orig:39
#, c-format
msgid "Network Computer (client)"
msgstr "Hálózati számítógép (kliens)"
#: share/meta-task/compssUsers.pl:40
-#: share/meta-task/compssUsers.pl.orig:40
#, c-format
msgid "Clients for different protocols including ssh"
msgstr "Kliensprogramok különféle protokollokhoz (például: ssh)"
#: share/meta-task/compssUsers.pl:45
-#: share/meta-task/compssUsers.pl.orig:45
#, c-format
msgid "Tools to ease the configuration of your computer"
msgstr "Segédprogramok a számítógép beállításához"
#: share/meta-task/compssUsers.pl:49
-#: share/meta-task/compssUsers.pl.orig:49
#, c-format
msgid "Console Tools"
msgstr "Parancssori eszközök"
#: share/meta-task/compssUsers.pl:50
-#: share/meta-task/compssUsers.pl.orig:50
#, c-format
msgid "Editors, shells, file tools, terminals"
msgstr "Szövegszerkesztők, parancsértelmezők, fájlkezelők, terminálprogramok"
-#: share/meta-task/compssUsers.pl:54
-#: share/meta-task/compssUsers.pl:157
+#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
#: share/meta-task/compssUsers.pl:159
-#: share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
#, c-format
msgid "Development"
msgstr "Fejlesztés"
-#: share/meta-task/compssUsers.pl:55
-#: share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
+#: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
#, c-format
msgid "C and C++ development libraries, programs and include files"
msgstr "C/C++ fejlesztőkönyvtárak, programok és include-fájlok"
-#: share/meta-task/compssUsers.pl:58
-#: share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
+#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
#, c-format
msgid "Documentation"
msgstr "Dokumentáció"
-#: share/meta-task/compssUsers.pl:59
-#: share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
+#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
#, c-format
msgid "Books and Howto's on Linux and Free Software"
msgstr "Könyvek és HOGYAN-ok a Linuxról és a szabad szoftverekről"
-#: share/meta-task/compssUsers.pl:63
-#: share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
+#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
#, c-format
msgid "LSB"
msgstr "LSB"
-#: share/meta-task/compssUsers.pl:64
-#: share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
+#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
#, c-format
msgid "Linux Standard Base. Third party applications support"
msgstr "Linux Standard Base. Külső társaságok alkalmazásainak támogatása."
#: share/meta-task/compssUsers.pl:73
-#: share/meta-task/compssUsers.pl.orig:73
#, c-format
msgid "Web Server"
msgstr "Webkiszolgáló"
#: share/meta-task/compssUsers.pl:74
-#: share/meta-task/compssUsers.pl.orig:74
#, c-format
msgid "Apache"
msgstr "Apache"
#: share/meta-task/compssUsers.pl:77
-#: share/meta-task/compssUsers.pl.orig:77
#, c-format
msgid "Groupware"
msgstr "Csoportmunka-alkalmazás"
#: share/meta-task/compssUsers.pl:78
-#: share/meta-task/compssUsers.pl.orig:78
#, c-format
msgid "Kolab Server"
msgstr "Kolab kiszolgáló"
-#: share/meta-task/compssUsers.pl:81
-#: share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
+#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
#, c-format
msgid "Firewall/Router"
msgstr "Tűzfal/útválasztó (router)"
-#: share/meta-task/compssUsers.pl:82
-#: share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
+#: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
#, c-format
msgid "Internet gateway"
msgstr "Internet átjáró"
#: share/meta-task/compssUsers.pl:85
-#: share/meta-task/compssUsers.pl.orig:85
#, c-format
msgid "Mail/News"
msgstr "Levelezés/hírek"
#: share/meta-task/compssUsers.pl:86
-#: share/meta-task/compssUsers.pl.orig:86
#, c-format
msgid "Postfix mail server, Inn news server"
msgstr "Postfix email kiszolgáló, Inn hírkiszolgáló"
#: share/meta-task/compssUsers.pl:89
-#: share/meta-task/compssUsers.pl.orig:89
#, c-format
msgid "Directory Server"
msgstr "Címtárkiszolgáló"
#: share/meta-task/compssUsers.pl:93
-#: share/meta-task/compssUsers.pl.orig:93
#, c-format
msgid "FTP Server"
msgstr "FTP kiszolgáló"
#: share/meta-task/compssUsers.pl:94
-#: share/meta-task/compssUsers.pl.orig:94
#, c-format
msgid "ProFTPd"
msgstr "ProFTPd"
#: share/meta-task/compssUsers.pl:97
-#: share/meta-task/compssUsers.pl.orig:97
#, c-format
msgid "DNS/NIS"
msgstr "DNS/NIS"
#: share/meta-task/compssUsers.pl:98
-#: share/meta-task/compssUsers.pl.orig:98
#, c-format
msgid "Domain Name and Network Information Server"
msgstr "DNS és NIS kiszolgáló"
#: share/meta-task/compssUsers.pl:101
-#: share/meta-task/compssUsers.pl.orig:101
#, c-format
msgid "File and Printer Sharing Server"
msgstr "Fájl- és nyomtatómegosztási kiszolgáló"
#: share/meta-task/compssUsers.pl:102
-#: share/meta-task/compssUsers.pl.orig:102
#, c-format
msgid "NFS Server, Samba server"
msgstr "NFS kiszolgáló, Samba kiszolgáló"
-#: share/meta-task/compssUsers.pl:105
-#: share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
+#: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
#, c-format
msgid "Database"
msgstr "Adatbázis"
#: share/meta-task/compssUsers.pl:106
-#: share/meta-task/compssUsers.pl.orig:106
#, c-format
msgid "PostgreSQL and MySQL Database Server"
msgstr "PostgreSQL és MySQL adatbázis kiszolgáló"
#: share/meta-task/compssUsers.pl:110
-#: share/meta-task/compssUsers.pl.orig:110
#, c-format
msgid "Web/FTP"
msgstr "Web/FTP"
#: share/meta-task/compssUsers.pl:111
-#: share/meta-task/compssUsers.pl.orig:111
#, c-format
msgid "Apache, Pro-ftpd"
msgstr "Apache, Pro-ftpd"
#: share/meta-task/compssUsers.pl:114
-#: share/meta-task/compssUsers.pl.orig:114
#, c-format
msgid "Mail"
msgstr "Levelezés"
#: share/meta-task/compssUsers.pl:115
-#: share/meta-task/compssUsers.pl.orig:115
#, c-format
msgid "Postfix mail server"
msgstr "Postfix email kiszolgáló"
#: share/meta-task/compssUsers.pl:119
-#: share/meta-task/compssUsers.pl.orig:119
#, c-format
msgid "PostgreSQL or MySQL database server"
msgstr "PostgreSQL vagy MySQL adatbázis kiszolgáló"
#: share/meta-task/compssUsers.pl:126
-#: share/meta-task/compssUsers.pl.orig:126
#, c-format
msgid "Network Computer server"
msgstr "Kiszolgáló hálózati számítógépekhez"
#: share/meta-task/compssUsers.pl:127
-#: share/meta-task/compssUsers.pl.orig:127
#, c-format
msgid "NFS server, SMB server, Proxy server, ssh server"
msgstr "NFS, SMB, proxy és SSH kiszolgáló"
#: share/meta-task/compssUsers.pl:133
-#: share/meta-task/compssUsers.pl.orig:133
#, c-format
msgid "Graphical Environment"
msgstr "Grafikus környezet"
#: share/meta-task/compssUsers.pl:135
-#: share/meta-task/compssUsers.pl.orig:135
#, c-format
msgid "KDE Workstation"
msgstr "KDE munkaállomás"
#: share/meta-task/compssUsers.pl:136
-#: share/meta-task/compssUsers.pl.orig:136
#, c-format
-msgid "The K Desktop Environment, the basic graphical environment with a collection of accompanying tools"
-msgstr "A K Desktop Environment - az alapvető grafikus környezet - az ahhoz tartozó eszközökkel együtt"
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr ""
+"A K Desktop Environment - az alapvető grafikus környezet - az ahhoz tartozó "
+"eszközökkel együtt"
#: share/meta-task/compssUsers.pl:140
-#: share/meta-task/compssUsers.pl.orig:140
#, c-format
msgid "GNOME Workstation"
msgstr "GNOME munkaállomás"
#: share/meta-task/compssUsers.pl:141
-#: share/meta-task/compssUsers.pl.orig:141
#, c-format
-msgid "A graphical environment with user-friendly set of applications and desktop tools"
-msgstr "Grafikus környezet felhasználóbarát alkalmazásokkal és segédprogramokkal"
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr ""
+"Grafikus környezet felhasználóbarát alkalmazásokkal és segédprogramokkal"
#: share/meta-task/compssUsers.pl:145
-#: share/meta-task/compssUsers.pl.orig:145
#, c-format
msgid "LXDE Desktop"
msgstr "LXDE munkaasztal"
#: share/meta-task/compssUsers.pl:147
#, c-format
-msgid "A lightweight & fast graphical environment with user-friendly set of applications and desktop tools"
-msgstr "Egy könnyű és gyors grafikus környezet felhasználóbarát alkalmazásokkal és segédprogramokkal"
+msgid ""
+"A lightweight & fast graphical environment with user-friendly set of "
+"applications and desktop tools"
+msgstr ""
+"Egy könnyű és gyors grafikus környezet felhasználóbarát alkalmazásokkal és "
+"segédprogramokkal"
#: share/meta-task/compssUsers.pl:150
-#: share/meta-task/compssUsers.pl.orig:149
#, c-format
msgid "Other Graphical Desktops"
msgstr "Más grafikus környezetek"
#: share/meta-task/compssUsers.pl:151
-#: share/meta-task/compssUsers.pl.orig:150
#, c-format
msgid "Window Maker, Enlightenment, Fvwm, etc"
msgstr "WindowMaker, Enlightenment, Fvwm, ..."
#: share/meta-task/compssUsers.pl:174
-#: share/meta-task/compssUsers.pl.orig:173
#, c-format
msgid "Utilities"
msgstr "Segédprogramok"
-#: share/meta-task/compssUsers.pl:176
-#: share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
+#: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
#, c-format
msgid "SSH Server"
msgstr "SSH kiszolgáló"
#: share/meta-task/compssUsers.pl:181
-#: share/meta-task/compssUsers.pl.orig:180
#, c-format
msgid "Webmin"
msgstr "Webmin"
#: share/meta-task/compssUsers.pl:182
-#: share/meta-task/compssUsers.pl.orig:181
#, c-format
msgid "Webmin Remote Configuration Server"
msgstr "Webmin kiszolgáló távoli beállításhoz"
#: share/meta-task/compssUsers.pl:186
-#: share/meta-task/compssUsers.pl.orig:185
#, c-format
msgid "Network Utilities/Monitoring"
msgstr "Hálózati programok/hálózatfigyelés"
#: share/meta-task/compssUsers.pl:187
-#: share/meta-task/compssUsers.pl.orig:186
#, c-format
msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
msgstr "Figyelőeszközök, folyamatszámlázás, tcpdump, nmap, ..."
#: share/meta-task/compssUsers.pl:191
-#: share/meta-task/compssUsers.pl.orig:190
#, c-format
msgid "Mandriva Wizards"
msgstr "Mandriva varázslók"
#: share/meta-task/compssUsers.pl:192
-#: share/meta-task/compssUsers.pl.orig:191
#, c-format
msgid "Wizards to configure server"
msgstr "Varázslók a kiszolgáló beállítására"
@@ -795,7 +727,8 @@ msgstr ""
msgid ""
"Some important packages did not get installed properly.\n"
"Either your cdrom drive or your cdrom is defective.\n"
-"Check the cdrom on an installed computer using \"rpm -qpl media/main/*.rpm\"\n"
+"Check the cdrom on an installed computer using \"rpm -qpl media/main/*.rpm"
+"\"\n"
msgstr ""
"Néhány fontos csomag telepítése nem sikerült.\n"
"Ez azt jelenti, hogy a CD-meghajtó vagy a CD hibás.\n"
@@ -803,8 +736,7 @@ msgstr ""
"parancs segítségével tesztelheti le:\n"
"\"rpm -qpl media/main/*.rpm\"\n"
-#: steps_auto_install.pm:71
-#: steps_stdio.pm:27
+#: steps_auto_install.pm:71 steps_stdio.pm:27
#, c-format
msgid "Entering step `%s'\n"
msgstr "A következő lépés: \"%s\"\n"
@@ -828,7 +760,8 @@ msgstr "Az Xorg kiszolgáló lassan indul. Kérem várjon..."
#, c-format
msgid ""
"Your system is low on resources. You may have some problem installing\n"
-"Mandriva Linux. If that occurs, you can try a text install instead. For this,\n"
+"Mandriva Linux. If that occurs, you can try a text install instead. For "
+"this,\n"
"press `F1' when booting on CDROM, then enter `text'."
msgstr ""
"A rendszer gyenge erőforrásokkal rendelkezik. Előfordulhat, hogy problémái\n"
@@ -876,21 +809,17 @@ msgstr "Így fog kinézni a '%s' munkaasztala."
msgid "Click on images in order to see a bigger preview"
msgstr "Kattintson a képre, ha nagyobb méretben szeretné megtekinteni"
-#: steps_gtk.pm:315
-#: steps_interactive.pm:606
-#: steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
#, c-format
msgid "Package Group Selection"
msgstr "Csomagcsoportok kiválasztása"
-#: steps_gtk.pm:336
-#: steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
#, c-format
msgid "Individual package selection"
msgstr "Csomagok egyedi kiválasztása"
-#: steps_gtk.pm:360
-#: steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
#, c-format
msgid "Total size: %d / %d MB"
msgstr "Összméret: %d / %d MB"
@@ -960,8 +889,11 @@ msgstr "\"%s\" megtartása érdekében"
#: steps_gtk.pm:452
#, c-format
-msgid "You can not select this package as there is not enough space left to install it"
-msgstr "Nem választhatja ki ezt a csomagot, mert nincs elég hely a merevlemezen."
+msgid ""
+"You can not select this package as there is not enough space left to install "
+"it"
+msgstr ""
+"Nem választhatja ki ezt a csomagot, mert nincs elég hely a merevlemezen."
#: steps_gtk.pm:455
#, c-format
@@ -986,7 +918,8 @@ msgstr "Nem törölhető ennek a csomagnak a kijelölése, mert már telepítve
#: steps_gtk.pm:485
#, c-format
msgid "You can not unselect this package. It must be upgraded"
-msgstr "Nem törölheti ennek a csomagnak a kijelölését. Ez a csomag frissítendő."
+msgstr ""
+"Nem törölheti ennek a csomagnak a kijelölését. Ez a csomag frissítendő."
#: steps_gtk.pm:489
#, c-format
@@ -1018,15 +951,12 @@ msgstr "Minimális telepítés"
msgid "Software Management"
msgstr "Szoftverkezelés"
-#: steps_gtk.pm:517
-#: steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
#, c-format
msgid "Choose the packages you want to install"
msgstr "Válassza ki a telepítendő csomagokat"
-#: steps_gtk.pm:534
-#: steps_interactive.pm:637
-#: steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
#, c-format
msgid "Installing"
msgstr "Telepítés"
@@ -1053,9 +983,7 @@ msgid_plural "%d packages"
msgstr[0] "%d csomag"
msgstr[1] "%d csomag"
-#: steps_gtk.pm:651
-#: steps_interactive.pm:800
-#: steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
#, c-format
msgid "Summary"
msgstr "Összefoglalás"
@@ -1065,9 +993,7 @@ msgstr "Összefoglalás"
msgid "Configure"
msgstr "Beállítás"
-#: steps_gtk.pm:687
-#: steps_interactive.pm:796
-#: steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
#, c-format
msgid "not configured"
msgstr "nincs beállítva"
@@ -1077,8 +1003,7 @@ msgstr "nincs beállítva"
msgid "Media Selection"
msgstr "Adathordozó kiválasztása"
-#: steps_gtk.pm:730
-#: steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
#, c-format
msgid ""
"The following installation media have been found.\n"
@@ -1087,18 +1012,20 @@ msgstr ""
"A rendszer a következő telepítési adathordozókat találta.\n"
"Ha szeretné kihagyni valamelyiket, távolítsa el annak kijelölését."
-#: steps_gtk.pm:746
-#: steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
#, c-format
msgid ""
-"You have the option to copy the contents of the CDs onto the hard drive before installation.\n"
-"It will then continue from the hard drive and the packages will remain available once the system is fully installed."
+"You have the option to copy the contents of the CDs onto the hard drive "
+"before installation.\n"
+"It will then continue from the hard drive and the packages will remain "
+"available once the system is fully installed."
msgstr ""
-"Lehetősége van arra, hogy a CD-k tartalmát lemásolja a merevlemezre a telepítés előtt.\n"
-"Ez esetben a telepítés a merevlemezről folytatódik, és annak végeztével a csomagok elérhetők maradnak."
+"Lehetősége van arra, hogy a CD-k tartalmát lemásolja a merevlemezre a "
+"telepítés előtt.\n"
+"Ez esetben a telepítés a merevlemezről folytatódik, és annak végeztével a "
+"csomagok elérhetők maradnak."
-#: steps_gtk.pm:748
-#: steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
#, c-format
msgid "Copy whole CDs"
msgstr "Teljes CD-k másolása"
@@ -1118,59 +1045,49 @@ msgstr "Válasszon billentyűzetkiosztást"
msgid "Here is the full list of available keyboards:"
msgstr "Az elérhető billentyűzetek teljes listája:"
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
#, c-format
msgid "Install/Upgrade"
msgstr "Telepítés/frissítés"
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
#, c-format
msgid "Is this an install or an upgrade?"
msgstr "Új telepítés vagy frissítés?"
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
#, c-format
msgid ""
"_: This is a noun:\n"
"Install"
msgstr "Telepítés"
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
#, c-format
msgid "Upgrade %s"
msgstr "Frissítés: %s"
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr "32 bites disztribúcióról 64 bitesre való frissítés nem támogatott"
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr "64 bites disztribúcióról 32 bitesre való frissítés nem támogatott"
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
#, c-format
msgid "Encryption key for %s"
msgstr "Titkosítási kulcs ehhez: %s"
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
#, c-format
msgid "Cancel installation, reboot system"
msgstr "Telepítés megszakítva, a rendszer újraindul"
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
#, c-format
msgid "New Installation"
msgstr "Új telepítés"
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
#, c-format
msgid "Upgrade previous installation (not recommended)"
msgstr "Előző telepítés frissítése (nem ajánlott)"
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
#, c-format
msgid ""
"Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1189,48 +1106,65 @@ msgstr ""
"Figyelem: ha az \"Új telepítést\" választja, akkor ajánlott minden \n"
"személyes adat előzetes lementése."
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "IDE"
msgstr "IDE"
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "Configuring IDE"
msgstr "IDE beállítások"
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
#, c-format
-msgid "No free space for 1MB bootstrap! Install will continue, but to boot your system, you'll need to create the bootstrap partition in DiskDrake"
-msgstr "Nincs elég szabad hely az 1 MB-os betöltőprogramnak. A telepítés folytatható, de a rendszer indításához létre kell hozni egy rendszerindító partíciót a DiskDrake-kel."
+msgid ""
+"No free space for 1MB bootstrap! Install will continue, but to boot your "
+"system, you'll need to create the bootstrap partition in DiskDrake"
+msgstr ""
+"Nincs elég szabad hely az 1 MB-os betöltőprogramnak. A telepítés "
+"folytatható, de a rendszer indításához létre kell hozni egy rendszerindító "
+"partíciót a DiskDrake-kel."
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
#, c-format
-msgid "You'll need to create a PPC PReP Boot bootstrap! Install will continue, but to boot your system, you'll need to create the bootstrap partition in DiskDrake"
-msgstr "Létre kell hozni egy PPC PReP rendszerindítót. A telepítés folytatódik, de a rendszer indításához létre kell hozni a rendszerindítási partíciót a DiskDrake-kel."
+msgid ""
+"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
+"to boot your system, you'll need to create the bootstrap partition in "
+"DiskDrake"
+msgstr ""
+"Létre kell hozni egy PPC PReP rendszerindítót. A telepítés folytatódik, de a "
+"rendszer indításához létre kell hozni a rendszerindítási partíciót a "
+"DiskDrake-kel."
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
#, c-format
msgid ""
"Change your Cd-Rom!\n"
-"Please insert the Cd-Rom labelled \"%s\" in your drive and press Ok when done.\n"
+"Please insert the Cd-Rom labelled \"%s\" in your drive and press Ok when "
+"done.\n"
"If you do not have it, press Cancel to avoid installation from this Cd-Rom."
msgstr ""
"Cserélje ki a CD-t a meghajtóban.\n"
"Tegye be a(z) \"%s\" feliratú lemezt, és nyomja meg az \"OK\" gombot.\n"
-"Ha nincs ilyen lemeze, akkor nyomja meg a \"Mégsem\" gombot, így erről a CD-ről nem történik telepítés."
+"Ha nincs ilyen lemeze, akkor nyomja meg a \"Mégsem\" gombot, így erről a CD-"
+"ről nem történik telepítés."
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
#, c-format
msgid "Looking for available packages..."
msgstr "A rendelkezésre álló csomagok keresése..."
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
#, c-format
-msgid "Your system does not have enough space left for installation or upgrade (%dMB > %dMB)"
-msgstr "A rendszerben nincs elegendő szabad hely a telepítéshez illetve frissítéshez (%d MB > %d MB)"
+msgid ""
+"Your system does not have enough space left for installation or upgrade (%"
+"dMB > %dMB)"
+msgstr ""
+"A rendszerben nincs elegendő szabad hely a telepítéshez illetve frissítéshez "
+"(%d MB > %d MB)"
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
#, c-format
msgid ""
"Please choose load or save package selection.\n"
@@ -1240,52 +1174,52 @@ msgstr ""
"csomagkijelölést vagy a jelenlegi kijelölést szeretné elmenteni.\n"
"A formátum ugyanaz, mint az automatikus telepítési fájloknál."
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Load"
msgstr "Terhelés"
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Save"
msgstr "Mentés"
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
#, c-format
msgid "Bad file"
msgstr "Hibás fájl"
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
#, c-format
msgid "KDE"
msgstr "KDE"
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
#, c-format
msgid "GNOME"
msgstr "GNOME"
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
#, c-format
msgid "Desktop Selection"
msgstr "Munkaasztal kiválasztása"
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
#, c-format
msgid "You can choose your workstation desktop profile."
msgstr "Kiválaszthatja a munkaállomás asztalprofilját."
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
#, c-format
msgid "Selected size is larger than available space"
msgstr "A kijelölt összméret nagyobb, mint a rendelkezésre álló hely"
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
#, c-format
msgid "Type of install"
msgstr "A telepítés típusa"
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
#, c-format
msgid ""
"You have not selected any group of packages.\n"
@@ -1294,83 +1228,84 @@ msgstr ""
"Egyetlen csomagcsoportot sem jelölt ki.\n"
"Válassza ki, milyen fajta minimális telepítést szeretne."
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
#, c-format
msgid "With X"
msgstr "X-xel együtt"
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
#, c-format
msgid "With basic documentation (recommended!)"
msgstr "Alapvető dokumentációval (javasolt)"
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
#, c-format
msgid "Truly minimal install (especially no urpmi)"
msgstr "Valóban minimális telepítés (urpmi sincs)"
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
#, c-format
msgid "Preparing installation"
msgstr "A telepítés előkészítése"
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
#, c-format
msgid "Installing package %s"
msgstr "%s csomag telepítése"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "There was an error ordering packages:"
msgstr "Hiba történt a csomagok rendezésekor:"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "Go on anyway?"
msgstr "Kívánja folytatni ettől függetlenül?"
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
#, c-format
msgid "Retry"
msgstr "Újra"
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
#, c-format
msgid "Skip this package"
msgstr "Ezen csomag kihagyása"
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
#, c-format
msgid "Skip all packages from medium \"%s\""
msgstr "A(z) \"%s\" adathordozón levő összes csomag kihagyása"
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
#, c-format
msgid "Go back to media and packages selection"
msgstr "Visszalépés az adathordozó és csomagválasztáshoz"
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
#, c-format
msgid "There was an error installing package %s."
msgstr "Hiba történt a(z) %s csomag telepítésekor."
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
#, c-format
msgid "Post-install configuration"
msgstr "Telepítés utáni beállítások"
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
#, c-format
msgid "Please ensure the Update Modules media is in drive %s"
-msgstr "Tegye be a frissítési modulokat tartalmazó adathordozót a(z) \"%s\" meghajtóba"
+msgstr ""
+"Tegye be a frissítési modulokat tartalmazó adathordozót a(z) \"%s\" "
+"meghajtóba"
-#: steps_interactive.pm:734
-#: steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
#, c-format
msgid "Updates"
msgstr "Frissítések"
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
#, c-format
msgid ""
"You now have the opportunity to download updated packages. These packages\n"
@@ -1389,118 +1324,131 @@ msgstr ""
"\n"
"Szeretné feltelepíteni a frissítéseket?"
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
#, c-format
msgid "%s on %s"
msgstr "%s ezen: %s"
-#: steps_interactive.pm:875
-#: steps_interactive.pm:882
-#: steps_interactive.pm:895
-#: steps_interactive.pm:912
-#: steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
#, c-format
msgid "Hardware"
msgstr "Hardver"
-#: steps_interactive.pm:896
-#: steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
#, c-format
msgid "Sound card"
msgstr "Hangkártya"
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
#, c-format
msgid "Do you have an ISA sound card?"
msgstr "Van ISA hangkártyája?"
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
#, c-format
-msgid "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound card"
-msgstr "A hangkártya beállításához futtassa az \"alsaconf\" vagy az \"sndconfig\" programot a telepítés után."
+msgid ""
+"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
+"card"
+msgstr ""
+"A hangkártya beállításához futtassa az \"alsaconf\" vagy az \"sndconfig\" "
+"programot a telepítés után."
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
#, c-format
msgid "No sound card detected. Try \"harddrake\" after installation"
-msgstr "A telepítő nem talált hangkártyát. Futtassa a \"harddrake\" programot a telepítés után."
+msgstr ""
+"A telepítő nem talált hangkártyát. Futtassa a \"harddrake\" programot a "
+"telepítés után."
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
#, c-format
msgid "Graphical interface"
msgstr "Grafikus felület"
-#: steps_interactive.pm:934
-#: steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
#, c-format
msgid "Network & Internet"
msgstr "Hálózat és internet"
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
#, c-format
msgid "Proxies"
msgstr "Proxyk"
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
#, c-format
msgid "configured"
msgstr "beállítva"
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
#, c-format
msgid "Security Level"
msgstr "Biztonsági szint"
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
#, c-format
msgid "Firewall"
msgstr "Tűzfal"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "activated"
msgstr "aktiválva"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "disabled"
msgstr "kikapcsolva"
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
#, c-format
msgid "You have not configured X. Are you sure you really want this?"
msgstr "Az X grafikus rendszert nem állította be. Biztosan megfelel így?"
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
#, c-format
msgid "Preparing bootloader..."
msgstr "Rendszerbetöltő előkészítése..."
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
#, c-format
msgid "Be patient, this may take a while..."
msgstr "Egy kis türelmét kérem..."
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
#, c-format
-msgid "You appear to have an OldWorld or Unknown machine, the yaboot bootloader will not work for you. The install will continue, but you'll need to use BootX or some other means to boot your machine. The kernel argument for the root fs is: root=%s"
-msgstr "A gép típusa feltehetően OldWorld vagy ismeretlen, ezért a Yaboot rendszerindító program nem fog működni. A telepítés folytatódik, de a gép indításához BootX-re vagy egyéb módszerre lesz szükség. A gyökér-fájlrendszer kernelparamétere: root=%s"
+msgid ""
+"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
+"will not work for you. The install will continue, but you'll need to use "
+"BootX or some other means to boot your machine. The kernel argument for the "
+"root fs is: root=%s"
+msgstr ""
+"A gép típusa feltehetően OldWorld vagy ismeretlen, ezért a Yaboot "
+"rendszerindító program nem fog működni. A telepítés folytatódik, de a gép "
+"indításához BootX-re vagy egyéb módszerre lesz szükség. A gyökér-"
+"fájlrendszer kernelparamétere: root=%s"
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
#, c-format
-msgid "In this security level, access to the files in the Windows partition is restricted to the administrator."
-msgstr "Ezen a biztonsági szinten csak a rendszergazda érheti el a windowsos partíción levő fájlokat."
+msgid ""
+"In this security level, access to the files in the Windows partition is "
+"restricted to the administrator."
+msgstr ""
+"Ezen a biztonsági szinten csak a rendszergazda érheti el a windowsos "
+"partíción levő fájlokat."
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr "Tegyen egy üres floppyt a(z) \"%s\" meghajtóba"
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
#, c-format
msgid "Creating auto install floppy..."
msgstr "Automatikus telepítőfloppy készítése..."
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
#, c-format
msgid ""
"Some steps are not completed.\n"
@@ -1511,7 +1459,7 @@ msgstr ""
"\n"
"Biztos, hogy ki akar lépni?"
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
#, c-format
msgid "Congratulations"
msgstr "Gratulálunk"
@@ -1524,8 +1472,7 @@ msgid ""
"Language"
msgstr "Nyelv"
-#: steps_list.pm:16
-#: steps_list.pm:23
+#: steps_list.pm:16 steps_list.pm:23
#, c-format
msgid "Localization"
msgstr "Lokalizáció"
@@ -1544,16 +1491,14 @@ msgid ""
"Mouse"
msgstr "Egér"
-#: steps_list.pm:19
-#: steps_list.pm:20
+#: steps_list.pm:19 steps_list.pm:20
#, c-format
msgid ""
"_: Keep these entry short\n"
"Hard drive detection"
msgstr "Merevlemez keresése"
-#: steps_list.pm:21
-#: steps_list.pm:22
+#: steps_list.pm:21 steps_list.pm:22
#, c-format
msgid ""
"_: Keep these entry short\n"
@@ -1581,8 +1526,7 @@ msgid ""
"Partitioning"
msgstr "Partícionálás"
-#: steps_list.pm:27
-#: steps_list.pm:28
+#: steps_list.pm:27 steps_list.pm:28
#, c-format
msgid ""
"_: Keep these entry short\n"
@@ -1610,24 +1554,21 @@ msgid ""
"Users"
msgstr "Felhasználók"
-#: steps_list.pm:36
-#: steps_list.pm:37
+#: steps_list.pm:36 steps_list.pm:37
#, c-format
msgid ""
"_: Keep these entry short\n"
"Networking"
msgstr "Hálózat"
-#: steps_list.pm:38
-#: steps_list.pm:39
+#: steps_list.pm:38 steps_list.pm:39
#, c-format
msgid ""
"_: Keep these entry short\n"
"Bootloader"
msgstr "Rendszerbetöltő"
-#: steps_list.pm:40
-#: steps_list.pm:41
+#: steps_list.pm:40 steps_list.pm:41
#, c-format
msgid ""
"_: Keep these entry short\n"
@@ -1641,8 +1582,7 @@ msgid ""
"Summary"
msgstr "Összefoglalás"
-#: steps_list.pm:44
-#: steps_list.pm:45
+#: steps_list.pm:44 steps_list.pm:45
#, c-format
msgid ""
"_: Keep these entry short\n"
@@ -1663,6 +1603,30 @@ msgid ""
"Exit"
msgstr "Kilépés"
+#~ msgid "Your desktop on a USB key"
+#~ msgstr "Az Ön munkaasztala egy USB kulcson"
+
+#~ msgid "The 100%% open source Mandriva Linux distribution"
+#~ msgstr "A 100%%-ban nyílt forráskódú Mandriva Linux disztribúció"
+
+#~ msgid "Explore Linux easily with Mandriva One"
+#~ msgstr "A Linux könnyed kipróbálása: Mandriva One"
+
+#~ msgid "A full Mandriva Linux desktop, with support"
+#~ msgstr "Egy teljes Mandriva Linux munkaasztal, támogatással"
+
+#~ msgid "Mandriva: distributions for everybody's needs"
+#~ msgstr "Mandriva: disztribúciók minden igényre"
+
+#~ msgid "Downloading file %s..."
+#~ msgstr "%s fájl letöltése..."
+
+#~ msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
+#~ msgstr "32 bites disztribúcióról 64 bitesre való frissítés nem támogatott"
+
+#~ msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
+#~ msgstr "64 bites disztribúcióról 32 bitesre való frissítés nem támogatott"
+
#~ msgid ""
#~ "You have selected the following server(s): %s\n"
#~ "\n"
@@ -1686,16 +1650,21 @@ msgstr "Kilépés"
#~ "\n"
#~ "\n"
#~ "Biztosan telepíteni szeretné a kiszolgálóprogramo(ka)t?\n"
+
#~ msgid "IceWm Desktop"
#~ msgstr "IceWm-munkaasztal"
+
#~ msgid "Contacting the mirror to get the list of available packages..."
#~ msgstr ""
#~ "Kapcsolatfelvétel a tükörkiszolgálóval; az elérhető csomagok listájának "
#~ "letöltése..."
+
#~ msgid "Unable to contact mirror %s"
#~ msgstr "Nem sikerült kapcsolódni ehhez a tükörkiszolgálóhoz: %s"
+
#~ msgid "Generate auto install floppy"
#~ msgstr "Automatikus telepítőfloppy készítése"
+
#~ msgid ""
#~ "The auto install can be fully automated if wanted,\n"
#~ "in that case it will take over the hard drive!!\n"
@@ -1709,14 +1678,19 @@ msgstr "Kilépés"
#~ "a rendszert.\n"
#~ "\n"
#~ "Lehetőség van a telepítés újrajátszására is.\n"
+
#~ msgid "Replay"
#~ msgstr "Újrajátszás"
+
#~ msgid "Automated"
#~ msgstr "Automatikus"
+
#~ msgid "Save packages selection"
#~ msgstr "Csomagösszeállítás mentése"
+
#~ msgid "Do you want to use aboot?"
#~ msgstr "Szeretné az aboot-ot használni?"
+
#~ msgid ""
#~ "Error installing aboot, \n"
#~ "try to force installation even if that destroys the first partition?"
@@ -1724,4 +1698,3 @@ msgstr "Kilépés"
#~ "Hiba az aboot telepítésekor.\n"
#~ "Próbáljam újra a telepítést akkor is, ha ez esetleg tönkreteszi az első\n"
#~ "partíciót?"
-
diff --git a/perl-install/install/share/po/id.po b/perl-install/install/share/po/id.po
index 4def4ffce..1eaccf092 100644
--- a/perl-install/install/share/po/id.po
+++ b/perl-install/install/share/po/id.po
@@ -16,7 +16,7 @@ msgid ""
msgstr ""
"Project-Id-Version: DrakX 0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
"PO-Revision-Date: 2007-10-27 18:51+0700\n"
"Last-Translator: Willy Sudiarto Raharjo <willysr@gmail.com>\n"
"Language-Team: Indonesia <mdk-id@yahoogroups.com>\n"
@@ -26,31 +26,6 @@ msgstr ""
"X-Generator: KBabel 0.6\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr ""
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr ""
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr ""
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr ""
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr ""
-
#: any.pm:109
#, c-format
msgid "Do you have further supplementary media?"
@@ -90,23 +65,23 @@ msgstr "Jaringan (FTP)"
msgid "Network (NFS)"
msgstr "Jaringan (NFS)"
-#: any.pm:163
+#: any.pm:165
#, c-format
msgid "URL of the mirror?"
msgstr "URL dari mirror?"
-#: any.pm:169
+#: any.pm:171
#, c-format
msgid "URL must start with ftp:// or http://"
msgstr "URL harus diawali dengan ftp:// atau http://"
-#: any.pm:180
+#: any.pm:182
#, c-format
msgid ""
"Contacting Mandriva Linux web site to get the list of available mirrors..."
msgstr "Menghubungi situs Mandriva Linux untuk mengambil daftar mirror..."
-#: any.pm:185
+#: any.pm:187
#, c-format
msgid ""
"Failed contacting Mandriva Linux web site to get the list of available "
@@ -115,47 +90,47 @@ msgstr ""
"Gagal menghubungi situs Mandriva Linux untuk mengambil daftar mirror yang "
"tersedia"
-#: any.pm:195
+#: any.pm:197
#, c-format
msgid "Choose a mirror from which to get the packages"
msgstr "Pilih mirror tempat Anda ingin mengambil paket"
-#: any.pm:225
+#: any.pm:227
#, c-format
msgid "NFS setup"
msgstr "Setup NFS"
-#: any.pm:226
+#: any.pm:228
#, c-format
msgid "Please enter the hostname and directory of your NFS media"
msgstr "Harap masukkan nama host dan direktori dari media NFS Anda"
-#: any.pm:230
+#: any.pm:232
#, c-format
msgid "Hostname missing"
msgstr "Nama host tidak ada"
-#: any.pm:231
+#: any.pm:233
#, c-format
msgid "Directory must begin with \"/\""
msgstr "Direktori harus dimulai dengan \"/\""
-#: any.pm:235
+#: any.pm:237
#, c-format
msgid "Hostname of the NFS mount ?"
msgstr "Nama host dari mount NFS ?"
-#: any.pm:236
+#: any.pm:238
#, c-format
msgid "Directory"
msgstr "Direktori"
-#: any.pm:258
+#: any.pm:260
#, c-format
msgid "Supplementary"
msgstr "Tambahan"
-#: any.pm:293
+#: any.pm:295
#, c-format
msgid ""
"Can't find a package list file on this mirror. Make sure the location is "
@@ -164,22 +139,22 @@ msgstr ""
"Tidak dapat menemukan file daftar paket pada mirror ini. Pastikan lokasinya "
"benar."
-#: any.pm:328
+#: any.pm:334
#, c-format
msgid "Looking at packages already installed..."
msgstr "Mencari paket yang sudah terinstall..."
-#: any.pm:362
+#: any.pm:368
#, c-format
msgid "Finding packages to upgrade..."
msgstr "Mencari paket untuk diupgrade..."
-#: any.pm:381
+#: any.pm:387
#, c-format
msgid "Removing packages prior to upgrade..."
msgstr "Menghapus paket-paket sebelum upgrade..."
-#: any.pm:402
+#: any.pm:408
#, c-format
msgid ""
"You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -191,18 +166,18 @@ msgid ""
"please reboot your system and upgrade using the Mandriva update applet."
msgstr ""
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
#, c-format
msgid "Reboot"
msgstr "Boot Ulang"
-#: any.pm:407
+#: any.pm:413
#, c-format
msgid "Proceed"
msgstr ""
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -215,72 +190,72 @@ msgstr ""
"\n"
"Apakah Anda ingin menghapus paket tersebut?\n"
-#: any.pm:815
+#: any.pm:821
#, c-format
msgid "Error reading file %s"
msgstr "Kesalahan membaca file %s"
-#: any.pm:1022
+#: any.pm:1028
#, c-format
msgid "The following disk(s) were renamed:"
msgstr "Disk berikut telah diubah namanya:"
-#: any.pm:1024
+#: any.pm:1030
#, c-format
msgid "%s (previously named as %s)"
msgstr "%s (sebelumnya bernama %s)"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "HTTP"
msgstr "HTTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "FTP"
msgstr "FTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "NFS"
msgstr "HFS"
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
#, c-format
msgid "Network"
msgstr "Jaringan"
-#: any.pm:1104
+#: any.pm:1110
#, c-format
msgid "Please choose a media"
msgstr "Silahkan pilih media"
-#: any.pm:1120
+#: any.pm:1126
#, c-format
msgid "File already exists. Overwrite it?"
msgstr "File sudah ada. Timpa file ini ?"
-#: any.pm:1124
+#: any.pm:1130
#, c-format
msgid "Permission denied"
msgstr "Izin ditolak"
-#: any.pm:1172
+#: any.pm:1178
#, c-format
msgid "Bad NFS name"
msgstr "Nama NFS yang salah"
-#: any.pm:1193
+#: any.pm:1199
#, c-format
msgid "Bad media %s"
msgstr "Media rusak %s"
-#: any.pm:1236
+#: any.pm:1242
#, c-format
msgid "Can not make screenshots before partitioning"
msgstr "Tidak bisa membuat screenshot sebelum buat partisi"
-#: any.pm:1244
+#: any.pm:1250
#, c-format
msgid "Screenshots will be available after install in %s"
msgstr "Screenshot akan tersedia setelah installasi pada %s"
@@ -291,11 +266,15 @@ msgid "Installation"
msgstr "Installasi"
#: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
#, c-format
msgid "Configuration"
msgstr "Konfigurasi"
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
#: install2.pm:168
#, c-format
msgid "You must also format %s"
@@ -320,22 +299,22 @@ msgstr "Mengaktifkan jaringan"
msgid "Bringing down the network"
msgstr "Menonaktifkan jaringan"
-#: media.pm:402
+#: media.pm:399
#, c-format
msgid "Please wait, retrieving file"
msgstr ""
-#: media.pm:734
+#: media.pm:718
#, c-format
-msgid "Downloading file %s..."
-msgstr "Mendownload file %s..."
+msgid "unable to add medium"
+msgstr ""
-#: media.pm:822
+#: media.pm:758
#, c-format
msgid "Copying some packages on disks for future use"
msgstr "Menyalin beberapa paket pada disk untuk kebutuhan di masa depan"
-#: media.pm:875
+#: media.pm:811
#, c-format
msgid "Copying in progress"
msgstr "Penyalinan sedang berjalan"
@@ -379,27 +358,27 @@ msgstr ""
msgid "An error occurred:"
msgstr "Terjadi kesalahan"
-#: pkgs.pm:776
+#: pkgs.pm:780
#, c-format
msgid "%d installation transactions failed"
msgstr "transaksi installasi %d gagal"
-#: pkgs.pm:777
+#: pkgs.pm:781
#, fuzzy, c-format
msgid "Installation of packages failed:"
msgstr "Menginstall paket %s"
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
#, c-format
msgid "Workstation"
msgstr "Workstation"
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
#, c-format
msgid "Office Workstation"
msgstr "Workstation Kantor"
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
#, c-format
msgid ""
"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -408,7 +387,7 @@ msgstr ""
"Program office: pengolah kata (OpenOffice.org Writer, Kword), spreadsheet "
"(OpenOffice.org Calc, Kspread), viewer pdf, dll"
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
#, c-format
msgid ""
"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -417,32 +396,32 @@ msgstr ""
"Program office: pengolah kata (kword, abiword), spreadsheet (kspread, "
"gnumeric), viewer pdf, dll"
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
#, c-format
msgid "Game station"
msgstr "Komputer Game"
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
#, c-format
msgid "Amusement programs: arcade, boards, strategy, etc"
msgstr "Program hiburan: arcade, papan, strategi, dll"
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
#, c-format
msgid "Multimedia station"
msgstr "Komputer Multimedia"
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
#, c-format
msgid "Sound and video playing/editing programs"
msgstr "Program untuk memainkan/mengedit suara dan video"
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
#, c-format
msgid "Internet station"
msgstr "Komputer Internet"
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
#, c-format
msgid ""
"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -451,211 +430,193 @@ msgstr ""
"Kumpulan aplikasi untuk membaca dan mengirimkan email dan berita (pine, "
"mutt, tin..) dan untuk menjelajah Web"
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
#, c-format
msgid "Network Computer (client)"
msgstr "Komputer Jaringan (klien)"
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
#, c-format
msgid "Clients for different protocols including ssh"
msgstr "Klien untuk berbagai protokol, termasuk ssh"
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
#, c-format
msgid "Tools to ease the configuration of your computer"
msgstr "Aplikasi untuk mempermudah konfigurasi komputer Anda."
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
#, c-format
msgid "Console Tools"
msgstr "Aplikasi Konsol"
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
#, c-format
msgid "Editors, shells, file tools, terminals"
msgstr "Editor, shell, aplikasi file, terminal"
#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
#, c-format
msgid "Development"
msgstr "Pengembangan"
#: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
#, c-format
msgid "C and C++ development libraries, programs and include files"
msgstr "Pustaka, program, dan file include untuk pengembangan C dan C++"
#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
#, c-format
msgid "Documentation"
msgstr "Dokumentasi"
#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
#, c-format
msgid "Books and Howto's on Linux and Free Software"
msgstr "Buku dan Howto untuk Linux dan Free Software"
#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
#, c-format
msgid "LSB"
msgstr "LSB"
#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
#, c-format
msgid "Linux Standard Base. Third party applications support"
msgstr "Linux Standard Base. Dukungan aplikasi pihak ketiga"
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
#, c-format
msgid "Web Server"
msgstr "Server Web"
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
#, c-format
msgid "Apache"
msgstr "Apache"
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
#, c-format
msgid "Groupware"
msgstr "Groupware"
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
#, c-format
msgid "Kolab Server"
msgstr "Server Kolab"
#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
#, c-format
msgid "Firewall/Router"
msgstr "Firewall/Router"
#: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
#, c-format
msgid "Internet gateway"
msgstr "Gateway Internet"
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
#, c-format
msgid "Mail/News"
msgstr "Mail/Berita"
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
#, c-format
msgid "Postfix mail server, Inn news server"
msgstr "Server mail Postfix, server berita Inn"
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
#, c-format
msgid "Directory Server"
msgstr "Server Direktori"
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
#, c-format
msgid "FTP Server"
msgstr "Server FTP"
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
#, c-format
msgid "ProFTPd"
msgstr "ProFTPd"
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
#, c-format
msgid "DNS/NIS"
msgstr "DNS/NIS"
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
#, c-format
msgid "Domain Name and Network Information Server"
msgstr "Nama Domain dan Network Information Server"
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
#, c-format
msgid "File and Printer Sharing Server"
msgstr "Server Sharing File dan Printer"
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
#, c-format
msgid "NFS Server, Samba server"
msgstr "Server NFS, server Samba"
#: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
#, c-format
msgid "Database"
msgstr "Basis Data"
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
#, c-format
msgid "PostgreSQL and MySQL Database Server"
msgstr "Server Basis Data PostgreSQL dan MySQL"
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
#, c-format
msgid "Web/FTP"
msgstr "Web/FTP"
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
#, c-format
msgid "Apache, Pro-ftpd"
msgstr "Apache, Pro-ftpd"
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
#, c-format
msgid "Mail"
msgstr "Mail"
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
#, c-format
msgid "Postfix mail server"
msgstr "Server mail Postfix"
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
#, c-format
msgid "PostgreSQL or MySQL database server"
msgstr "Server basis data PostgreSQL atau MySQL"
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
#, c-format
msgid "Network Computer server"
msgstr "Komputer Server Jaringan"
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
#, c-format
msgid "NFS server, SMB server, Proxy server, ssh server"
msgstr "server NFS, SMB, Proxy, dan SSH"
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
#, c-format
msgid "Graphical Environment"
msgstr "Mode Grafis"
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
#, c-format
msgid "KDE Workstation"
msgstr "Workstation KDE"
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
#, c-format
msgid ""
"The K Desktop Environment, the basic graphical environment with a collection "
@@ -664,12 +625,12 @@ msgstr ""
"K Desktop Environment, lingkungan grafis dasar dengan kumpulan aplikasi yang "
"menyertainya"
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
#, c-format
msgid "GNOME Workstation"
msgstr "Workstation Gnome"
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
#, c-format
msgid ""
"A graphical environment with user-friendly set of applications and desktop "
@@ -678,7 +639,7 @@ msgstr ""
"Lingkungan grafis dengan kumpulan aplikasi dan aplikasi desktop yang ramah "
"pengguna"
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
#, fuzzy, c-format
msgid "LXDE Desktop"
msgstr "Desktop IceWm"
@@ -692,54 +653,52 @@ msgstr ""
"Lingkungan grafis dengan kumpulan aplikasi dan aplikasi desktop yang ramah "
"pengguna"
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
#, c-format
msgid "Other Graphical Desktops"
msgstr "Desktop Grafis lainnya"
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
#, c-format
msgid "Window Maker, Enlightenment, Fvwm, etc"
msgstr "Window Maker, Enlightenment, Fvwm, dsb"
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
#, c-format
msgid "Utilities"
msgstr "Utilitas"
#: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
#, c-format
msgid "SSH Server"
msgstr "Server SSH"
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
#, c-format
msgid "Webmin"
msgstr "Webmin"
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
#, c-format
msgid "Webmin Remote Configuration Server"
msgstr "Server Konfigurasi Remote Webmin"
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
#, c-format
msgid "Network Utilities/Monitoring"
msgstr "Utilitas Jaringan/Pengawasan"
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
#, c-format
msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
msgstr "Aplikasi pengawasan, akuntasi proses, tcpdump, nmap, ..."
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
#, c-format
msgid "Mandriva Wizards"
msgstr "Wizard Mandriva"
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
#, c-format
msgid "Wizards to configure server"
msgstr "Wizard untuk mengkonfigurasi server"
@@ -839,17 +798,17 @@ msgstr ""
msgid "Click on images in order to see a bigger preview"
msgstr ""
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
#, c-format
msgid "Package Group Selection"
msgstr "Pilihan Grup Paket"
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
#, c-format
msgid "Individual package selection"
msgstr "Pilih paket individu"
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
#, c-format
msgid "Total size: %d / %d MB"
msgstr "Ukuran total: %d / %d MB"
@@ -967,12 +926,12 @@ msgstr "Installasi minimal"
msgid "Software Management"
msgstr "Manajemen Perangkat Lunak"
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
#, c-format
msgid "Choose the packages you want to install"
msgstr "Pilih paket yang akan diinstal"
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
#, c-format
msgid "Installing"
msgstr "Menginstall"
@@ -998,7 +957,7 @@ msgid "%d package"
msgid_plural "%d packages"
msgstr[0] "%d paket"
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
#, c-format
msgid "Summary"
msgstr "Ringkasan"
@@ -1008,7 +967,7 @@ msgstr "Ringkasan"
msgid "Configure"
msgstr "Konfigurasikan"
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
#, c-format
msgid "not configured"
msgstr "tidak dikonfigurasikan"
@@ -1018,7 +977,7 @@ msgstr "tidak dikonfigurasikan"
msgid "Media Selection"
msgstr "Pilihan Grup Paket"
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
#, c-format
msgid ""
"The following installation media have been found.\n"
@@ -1027,7 +986,7 @@ msgstr ""
"Media installasi berikut ditemukan. Jika Anda ingin\n"
"melewati beberapa, Anda bisa tidak memilihnya sekarang."
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
#, c-format
msgid ""
"You have the option to copy the contents of the CDs onto the hard drive "
@@ -1039,7 +998,7 @@ msgstr ""
"Proses akan dilanjutkan dari hard disk dan paket akantetap tersedia setelah "
"sistem terinstall."
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
#, c-format
msgid "Copy whole CDs"
msgstr "Salin seluruh CD"
@@ -1059,59 +1018,49 @@ msgstr "Pilih layout keyboard Anda"
msgid "Here is the full list of available keyboards:"
msgstr "Berikut daftar keyboard yang tersedia"
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
#, c-format
msgid "Install/Upgrade"
msgstr "Instal/Upgrade"
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
#, c-format
msgid "Is this an install or an upgrade?"
msgstr "Installasi atau upgrade?"
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
#, c-format
msgid ""
"_: This is a noun:\n"
"Install"
msgstr "Install"
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
#, c-format
msgid "Upgrade %s"
msgstr "Upgrade %s"
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr "Upgrade dari distribusi 32bit ke 64bit tidak didukung"
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr "Upgrade dari distribusi 64bit ke 32bit tidak didukung"
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
#, c-format
msgid "Encryption key for %s"
msgstr "Kunci enkripsi untuk %s"
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
#, c-format
msgid "Cancel installation, reboot system"
msgstr ""
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
#, fuzzy, c-format
msgid "New Installation"
msgstr "Installasi"
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
#, c-format
msgid "Upgrade previous installation (not recommended)"
msgstr ""
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
#, c-format
msgid ""
"Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1123,17 +1072,17 @@ msgid ""
"Installation\"."
msgstr ""
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "IDE"
msgstr "IDE"
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "Configuring IDE"
msgstr "Mengkonfigurasi IDE"
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
#, c-format
msgid ""
"No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1142,7 +1091,7 @@ msgstr ""
"Tidak ada ruang 1MB untuk bootstrap! Installasi akan dilanjutkan, tetapi "
"untuk boot sistem, Anda perlu membuat partisi bootstrap pada DiskDrake"
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
#, c-format
msgid ""
"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1152,7 +1101,7 @@ msgstr ""
"Anda harus membuat PPC PReP Boot bootstrap! Installasi akan dilanjutkan, "
"tetapi untuk boot sistem, Anda perlu membuat partisi bootstrap pada DiskDrake"
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
#, c-format
msgid ""
"Change your Cd-Rom!\n"
@@ -1165,12 +1114,12 @@ msgstr ""
"Masukkan Cd-Rom berlabel \"%s\" pada drive dan tekan Ok. Jika Anda tidak \n"
"punya, tekan Batal untuk menghindari installasi dari Cd-Rom ini."
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
#, c-format
msgid "Looking for available packages..."
msgstr "Mencari paket yang tersedia..."
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
#, c-format
msgid ""
"Your system does not have enough space left for installation or upgrade (%"
@@ -1179,7 +1128,7 @@ msgstr ""
"Sistem Anda tidak memilih ruang kosong yang cukup untuk installasi atau "
"upgrade (%dMB > %dMB)"
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
#, c-format
msgid ""
"Please choose load or save package selection.\n"
@@ -1188,53 +1137,53 @@ msgstr ""
"Pilih muat atau simpan pilihan paket.\n"
"Formatnya sama dengan file auto_install."
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Load"
msgstr "Beban"
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Save"
msgstr "Simpan"
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
#, c-format
msgid "Bad file"
msgstr "File rusak"
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
#, fuzzy, c-format
msgid "KDE"
msgstr "IDE"
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
#, c-format
msgid "GNOME"
msgstr "GNOME"
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
#, fuzzy, c-format
msgid "Desktop Selection"
msgstr "Pilihan Grup Paket"
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
#, fuzzy, c-format
msgid "You can choose your workstation desktop profile."
msgstr ""
"Anda bisa memilih profil desktop workstation Anda: KDE, GNOME atau Kustom"
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
#, c-format
msgid "Selected size is larger than available space"
msgstr "Ukuran terpilih melebihi ruang yang ada"
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
#, c-format
msgid "Type of install"
msgstr "Tipe installasi"
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
#, c-format
msgid ""
"You have not selected any group of packages.\n"
@@ -1243,82 +1192,82 @@ msgstr ""
"Anda belum memilih grup paket.\n"
"Pilih installasi minimal yang Anda inginkan:"
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
#, c-format
msgid "With X"
msgstr "Dengan X"
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
#, c-format
msgid "With basic documentation (recommended!)"
msgstr "Dengan dokumentasi dasar (disarankan!)"
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
#, c-format
msgid "Truly minimal install (especially no urpmi)"
msgstr "Installasi minimal sesungguhnya (khususnya tanpa urpmi)"
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
#, c-format
msgid "Preparing installation"
msgstr "Mempersiapkan installasi"
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
#, c-format
msgid "Installing package %s"
msgstr "Menginstall paket %s"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "There was an error ordering packages:"
msgstr "Terdapat kesalahan pengurutan paket:"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "Go on anyway?"
msgstr "Lanjutkan?"
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
#, c-format
msgid "Retry"
msgstr "Ulang kembali"
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
#, c-format
msgid "Skip this package"
msgstr "Lewati paket ini"
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
#, c-format
msgid "Skip all packages from medium \"%s\""
msgstr "Lewati semua paket-paket dari media \"%s\""
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
#, c-format
msgid "Go back to media and packages selection"
msgstr "Kembali pada media dan pemilihan paket"
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
#, c-format
msgid "There was an error installing package %s."
msgstr "Terdapat kesalahan penginstallan paket %s."
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
#, c-format
msgid "Post-install configuration"
msgstr "Konfigurasi pasca installasi"
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
#, c-format
msgid "Please ensure the Update Modules media is in drive %s"
msgstr "Harap pastikan media Update Modul pada drive %s"
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
#, c-format
msgid "Updates"
msgstr "Update"
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
#, c-format
msgid ""
"You now have the opportunity to download updated packages. These packages\n"
@@ -1338,28 +1287,28 @@ msgstr ""
"\n"
"Apakah Anda ingin menginstall update?"
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
#, c-format
msgid "%s on %s"
msgstr "%s pada %s"
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
#, c-format
msgid "Hardware"
msgstr "Perangkat Keras"
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
#, c-format
msgid "Sound card"
msgstr "Kartu suara"
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
#, c-format
msgid "Do you have an ISA sound card?"
msgstr "Apakah Anda memiliki kartu suara ISA?"
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
#, c-format
msgid ""
"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1368,68 +1317,68 @@ msgstr ""
"Jalankan \"sndconfig\" atau \"sndconfig\" setelah installasi untuk "
"mengkonfigurasi kartu suara Anda"
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
#, c-format
msgid "No sound card detected. Try \"harddrake\" after installation"
msgstr ""
"Tidak ada kartu suara yang terdeteksi. Coba \"harddrake\" setelah installasi"
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
#, c-format
msgid "Graphical interface"
msgstr "Antarmuka grafis"
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
#, c-format
msgid "Network & Internet"
msgstr "Jaringan & Internet"
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
#, c-format
msgid "Proxies"
msgstr "Proxy "
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
#, c-format
msgid "configured"
msgstr "terkonfigurasi"
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
#, c-format
msgid "Security Level"
msgstr "Tingkat Keamanan"
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
#, c-format
msgid "Firewall"
msgstr "Firewall"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "activated"
msgstr "telah diaktifkan"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "disabled"
msgstr "telah dinonaktifkan"
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
#, c-format
msgid "You have not configured X. Are you sure you really want this?"
msgstr "Anda belum mengkonfigurasi X. Apakah Anda yakin?"
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
#, c-format
msgid "Preparing bootloader..."
msgstr "Mempersiapkan bootloader..."
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
#, c-format
msgid "Be patient, this may take a while..."
msgstr ""
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
#, c-format
msgid ""
"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1442,7 +1391,7 @@ msgstr ""
"BootX atau cara lain untuk boot komputer Anda. Argumen kernel untuk fs root "
"adalah: root=%s"
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
#, c-format
msgid ""
"In this security level, access to the files in the Windows partition is "
@@ -1451,17 +1400,17 @@ msgstr ""
"Pada tingkat keamanan ini, akses pada file pada partisi Windows dibatasi "
"hanya pada administrator."
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr "Masukkan disket kosong pada drive %s"
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
#, c-format
msgid "Creating auto install floppy..."
msgstr "Membuat disket installasi otomatis..."
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
#, c-format
msgid ""
"Some steps are not completed.\n"
@@ -1472,7 +1421,7 @@ msgstr ""
"\n"
"Apakah Anda ingin keluar sekarang?"
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
#, c-format
msgid "Congratulations"
msgstr "Selamat"
@@ -1616,6 +1565,15 @@ msgid ""
"Exit"
msgstr "Keluar"
+#~ msgid "Downloading file %s..."
+#~ msgstr "Mendownload file %s..."
+
+#~ msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
+#~ msgstr "Upgrade dari distribusi 32bit ke 64bit tidak didukung"
+
+#~ msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
+#~ msgstr "Upgrade dari distribusi 64bit ke 32bit tidak didukung"
+
#~ msgid ""
#~ "You have selected the following server(s): %s\n"
#~ "\n"
diff --git a/perl-install/install/share/po/is.po b/perl-install/install/share/po/is.po
index efe8374cd..39a18bf4b 100644
--- a/perl-install/install/share/po/is.po
+++ b/perl-install/install/share/po/is.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: DrakX\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
"PO-Revision-Date: 2009-03-30 14:04+0000\n"
"Last-Translator: Pjetur G. Hjaltason <pjetur@pjetur.net>\n"
"Language-Team: Icelandic <kde-isl@molar.is>\n"
@@ -20,31 +20,6 @@ msgstr ""
"X-Generator: KBabel 1.11.4\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr "Vinnustöðin þín á USB lykli"
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr "Mandriva uppsetningin með 100%% frjálsum, opnum hugbúnaði"
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr "Kannaðu Linux með Mandriva One"
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr "Full Mandriva Linux vinnustöð, með þjónustu"
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr "Mandriva: dreifingar við allra hæfi"
-
#: any.pm:109
#, c-format
msgid "Do you have further supplementary media?"
@@ -84,24 +59,25 @@ msgstr "Net (FTP)"
msgid "Network (NFS)"
msgstr "Net (NFS)"
-#: any.pm:163
+#: any.pm:165
#, c-format
msgid "URL of the mirror?"
msgstr "Vefslóð að spegli?"
-#: any.pm:169
+#: any.pm:171
#, c-format
msgid "URL must start with ftp:// or http://"
msgstr "Slóð verður að byrja á ftp:// eða http://"
-#: any.pm:180
+#: any.pm:182
#, c-format
-msgid "Contacting Mandriva Linux web site to get the list of available mirrors..."
+msgid ""
+"Contacting Mandriva Linux web site to get the list of available mirrors..."
msgstr ""
"Hef samband við Mandriva Linux vefinn til að sækja lista yfir fáanlega "
"spegla..."
-#: any.pm:185
+#: any.pm:187
#, c-format
msgid ""
"Failed contacting Mandriva Linux web site to get the list of available "
@@ -110,47 +86,47 @@ msgstr ""
"Mistókst að tengjast við Mandriva Linux vefinn til að sækja lista yfir "
"fáanlega spegla"
-#: any.pm:195
+#: any.pm:197
#, c-format
msgid "Choose a mirror from which to get the packages"
msgstr "Veldu spegilvélina þaðan sem á að sækja pakkanna"
-#: any.pm:225
+#: any.pm:227
#, c-format
msgid "NFS setup"
msgstr "NFS uppsetning"
-#: any.pm:226
+#: any.pm:228
#, c-format
msgid "Please enter the hostname and directory of your NFS media"
msgstr "Sláðu inn vélarnafn og möppu sem inniheldur NFS miðil"
-#: any.pm:230
+#: any.pm:232
#, c-format
msgid "Hostname missing"
msgstr "Vélarnafn vantar"
-#: any.pm:231
+#: any.pm:233
#, c-format
msgid "Directory must begin with \"/\""
msgstr "Möppunafn verður að byrja á \"/\""
-#: any.pm:235
+#: any.pm:237
#, c-format
msgid "Hostname of the NFS mount ?"
msgstr "Vélarnafn á NFS tengipunkti?"
-#: any.pm:236
+#: any.pm:238
#, c-format
msgid "Directory"
msgstr "Mappa"
-#: any.pm:258
+#: any.pm:260
#, c-format
msgid "Supplementary"
msgstr "Aukalegt"
-#: any.pm:293
+#: any.pm:295
#, c-format
msgid ""
"Can't find a package list file on this mirror. Make sure the location is "
@@ -159,22 +135,22 @@ msgstr ""
"Finn ekki pakkalista-skrá á þessum spegli. Athugaðu hvort staðsetningin sé "
"rétt."
-#: any.pm:328
+#: any.pm:334
#, c-format
msgid "Looking at packages already installed..."
msgstr "Athuga þegar uppsetta pakka..."
-#: any.pm:362
+#: any.pm:368
#, c-format
msgid "Finding packages to upgrade..."
msgstr "Leita að pökkum til að uppfæra..."
-#: any.pm:381
+#: any.pm:387
#, c-format
msgid "Removing packages prior to upgrade..."
msgstr "Fjarlægi pakka áður en uppfærsla hefst..."
-#: any.pm:402
+#: any.pm:408
#, c-format
msgid ""
"You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -195,18 +171,18 @@ msgstr ""
"endurræstu\n"
"þá tölvuna þína og notaðu Mandriva bakka-uppfærsluforritið."
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
#, c-format
msgid "Reboot"
msgstr "Endurræsa"
-#: any.pm:407
+#: any.pm:413
#, c-format
msgid "Proceed"
msgstr "Halda áfram"
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -219,72 +195,72 @@ msgstr ""
"\n"
"Viltu í alvöru fjarlægja þessa pakka?\n"
-#: any.pm:815
+#: any.pm:821
#, c-format
msgid "Error reading file %s"
msgstr "Villa við lestur úr skránni %s"
-#: any.pm:1022
+#: any.pm:1028
#, c-format
msgid "The following disk(s) were renamed:"
msgstr "Eftirfarandi diskar voru endurnefndir:"
-#: any.pm:1024
+#: any.pm:1030
#, c-format
msgid "%s (previously named as %s)"
msgstr "%s (áður nefnt %s)"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "HTTP"
msgstr "HTTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "FTP"
msgstr "FTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "NFS"
msgstr "NFS"
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
#, c-format
msgid "Network"
msgstr "Net"
-#: any.pm:1104
+#: any.pm:1110
#, c-format
msgid "Please choose a media"
msgstr "Veldu miðil"
-#: any.pm:1120
+#: any.pm:1126
#, c-format
msgid "File already exists. Overwrite it?"
msgstr "Skráin er þegar til. Skrifa yfir hana?"
-#: any.pm:1124
+#: any.pm:1130
#, c-format
msgid "Permission denied"
msgstr "Aðgangi hafnað"
-#: any.pm:1172
+#: any.pm:1178
#, c-format
msgid "Bad NFS name"
msgstr "Rangt NFS nafn"
-#: any.pm:1193
+#: any.pm:1199
#, c-format
msgid "Bad media %s"
msgstr "Gallaður miðill %s"
-#: any.pm:1236
+#: any.pm:1242
#, c-format
msgid "Can not make screenshots before partitioning"
msgstr "Get ekki tekið skjámyndir fyrr en disksneiðar hafa verið skilgreindar"
-#: any.pm:1244
+#: any.pm:1250
#, c-format
msgid "Screenshots will be available after install in %s"
msgstr "Skjámyndir verða tiltækar eftir uppsetningu í %s"
@@ -295,11 +271,15 @@ msgid "Installation"
msgstr "Set inn"
#: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
#, c-format
msgid "Configuration"
msgstr "Stillingar"
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
#: install2.pm:168
#, c-format
msgid "You must also format %s"
@@ -325,22 +305,22 @@ msgstr "Keyri upp netið"
msgid "Bringing down the network"
msgstr "Keyri niður netið"
-#: media.pm:402
+#: media.pm:399
#, c-format
msgid "Please wait, retrieving file"
msgstr "Bíðið, sæki skrá"
-#: media.pm:734
+#: media.pm:718
#, c-format
-msgid "Downloading file %s..."
-msgstr "Sæki skrá %s..."
+msgid "unable to add medium"
+msgstr ""
-#: media.pm:822
+#: media.pm:758
#, c-format
msgid "Copying some packages on disks for future use"
msgstr "Afrita nokkra pakka á diska til notkunar síðar"
-#: media.pm:875
+#: media.pm:811
#, c-format
msgid "Copying in progress"
msgstr "Afritun í gangi"
@@ -384,27 +364,27 @@ msgstr ""
msgid "An error occurred:"
msgstr "Villa kom upp:"
-#: pkgs.pm:776
+#: pkgs.pm:780
#, c-format
msgid "%d installation transactions failed"
msgstr "%d Innsetningarfærslur brugðust"
-#: pkgs.pm:777
+#: pkgs.pm:781
#, c-format
msgid "Installation of packages failed:"
msgstr "Innsetning pakka tókst ekki:"
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
#, c-format
msgid "Workstation"
msgstr "Vinnustöð"
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
#, c-format
msgid "Office Workstation"
msgstr "Skrifstofu-vinnustöð"
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
#, c-format
msgid ""
"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -413,7 +393,7 @@ msgstr ""
"Skrifstofu forrit: ritvinnsla (OpenOffice.org Writer, Kword), töflureiknar "
"(OpenOffice.org Calc, Kspread) pdf skoðarar, o.s.frv"
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
#, c-format
msgid ""
"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -422,32 +402,32 @@ msgstr ""
"Skrifstofu forrit: ritvinnsla (kword, abiword), töflureiknar (kspread, "
"gnumeric) pdf skoðarar, o.s.frv"
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
#, c-format
msgid "Game station"
msgstr "Leikja-(vinnu)stöð"
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
#, c-format
msgid "Amusement programs: arcade, boards, strategy, etc"
msgstr "Leikjaforrit, skotleikir, borðleikir, herkænskuleikir og fleira"
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
#, c-format
msgid "Multimedia station"
msgstr "Margmiðlunar-vinnustöð"
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
#, c-format
msgid "Sound and video playing/editing programs"
msgstr "Spila og breyta hljóðskrám og kvikmyndum"
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
#, c-format
msgid "Internet station"
msgstr "Internet-vinnustöð"
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
#, c-format
msgid ""
"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -456,230 +436,212 @@ msgstr ""
"Tól og tæki til að lesa og senda póst, fréttir (mutt,tin...) og til að "
"flakka á vefnum"
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
#, c-format
msgid "Network Computer (client)"
msgstr "Netbiðlarar"
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
#, c-format
msgid "Clients for different protocols including ssh"
msgstr "Biðlarar fyrir ýmsar samskiptareglur þ.m.t ssh"
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
#, c-format
msgid "Tools to ease the configuration of your computer"
msgstr "Tæki til að auðvelda uppsetningu tölvunnar"
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
#, c-format
msgid "Console Tools"
msgstr "Skjától"
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
#, c-format
msgid "Editors, shells, file tools, terminals"
msgstr "Ritlar, skeljar, skráatól, skjáhermar"
#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
#, c-format
msgid "Development"
msgstr "Forritun"
#: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
#, c-format
msgid "C and C++ development libraries, programs and include files"
msgstr "C og C++ undirforritasöfn, forrit og lýsingaskrár"
#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
#, c-format
msgid "Documentation"
msgstr "Handbækur"
#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
#, c-format
msgid "Books and Howto's on Linux and Free Software"
msgstr "Bækur og leiðbeiningar um Linux og frjálsan hugbúnað"
#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
#, c-format
msgid "LSB"
msgstr "LSB"
#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
#, c-format
msgid "Linux Standard Base. Third party applications support"
msgstr "Linux Standard Base. Stuðningur fyrir forrit þriðja aðila"
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
#, c-format
msgid "Web Server"
msgstr "Vefmiðlari"
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
#, c-format
msgid "Apache"
msgstr "Apache"
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
#, c-format
msgid "Groupware"
msgstr "Hópvinnuforrit"
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
#, c-format
msgid "Kolab Server"
msgstr "Kolab Miðlari"
#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
#, c-format
msgid "Firewall/Router"
msgstr "Eldveggur/beinir"
#: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
#, c-format
msgid "Internet gateway"
msgstr "Internet netgátt"
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
#, c-format
msgid "Mail/News"
msgstr "Póstur/Fréttir"
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
#, c-format
msgid "Postfix mail server, Inn news server"
msgstr "Postfix póstþjónusta, Inn fréttaþjónusta"
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
#, c-format
msgid "Directory Server"
msgstr "Upplýsingaveita"
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
#, c-format
msgid "FTP Server"
msgstr "FTP Miðlari"
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
#, c-format
msgid "ProFTPd"
msgstr "ProFTPd"
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
#, c-format
msgid "DNS/NIS"
msgstr "DNS/NIS"
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
#, c-format
msgid "Domain Name and Network Information Server"
msgstr "Nafnaþjónustur og net-upplýsingaveitur"
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
#, c-format
msgid "File and Printer Sharing Server"
msgstr "Skráa og prentmiðlari"
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
#, c-format
msgid "NFS Server, Samba server"
msgstr "NFS miðlari, Samba miðlari"
#: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
#, c-format
msgid "Database"
msgstr "Gagnagrunnar"
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
#, c-format
msgid "PostgreSQL and MySQL Database Server"
msgstr "PostgreSQL og MySQL gagnagrunns-miðlarar"
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
#, c-format
msgid "Web/FTP"
msgstr "Vefur/FTP"
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
#, c-format
msgid "Apache, Pro-ftpd"
msgstr "Apache, Pro-ftpd"
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
#, c-format
msgid "Mail"
msgstr "Póstur"
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
#, c-format
msgid "Postfix mail server"
msgstr "Postfix póstþjónusta"
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
#, c-format
msgid "PostgreSQL or MySQL database server"
msgstr "PostgreSQL eða MySQL gagnagrunns-miðlarar"
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
#, c-format
msgid "Network Computer server"
msgstr "Netþjónustur"
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
#, c-format
msgid "NFS server, SMB server, Proxy server, ssh server"
msgstr "NFS-þjónusta, SMB-þjónusta, Staðgengils-þjónusta, ssh-þjónusta"
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
#, c-format
msgid "Graphical Environment"
msgstr "Myndrænt umhverfi"
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
#, c-format
msgid "KDE Workstation"
msgstr "KDE Vinnustöð"
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
#, c-format
msgid ""
"The K Desktop Environment, the basic graphical environment with a collection "
"of accompanying tools"
msgstr "KDE (K Desktop Environment). Gluggastjóri með safni hjálparforrita"
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
#, c-format
msgid "GNOME Workstation"
msgstr "Gnome vinnustöð"
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
#, c-format
msgid ""
"A graphical environment with user-friendly set of applications and desktop "
"tools"
msgstr "Gluggastjóri með notendavænum forritum og skjáborðs-tólum"
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
#, c-format
msgid "LXDE Desktop"
msgstr "LXDE Skjáborð"
@@ -689,56 +651,55 @@ msgstr "LXDE Skjáborð"
msgid ""
"A lightweight & fast graphical environment with user-friendly set of "
"applications and desktop tools"
-msgstr "Létt og hratt gluggaumhverfi með notendavænum forritum og skjáborðs-tólum"
+msgstr ""
+"Létt og hratt gluggaumhverfi með notendavænum forritum og skjáborðs-tólum"
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
#, c-format
msgid "Other Graphical Desktops"
msgstr "Aðrir gluggastjórar"
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
#, c-format
msgid "Window Maker, Enlightenment, Fvwm, etc"
msgstr "Window Maker, Enlightenment, Fvwm, o.s.frv"
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
#, c-format
msgid "Utilities"
msgstr "Tól"
#: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
#, c-format
msgid "SSH Server"
msgstr "SSH Miðlari"
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
#, c-format
msgid "Webmin"
msgstr "Webmin"
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
#, c-format
msgid "Webmin Remote Configuration Server"
msgstr "Webmin, stillingar á fjartengdri tölvu um vef"
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
#, c-format
msgid "Network Utilities/Monitoring"
msgstr "Netforrit/Neteftirlit"
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
#, c-format
msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
msgstr "Eftirlitstól, vinna með notendur, tcpdump, nmap, ..."
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
#, c-format
msgid "Mandriva Wizards"
msgstr "Mandriva Ráðgjafar"
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
#, c-format
msgid "Wizards to configure server"
msgstr "Ráðgjafar til að stilla miðlara"
@@ -839,17 +800,17 @@ msgstr "Hér er forsýn af '%s' skjáborðinu."
msgid "Click on images in order to see a bigger preview"
msgstr "Smelltu á myndir til að sjá stærri forsýn"
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
#, c-format
msgid "Package Group Selection"
msgstr "Val á pakkahóp"
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
#, c-format
msgid "Individual package selection"
msgstr "Val á einstökum pökkum"
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
#, c-format
msgid "Total size: %d / %d MB"
msgstr "Heildarstærð: %d / %d MB"
@@ -966,12 +927,12 @@ msgstr "Lágmarks uppsetning"
msgid "Software Management"
msgstr "Hugbúnaðarumsýsla"
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
#, c-format
msgid "Choose the packages you want to install"
msgstr "Veldu pakkana sem þú vilt setja inn"
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
#, c-format
msgid "Installing"
msgstr "Set inn"
@@ -998,7 +959,7 @@ msgid_plural "%d packages"
msgstr[0] "%d pakki"
msgstr[1] "%d pakkar"
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
#, c-format
msgid "Summary"
msgstr "Yfirlit"
@@ -1008,7 +969,7 @@ msgstr "Yfirlit"
msgid "Configure"
msgstr "Stilla"
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
#, c-format
msgid "not configured"
msgstr "ekki stillt"
@@ -1018,7 +979,7 @@ msgstr "ekki stillt"
msgid "Media Selection"
msgstr "Val á miðlum"
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
#, c-format
msgid ""
"The following installation media have been found.\n"
@@ -1027,7 +988,7 @@ msgstr ""
"Eftirfarandi uppsetningar-miðlar hafa fundist.\n"
"Ef þú vilt sleppa einhverjum af þeim, þá getur þú af-valið þá núna."
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
#, c-format
msgid ""
"You have the option to copy the contents of the CDs onto the hard drive "
@@ -1040,7 +1001,7 @@ msgstr ""
"Síðan mun uppsetning halda áfram frá disknum og pakkarnir verða til staðar "
"þegar kerfið er að fullu uppsett."
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
#, c-format
msgid "Copy whole CDs"
msgstr "Afrita alla geisladiska"
@@ -1060,59 +1021,49 @@ msgstr "Veldu lyklaborðs-uppsetningu"
msgid "Here is the full list of available keyboards:"
msgstr "Hér er tæmandi listi af tiltækum lyklaborðum:"
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
#, c-format
msgid "Install/Upgrade"
msgstr "Innsetning/Uppfærsla"
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
#, c-format
msgid "Is this an install or an upgrade?"
msgstr "Er þetta innsetning eða uppfærsla?"
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
#, c-format
msgid ""
"_: This is a noun:\n"
"Install"
msgstr "Innsetning"
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
#, c-format
msgid "Upgrade %s"
msgstr "Uppfæra %s"
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr "Ekki er stutt við uppfærslu frá 32-bita í 64-bita dreifingu"
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr "Ekki er stutt við uppfærslu frá 64-bita í 32-bita dreifingu"
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
#, c-format
msgid "Encryption key for %s"
msgstr "Dulritunar-lykill fyrir %s"
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
#, c-format
msgid "Cancel installation, reboot system"
msgstr "Hætta við innsetningu, endurræsa kerfi"
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
#, c-format
msgid "New Installation"
msgstr "Ný Uppsetning"
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
#, c-format
msgid "Upgrade previous installation (not recommended)"
msgstr "Uppfæra fyrri uppsetningu (ekki mælt með)"
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
#, c-format
msgid ""
"Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1131,17 +1082,17 @@ msgstr ""
"Aðvörun : þú ættir að afrita öll persónuleg gögn áður en þú velur \"Ný "
"Uppsetning\"."
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "IDE"
msgstr "IDE"
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "Configuring IDE"
msgstr "Uppsetning IDE"
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
#, c-format
msgid ""
"No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1150,7 +1101,7 @@ msgstr ""
"Ekki pláss fyrir 1MB ræsigeira! Uppsetning mun halda áfram, en til að ræsa "
"kerfið þitt verður þú að búa til ræsi-disksneið með DiskDrake"
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
#, c-format
msgid ""
"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1160,7 +1111,7 @@ msgstr ""
"Þú þarft að búa til PPC PReP for-ræsingu! Uppsetningin mun halda áfram, en "
"til að ræsa kerfið, þarft þú að búa til ræsi-disksneið með DiskDrake"
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
#, c-format
msgid ""
"Change your Cd-Rom!\n"
@@ -1174,12 +1125,12 @@ msgstr ""
"Ef þú hefur ekki diskinn, ýttu þá að \"Hætta við\" til að sleppa uppsetningu "
"frá þessum diski."
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
#, c-format
msgid "Looking for available packages..."
msgstr "Leita að tiltækum pökkum..."
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
#, c-format
msgid ""
"Your system does not have enough space left for installation or upgrade (%"
@@ -1188,7 +1139,7 @@ msgstr ""
"Það er ekki nóg laust pláss fyrir innsetningu eða uppfærslu á kerfinu þínu (%"
"dMB > %dMB)"
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
#, c-format
msgid ""
"Please choose load or save package selection.\n"
@@ -1197,52 +1148,52 @@ msgstr ""
"Veldu hvort eigi að sækja eða vista pakkaval.\n"
"Sniðið er það sama og á auto_install skrám."
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Load"
msgstr "Sækja"
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Save"
msgstr "Vista"
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
#, c-format
msgid "Bad file"
msgstr "Gölluð skrá"
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
#, c-format
msgid "KDE"
msgstr "KDE"
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
#, c-format
msgid "GNOME"
msgstr "GNOME"
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
#, c-format
msgid "Desktop Selection"
msgstr "Val á Skjáborði"
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
#, c-format
msgid "You can choose your workstation desktop profile."
msgstr "Þú getur valið vinnustöðvar-umhverfi (skjáborð)."
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
#, c-format
msgid "Selected size is larger than available space"
msgstr "Valin stærð er stærri en tiltækt pláss"
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
#, c-format
msgid "Type of install"
msgstr "Tegund uppsetningar"
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
#, c-format
msgid ""
"You have not selected any group of packages.\n"
@@ -1251,82 +1202,82 @@ msgstr ""
"Þú hefur ekki valið neina pakkahópa.\n"
"Veldu lágmarksuppsetningu sem þú vilt:"
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
#, c-format
msgid "With X"
msgstr "Með X"
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
#, c-format
msgid "With basic documentation (recommended!)"
msgstr "Með grunn-handbókum (mælt með!)"
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
#, c-format
msgid "Truly minimal install (especially no urpmi)"
msgstr "Alger lágmarksuppsetning (ekkert urpmi)"
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
#, c-format
msgid "Preparing installation"
msgstr "Undirbý innsetningu"
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
#, c-format
msgid "Installing package %s"
msgstr "Set inn pakka %s"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "There was an error ordering packages:"
msgstr "Það kom upp villa við að raða pökkum:"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "Go on anyway?"
msgstr "Viltu samt halda áfram?"
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
#, c-format
msgid "Retry"
msgstr "Reyna aftur"
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
#, c-format
msgid "Skip this package"
msgstr "Sleppa þessum pakka"
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
#, c-format
msgid "Skip all packages from medium \"%s\""
msgstr "Sleppa ölum pökkum af miðli \"%s\""
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
#, c-format
msgid "Go back to media and packages selection"
msgstr "Fara til baka í val á miðlum og pökkum"
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
#, c-format
msgid "There was an error installing package %s."
msgstr "Það kom upp villa við innsetningu pakka %s."
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
#, c-format
msgid "Post-install configuration"
msgstr "Lokastillingar"
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
#, c-format
msgid "Please ensure the Update Modules media is in drive %s"
msgstr "Staðfestu að Uppfærslu-miðill sé í drifi %s"
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
#, c-format
msgid "Updates"
msgstr "Uppfærslur"
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
#, c-format
msgid ""
"You now have the opportunity to download updated packages. These packages\n"
@@ -1346,28 +1297,28 @@ msgstr ""
"\n"
"Viltu sækja uppfærslurnar?"
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
#, c-format
msgid "%s on %s"
msgstr "%s á %s"
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
#, c-format
msgid "Hardware"
msgstr "Vélbúnaður"
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
#, c-format
msgid "Sound card"
msgstr "Hljóðkort"
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
#, c-format
msgid "Do you have an ISA sound card?"
msgstr "Er kannski ISA hljóðkort í vélinni?"
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
#, c-format
msgid ""
"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1376,67 +1327,68 @@ msgstr ""
"Keyrðu \"alsaconf\" eða \"sndconfig\" eftir uppsetningu til að stilla "
"hljóðkortið þitt"
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
#, c-format
msgid "No sound card detected. Try \"harddrake\" after installation"
-msgstr "Ekkert hljóðkort fannst. Reyndu að keyra \"harddrake\" eftir uppsetningu"
+msgstr ""
+"Ekkert hljóðkort fannst. Reyndu að keyra \"harddrake\" eftir uppsetningu"
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
#, c-format
msgid "Graphical interface"
msgstr "Myndrænt viðmót"
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
#, c-format
msgid "Network & Internet"
msgstr "Staðarnet og Internet"
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
#, c-format
msgid "Proxies"
msgstr "Sel"
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
#, c-format
msgid "configured"
msgstr "stillt"
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
#, c-format
msgid "Security Level"
msgstr "Öryggisþrep"
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
#, c-format
msgid "Firewall"
msgstr "Eldveggur"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "activated"
msgstr "virkt"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "disabled"
msgstr "óvirkt"
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
#, c-format
msgid "You have not configured X. Are you sure you really want this?"
msgstr "Þú hefur ekki sett upp X, ertu viss um að þú viljir þetta?"
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
#, c-format
msgid "Preparing bootloader..."
msgstr "Set upp ræsistjórann..."
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
#, c-format
msgid "Be patient, this may take a while..."
msgstr "Verið þolinmóð þetta getur tekið nokkra stund..."
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
#, c-format
msgid ""
"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1449,7 +1401,7 @@ msgstr ""
"verður að nota BootX eða aðrar leiðir til að ræsa vélina. kjarna-viðfangið "
"fyrir rótarsneiðina er: root=%s"
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
#, c-format
msgid ""
"In this security level, access to the files in the Windows partition is "
@@ -1458,17 +1410,17 @@ msgstr ""
"Í þessu öryggisþrepi er aðgangur að Windows disksneiðum takmarkaður við "
"kerfisstjóra."
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr "Settu tóman diskling í drif %s"
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
#, c-format
msgid "Creating auto install floppy..."
msgstr "Bý til diskling fyrir sjálfvirka uppsetningu..."
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
#, c-format
msgid ""
"Some steps are not completed.\n"
@@ -1479,7 +1431,7 @@ msgstr ""
"\n"
"Viltu virkilega hætta núna?"
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
#, c-format
msgid "Congratulations"
msgstr "Til hamingju"
@@ -1623,3 +1575,26 @@ msgid ""
"Exit"
msgstr "Hætta"
+#~ msgid "Your desktop on a USB key"
+#~ msgstr "Vinnustöðin þín á USB lykli"
+
+#~ msgid "The 100%% open source Mandriva Linux distribution"
+#~ msgstr "Mandriva uppsetningin með 100%% frjálsum, opnum hugbúnaði"
+
+#~ msgid "Explore Linux easily with Mandriva One"
+#~ msgstr "Kannaðu Linux með Mandriva One"
+
+#~ msgid "A full Mandriva Linux desktop, with support"
+#~ msgstr "Full Mandriva Linux vinnustöð, með þjónustu"
+
+#~ msgid "Mandriva: distributions for everybody's needs"
+#~ msgstr "Mandriva: dreifingar við allra hæfi"
+
+#~ msgid "Downloading file %s..."
+#~ msgstr "Sæki skrá %s..."
+
+#~ msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
+#~ msgstr "Ekki er stutt við uppfærslu frá 32-bita í 64-bita dreifingu"
+
+#~ msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
+#~ msgstr "Ekki er stutt við uppfærslu frá 64-bita í 32-bita dreifingu"
diff --git a/perl-install/install/share/po/it.po b/perl-install/install/share/po/it.po
index ed844bb88..cceb19f9e 100644
--- a/perl-install/install/share/po/it.po
+++ b/perl-install/install/share/po/it.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: DrakX\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
"PO-Revision-Date: 2009-03-30 21:26+0200\n"
"Last-Translator: Andrea Celli <andrea.celli@libero.it>\n"
"Language-Team: Italian <kde-i18n-it@kde.org>\n"
@@ -22,31 +22,6 @@ msgstr ""
"X-Generator: KBabel 1.11.4\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr "Il tuo desktop su una chiave USB"
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr "Mandriva Linux, la distribuzione 100%% open source"
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr "Prova Linux senza fatica con Mandriva One"
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr "Un sistema Mandriva Linux completo, con supporto"
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr "Mandriva: le distribuzioni per le esigenze di ognuno"
-
#: any.pm:109
#, c-format
msgid "Do you have further supplementary media?"
@@ -87,24 +62,25 @@ msgstr "Rete (FTP)"
msgid "Network (NFS)"
msgstr "Rete (NFS)"
-#: any.pm:163
+#: any.pm:165
#, c-format
msgid "URL of the mirror?"
msgstr "URL del mirror?"
-#: any.pm:169
+#: any.pm:171
#, c-format
msgid "URL must start with ftp:// or http://"
msgstr "L'URL deve iniziare con ftp:// o http://"
-#: any.pm:180
+#: any.pm:182
#, c-format
-msgid "Contacting Mandriva Linux web site to get the list of available mirrors..."
+msgid ""
+"Contacting Mandriva Linux web site to get the list of available mirrors..."
msgstr ""
"Connessione al sito Mandriva Linux per ricevere l'elenco dei mirror "
"disponibili..."
-#: any.pm:185
+#: any.pm:187
#, c-format
msgid ""
"Failed contacting Mandriva Linux web site to get the list of available "
@@ -113,47 +89,48 @@ msgstr ""
"Impossibile collegarsi al sito Mandriva Linux per ricevere l'elenco dei "
"mirror disponibili"
-#: any.pm:195
+#: any.pm:197
#, c-format
msgid "Choose a mirror from which to get the packages"
msgstr "Scegli un mirror da cui prelevare i pacchetti"
-#: any.pm:225
+#: any.pm:227
#, c-format
msgid "NFS setup"
msgstr "Configurazione NFS"
-#: any.pm:226
+#: any.pm:228
#, c-format
msgid "Please enter the hostname and directory of your NFS media"
-msgstr "Immetti il nome dell'host e della directory che userai come supporto NFS"
+msgstr ""
+"Immetti il nome dell'host e della directory che userai come supporto NFS"
-#: any.pm:230
+#: any.pm:232
#, c-format
msgid "Hostname missing"
msgstr "Manca il nome dell'host"
-#: any.pm:231
+#: any.pm:233
#, c-format
msgid "Directory must begin with \"/\""
msgstr "Una directory deve iniziare con \"/\""
-#: any.pm:235
+#: any.pm:237
#, c-format
msgid "Hostname of the NFS mount ?"
msgstr "Nome dell'host da montare con NFS?"
-#: any.pm:236
+#: any.pm:238
#, c-format
msgid "Directory"
msgstr "Directory"
-#: any.pm:258
+#: any.pm:260
#, c-format
msgid "Supplementary"
msgstr "Aggiuntivo"
-#: any.pm:293
+#: any.pm:295
#, c-format
msgid ""
"Can't find a package list file on this mirror. Make sure the location is "
@@ -162,22 +139,22 @@ msgstr ""
"Impossibile trovare su questo mirror il file con l'elenco dei pacchetti. "
"Assicurati che l'indirizzo sia esatto."
-#: any.pm:328
+#: any.pm:334
#, c-format
msgid "Looking at packages already installed..."
msgstr "Ricerca dei pacchetti già installati..."
-#: any.pm:362
+#: any.pm:368
#, c-format
msgid "Finding packages to upgrade..."
msgstr "Ricerca dei pacchetti da aggiornare..."
-#: any.pm:381
+#: any.pm:387
#, c-format
msgid "Removing packages prior to upgrade..."
msgstr "Rimozione dei pacchetti prima di aggiornare..."
-#: any.pm:402
+#: any.pm:408
#, c-format
msgid ""
"You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -198,18 +175,18 @@ msgstr ""
"riavvia il sistema e aggiornalo usando l'applet Mandriva per gli "
"aggiornamenti."
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
#, c-format
msgid "Reboot"
msgstr "Riavvia"
-#: any.pm:407
+#: any.pm:413
#, c-format
msgid "Proceed"
msgstr "Procedi"
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -223,72 +200,72 @@ msgstr ""
"\n"
"Vuoi davvero rimuoverli?\n"
-#: any.pm:815
+#: any.pm:821
#, c-format
msgid "Error reading file %s"
msgstr "Errore nel leggere il file %s"
-#: any.pm:1022
+#: any.pm:1028
#, c-format
msgid "The following disk(s) were renamed:"
msgstr "Questi dischi hanno cambiato nome:"
-#: any.pm:1024
+#: any.pm:1030
#, c-format
msgid "%s (previously named as %s)"
msgstr "%s (che prima si chiamava %s)"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "HTTP"
msgstr "HTTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "FTP"
msgstr "FTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "NFS"
msgstr "NFS"
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
#, c-format
msgid "Network"
msgstr "Rete"
-#: any.pm:1104
+#: any.pm:1110
#, c-format
msgid "Please choose a media"
msgstr "Scegli un supporto"
-#: any.pm:1120
+#: any.pm:1126
#, c-format
msgid "File already exists. Overwrite it?"
msgstr "Il file esiste già. Lo sovrascrivo?"
-#: any.pm:1124
+#: any.pm:1130
#, c-format
msgid "Permission denied"
msgstr "Permesso negato"
-#: any.pm:1172
+#: any.pm:1178
#, c-format
msgid "Bad NFS name"
msgstr "Nome NFS non valido"
-#: any.pm:1193
+#: any.pm:1199
#, c-format
msgid "Bad media %s"
msgstr "Supporto non valido %s"
-#: any.pm:1236
+#: any.pm:1242
#, c-format
msgid "Can not make screenshots before partitioning"
msgstr "Impossibile fare degli screenshot prima del partizionamento"
-#: any.pm:1244
+#: any.pm:1250
#, c-format
msgid "Screenshots will be available after install in %s"
msgstr "Gli screenshot saranno disponibili in %s dopo l'installazione."
@@ -299,11 +276,15 @@ msgid "Installation"
msgstr "Installazione"
#: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
#, c-format
msgid "Configuration"
msgstr "Configurazione"
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
#: install2.pm:168
#, c-format
msgid "You must also format %s"
@@ -328,22 +309,22 @@ msgstr "Attivazione della rete..."
msgid "Bringing down the network"
msgstr "Disattivazione della rete..."
-#: media.pm:402
+#: media.pm:399
#, c-format
msgid "Please wait, retrieving file"
msgstr "Per favore attendere, recupero file in corso"
-#: media.pm:734
+#: media.pm:718
#, c-format
-msgid "Downloading file %s..."
-msgstr "Scaricamento del file %s..."
+msgid "unable to add medium"
+msgstr ""
-#: media.pm:822
+#: media.pm:758
#, c-format
msgid "Copying some packages on disks for future use"
msgstr "Copia di alcuni pacchetti sui dischi per un'utilizzazione futura"
-#: media.pm:875
+#: media.pm:811
#, c-format
msgid "Copying in progress"
msgstr "Copia in corso"
@@ -387,27 +368,27 @@ msgstr ""
msgid "An error occurred:"
msgstr "Si è verificato un errore:"
-#: pkgs.pm:776
+#: pkgs.pm:780
#, c-format
msgid "%d installation transactions failed"
msgstr "%d transazioni dell'installazione fallite"
-#: pkgs.pm:777
+#: pkgs.pm:781
#, c-format
msgid "Installation of packages failed:"
msgstr "Installazione dei pacchetti non riuscita:"
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
#, c-format
msgid "Workstation"
msgstr "Workstation"
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
#, c-format
msgid "Office Workstation"
msgstr "Postazione per lavoro da ufficio"
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
#, c-format
msgid ""
"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -416,7 +397,7 @@ msgstr ""
"Programmi da ufficio: word-processor (OpenOffice.org Writer, Kword), fogli "
"elettronici (OpenOffice.org Calc, Kspread), visualizzatori PDF, ecc."
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
#, c-format
msgid ""
"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -425,32 +406,32 @@ msgstr ""
"Programmi da ufficio: word-processor (kword, abiword), fogli elettronici "
"(kspread, gnumeric), visualizzatori pdf, ecc."
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
#, c-format
msgid "Game station"
msgstr "Computer per giocare"
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
#, c-format
msgid "Amusement programs: arcade, boards, strategy, etc"
msgstr "Programmi di svago: arcade, da tavolo, di strategia, ecc."
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
#, c-format
msgid "Multimedia station"
msgstr "Computer multimediale"
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
#, c-format
msgid "Sound and video playing/editing programs"
msgstr "Programmi di riproduzione/modifica audio e video"
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
#, c-format
msgid "Internet station"
msgstr "Postazione Internet"
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
#, c-format
msgid ""
"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -459,211 +440,193 @@ msgstr ""
"Gruppo di programmi per leggere e inviare posta e news (mutt, tin...) e per "
"navigare il Web"
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
#, c-format
msgid "Network Computer (client)"
msgstr "Computer in rete (client)"
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
#, c-format
msgid "Clients for different protocols including ssh"
msgstr "Client per vari protocolli, incluso ssh"
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
#, c-format
msgid "Tools to ease the configuration of your computer"
msgstr "Strumenti per semplificare la configurazione del computer"
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
#, c-format
msgid "Console Tools"
msgstr "Programmi da riga di comando"
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
#, c-format
msgid "Editors, shells, file tools, terminals"
msgstr "Editor, shell, gestione file, terminali"
#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
#, c-format
msgid "Development"
msgstr "Sviluppo"
#: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
#, c-format
msgid "C and C++ development libraries, programs and include files"
msgstr "Librerie di sviluppo, programmi e file \"include\" per C e C++"
#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
#, c-format
msgid "Documentation"
msgstr "Documentazione"
#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
#, c-format
msgid "Books and Howto's on Linux and Free Software"
msgstr "Libri e Howto su Linux e sul Software Libero"
#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
#, c-format
msgid "LSB"
msgstr "LSB"
#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
#, c-format
msgid "Linux Standard Base. Third party applications support"
msgstr "Linux Standard Base. Supporto per applicazioni di terze parti"
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
#, c-format
msgid "Web Server"
msgstr "Server web"
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
#, c-format
msgid "Apache"
msgstr "Apache"
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
#, c-format
msgid "Groupware"
msgstr "Groupware"
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
#, c-format
msgid "Kolab Server"
msgstr "Server Kolab"
#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
#, c-format
msgid "Firewall/Router"
msgstr "Firewall/Router"
#: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
#, c-format
msgid "Internet gateway"
msgstr "Gateway per Internet"
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
#, c-format
msgid "Mail/News"
msgstr "Mail/News"
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
#, c-format
msgid "Postfix mail server, Inn news server"
msgstr "Server di posta Postfix, server di news Inn"
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
#, c-format
msgid "Directory Server"
msgstr "Directory Server"
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
#, c-format
msgid "FTP Server"
msgstr "Server FTP"
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
#, c-format
msgid "ProFTPd"
msgstr "ProFTPd"
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
#, c-format
msgid "DNS/NIS"
msgstr "DNS/NIS"
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
#, c-format
msgid "Domain Name and Network Information Server"
msgstr "Server per Domain Name e Network Information"
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
#, c-format
msgid "File and Printer Sharing Server"
msgstr "Server per la condivisione di file e stampanti"
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
#, c-format
msgid "NFS Server, Samba server"
msgstr "Server NFS, server Samba"
#: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
#, c-format
msgid "Database"
msgstr "Database"
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
#, c-format
msgid "PostgreSQL and MySQL Database Server"
msgstr "Server di database PostgreSQL e MySQL"
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
#, c-format
msgid "Web/FTP"
msgstr "Web/FTP"
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
#, c-format
msgid "Apache, Pro-ftpd"
msgstr "Apache e Pro-ftpd"
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
#, c-format
msgid "Mail"
msgstr "Posta"
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
#, c-format
msgid "Postfix mail server"
msgstr "Server di posta Postfix"
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
#, c-format
msgid "PostgreSQL or MySQL database server"
msgstr "Server di database PostgreSQL o MySQL"
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
#, c-format
msgid "Network Computer server"
msgstr "Server di rete"
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
#, c-format
msgid "NFS server, SMB server, Proxy server, ssh server"
msgstr "Server NFS, server SMB, server proxy, server SSH"
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
#, c-format
msgid "Graphical Environment"
msgstr "Ambiente grafico"
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
#, c-format
msgid "KDE Workstation"
msgstr "Workstation grafica con KDE"
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
#, c-format
msgid ""
"The K Desktop Environment, the basic graphical environment with a collection "
@@ -672,12 +635,12 @@ msgstr ""
"Il K Desktop Environment, l'ambiente grafico di base integrato da una ricca "
"collezione di strumenti"
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
#, c-format
msgid "GNOME Workstation"
msgstr "Workstation grafica con GNOME"
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
#, c-format
msgid ""
"A graphical environment with user-friendly set of applications and desktop "
@@ -686,7 +649,7 @@ msgstr ""
"Un ambiente grafico con un gruppo di applicazioni user-friendly e strumenti "
"per il desktop"
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
#, c-format
msgid "LXDE Desktop"
msgstr "Desktop LXDE"
@@ -700,54 +663,52 @@ msgstr ""
"Un ambiente grafico leggero e veloce dotato di applicazioni user-friendly e "
"di strumenti per il desktop"
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
#, c-format
msgid "Other Graphical Desktops"
msgstr "Altri desktop grafici"
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
#, c-format
msgid "Window Maker, Enlightenment, Fvwm, etc"
msgstr "Window Maker, Enlightenment, Fvwm, ecc."
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
#, c-format
msgid "Utilities"
msgstr "Utilità"
#: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
#, c-format
msgid "SSH Server"
msgstr "Server SSH"
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
#, c-format
msgid "Webmin"
msgstr "Webmin"
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
#, c-format
msgid "Webmin Remote Configuration Server"
msgstr "Server Webmin per la configurazione remota"
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
#, c-format
msgid "Network Utilities/Monitoring"
msgstr "Utilità/Monitoraggio della rete"
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
#, c-format
msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
msgstr "Strumenti di monitoraggio, accounting dei processi, tcpdump, nmap,..."
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
#, c-format
msgid "Mandriva Wizards"
msgstr "Procedure guidate Mandriva"
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
#, c-format
msgid "Wizards to configure server"
msgstr "Procedure guidate per la configurazione del server"
@@ -846,17 +807,17 @@ msgstr "Ecco l'anteprima del desktop '%s'."
msgid "Click on images in order to see a bigger preview"
msgstr "Clicca sulle immagini per ottenere un'anteprima più grande"
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
#, c-format
msgid "Package Group Selection"
msgstr "Selezione per gruppi di pacchetti"
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
#, c-format
msgid "Individual package selection"
msgstr "Selezione individuale dei pacchetti"
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
#, c-format
msgid "Total size: %d / %d MB"
msgstr "Dimensione totale: %d / %d MB"
@@ -975,12 +936,12 @@ msgstr "Installazione minimale"
msgid "Software Management"
msgstr "Gestione software"
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
#, c-format
msgid "Choose the packages you want to install"
msgstr "Scegli i pacchetti che vuoi installare"
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
#, c-format
msgid "Installing"
msgstr "Installazione"
@@ -1007,7 +968,7 @@ msgid_plural "%d packages"
msgstr[0] "%d pacchetto"
msgstr[1] "%d pacchetti"
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
#, c-format
msgid "Summary"
msgstr "Riepilogo"
@@ -1017,7 +978,7 @@ msgstr "Riepilogo"
msgid "Configure"
msgstr "Configura"
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
#, c-format
msgid "not configured"
msgstr "non configurata"
@@ -1027,7 +988,7 @@ msgstr "non configurata"
msgid "Media Selection"
msgstr "Selezione delle fonti d'installazione"
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
#, c-format
msgid ""
"The following installation media have been found.\n"
@@ -1036,7 +997,7 @@ msgstr ""
"Sono state trovate queste fonti d'installazione.\n"
"Se vuoi ignorarne qualcuna, la puoi deselezionare ora."
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
#, c-format
msgid ""
"You have the option to copy the contents of the CDs onto the hard drive "
@@ -1049,7 +1010,7 @@ msgstr ""
"L'installazione continuerà dal disco fisso e i pacchetti resteranno "
"disponibili anche quando il sistema sarà installato."
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
#, c-format
msgid "Copy whole CDs"
msgstr "Copia tutti i CD"
@@ -1069,63 +1030,49 @@ msgstr "Scegli la mappa della tastiera"
msgid "Here is the full list of available keyboards:"
msgstr "Ecco la lista completa delle tastiere disponibili:"
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
#, c-format
msgid "Install/Upgrade"
msgstr "Installazione/Aggiornamento"
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
#, c-format
msgid "Is this an install or an upgrade?"
msgstr "È un'installazione o un aggiornamento?"
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
#, c-format
msgid ""
"_: This is a noun:\n"
"Install"
msgstr "Installazione"
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
#, c-format
msgid "Upgrade %s"
msgstr "Aggiornamento di %s"
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr ""
-"Non è supportato il passaggio da una versione a 32bit ad una più nuova a "
-"64bit"
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr ""
-"Non è supportato il passaggio da una versione a 64bit ad una più nuova a "
-"32bit"
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
#, c-format
msgid "Encryption key for %s"
msgstr "Chiave di codifica per %s"
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
#, c-format
msgid "Cancel installation, reboot system"
msgstr "Cancella l'installazione, riavvia il sistema"
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
#, c-format
msgid "New Installation"
msgstr "Nuova Installazione"
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
#, c-format
msgid "Upgrade previous installation (not recommended)"
msgstr "Aggiorna l'installazione precedente (Non raccomandato)"
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
#, c-format
msgid ""
"Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1144,17 +1091,17 @@ msgstr ""
"Attenzione : è consigliato un backup di tutti i dati personali \n"
"prima di scegliere \"Nuova Installazione\"."
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "IDE"
msgstr "IDE"
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "Configuring IDE"
msgstr "Sto configurando IDE"
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
#, c-format
msgid ""
"No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1163,7 +1110,7 @@ msgstr ""
"Non c'è spazio libero per un bootstrap di 1MB! L'installazione continua, ma "
"per avviare il sistema dovrai creare la partizione di bootstrap con DiskDrake"
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
#, c-format
msgid ""
"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1174,7 +1121,7 @@ msgstr ""
"ma non potrai avviare il sistema, se prima non avrai creato la partizione di "
"avvio con DiskDrake"
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
#, c-format
msgid ""
"Change your Cd-Rom!\n"
@@ -1187,12 +1134,12 @@ msgstr ""
"pronto.\n"
"Se non lo hai, premi Annulla per saltare l'installazione da quel Cd-Rom."
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
#, c-format
msgid "Looking for available packages..."
msgstr "Sto cercando i pacchetti disponibili..."
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
#, c-format
msgid ""
"Your system does not have enough space left for installation or upgrade (%"
@@ -1201,7 +1148,7 @@ msgstr ""
"Sul sistema non è rimasto sufficiente spazio libero per l'installazione o "
"l'aggiornamento (%dMB > %dMB)"
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
#, c-format
msgid ""
"Please choose load or save package selection.\n"
@@ -1210,52 +1157,52 @@ msgstr ""
"Scegli se caricare o salvare la selezione di pacchetti.\n"
"Il formato è lo stesso dei file generati con auto_install."
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Load"
msgstr "Carica"
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Save"
msgstr "Salva"
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
#, c-format
msgid "Bad file"
msgstr "File non valido"
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
#, c-format
msgid "KDE"
msgstr "KDE"
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
#, c-format
msgid "GNOME"
msgstr "GNOME"
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
#, c-format
msgid "Desktop Selection"
msgstr "Selezione Desktop"
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
#, c-format
msgid "You can choose your workstation desktop profile."
msgstr "Puoi scegliere il profilo della tua workstation per il desktop"
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
#, c-format
msgid "Selected size is larger than available space"
msgstr "Lo spazio richiesto è maggiore di quello disponibile"
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
#, c-format
msgid "Type of install"
msgstr "Tipo di installazione"
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
#, c-format
msgid ""
"You have not selected any group of packages.\n"
@@ -1264,82 +1211,83 @@ msgstr ""
"Nessun gruppo di pacchetti risulta selezionato .\n"
"Scegli il tipo di installazione minima desiderato:"
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
#, c-format
msgid "With X"
msgstr "Con X"
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
#, c-format
msgid "With basic documentation (recommended!)"
msgstr "Con la documentazione essenziale (raccomandata!)"
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
#, c-format
msgid "Truly minimal install (especially no urpmi)"
msgstr "Installazione veramente minimale (in particolare niente urpmi)"
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
#, c-format
msgid "Preparing installation"
msgstr "Sto preparando l'installazione"
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
#, c-format
msgid "Installing package %s"
msgstr "Installazione del pacchetto %s"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "There was an error ordering packages:"
msgstr "C'è un errore nell'ordinamento dei pacchetti:"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "Go on anyway?"
msgstr "Vado avanti comunque?"
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
#, c-format
msgid "Retry"
msgstr "Riprova"
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
#, c-format
msgid "Skip this package"
msgstr "Salta questo pacchetto"
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
#, c-format
msgid "Skip all packages from medium \"%s\""
msgstr "Salta tutti i pacchetti provenienti da \"%s\""
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
#, c-format
msgid "Go back to media and packages selection"
msgstr "Torna alla scelta dei pacchetti e delle fonti"
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
#, c-format
msgid "There was an error installing package %s."
msgstr "C'è stato un errore nell'installazione del pacchetto %s."
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
#, c-format
msgid "Post-install configuration"
msgstr "Configurazione post installazione"
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
#, c-format
msgid "Please ensure the Update Modules media is in drive %s"
-msgstr "Assicurati che gli \"Update Modules\" siano leggibili dal dispositivo %s"
+msgstr ""
+"Assicurati che gli \"Update Modules\" siano leggibili dal dispositivo %s"
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
#, c-format
msgid "Updates"
msgstr "Aggiornamenti"
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
#, c-format
msgid ""
"You now have the opportunity to download updated packages. These packages\n"
@@ -1360,28 +1308,28 @@ msgstr ""
"\n"
"Vuoi installare gli aggiornamenti?"
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
#, c-format
msgid "%s on %s"
msgstr "%s in %s"
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
#, c-format
msgid "Hardware"
msgstr "Hardware"
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
#, c-format
msgid "Sound card"
msgstr "Scheda audio"
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
#, c-format
msgid "Do you have an ISA sound card?"
msgstr "Hai una scheda audio ISA?"
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
#, c-format
msgid ""
"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1390,67 +1338,68 @@ msgstr ""
"Lancia \"alsaconf\" o \"sndconfig\" dopo l'installazione per configurare la "
"scheda audio"
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
#, c-format
msgid "No sound card detected. Try \"harddrake\" after installation"
-msgstr "Nessuna scheda audio rilevata. Prova con \"harddrake\" dopo l'installazione."
+msgstr ""
+"Nessuna scheda audio rilevata. Prova con \"harddrake\" dopo l'installazione."
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
#, c-format
msgid "Graphical interface"
msgstr "Interfaccia grafica"
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
#, c-format
msgid "Network & Internet"
msgstr "Rete e Internet"
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
#, c-format
msgid "Proxies"
msgstr "Proxy"
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
#, c-format
msgid "configured"
msgstr "configurato"
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
#, c-format
msgid "Security Level"
msgstr "Livello di sicurezza"
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
#, c-format
msgid "Firewall"
msgstr "Firewall"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "activated"
msgstr "attivato"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "disabled"
msgstr "disabilitato"
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
#, c-format
msgid "You have not configured X. Are you sure you really want this?"
msgstr "Non hai configurato X. Sei sicuro di non volerlo fare?"
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
#, c-format
msgid "Preparing bootloader..."
msgstr "Preparazione del bootloader..."
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
#, c-format
msgid "Be patient, this may take a while..."
msgstr "sii paziente, potrebbe servire un po' di tempo..."
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
#, c-format
msgid ""
"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1463,7 +1412,7 @@ msgstr ""
"BootX o qualche altro metodo per avviare il tuo computer. L'argomento da "
"passare al kernel per il fs radice è: root=%s"
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
#, c-format
msgid ""
"In this security level, access to the files in the Windows partition is "
@@ -1472,17 +1421,17 @@ msgstr ""
"A questo livello di sicurezza, l'accesso ai file delle partizioni Windows è "
"riservato all'amministratore."
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr "Inserisci un floppy vuoto nell'unità %s"
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
#, c-format
msgid "Creating auto install floppy..."
msgstr "Sto creando il floppy di installazione automatica..."
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
#, c-format
msgid ""
"Some steps are not completed.\n"
@@ -1493,7 +1442,7 @@ msgstr ""
"\n"
"Vuoi veramente interrompere adesso?"
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
#, c-format
msgid "Congratulations"
msgstr "Congratulazioni"
@@ -1637,3 +1586,30 @@ msgid ""
"Exit"
msgstr "Esci"
+#~ msgid "Your desktop on a USB key"
+#~ msgstr "Il tuo desktop su una chiave USB"
+
+#~ msgid "The 100%% open source Mandriva Linux distribution"
+#~ msgstr "Mandriva Linux, la distribuzione 100%% open source"
+
+#~ msgid "Explore Linux easily with Mandriva One"
+#~ msgstr "Prova Linux senza fatica con Mandriva One"
+
+#~ msgid "A full Mandriva Linux desktop, with support"
+#~ msgstr "Un sistema Mandriva Linux completo, con supporto"
+
+#~ msgid "Mandriva: distributions for everybody's needs"
+#~ msgstr "Mandriva: le distribuzioni per le esigenze di ognuno"
+
+#~ msgid "Downloading file %s..."
+#~ msgstr "Scaricamento del file %s..."
+
+#~ msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
+#~ msgstr ""
+#~ "Non è supportato il passaggio da una versione a 32bit ad una più nuova a "
+#~ "64bit"
+
+#~ msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
+#~ msgstr ""
+#~ "Non è supportato il passaggio da una versione a 64bit ad una più nuova a "
+#~ "32bit"
diff --git a/perl-install/install/share/po/ja.po b/perl-install/install/share/po/ja.po
index 5fae3cdaf..eecd5376a 100644
--- a/perl-install/install/share/po/ja.po
+++ b/perl-install/install/share/po/ja.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: DrakX-ja\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
"PO-Revision-Date: 2009-03-22 21:11+0900\n"
"Last-Translator: Yukiko Bando <ybando@k6.dion.ne.jp>\n"
"Language-Team: Japanese <cooker-i18n@mandrivalinux.org>\n"
@@ -19,31 +19,6 @@ msgstr ""
"X-Generator: KBabel 1.3.1\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr ""
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr ""
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr ""
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr ""
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr ""
-
#: any.pm:109
#, c-format
msgid "Do you have further supplementary media?"
@@ -83,23 +58,23 @@ msgstr "ネットワーク (FTP)"
msgid "Network (NFS)"
msgstr "ネットワーク (NFS)"
-#: any.pm:163
+#: any.pm:165
#, c-format
msgid "URL of the mirror?"
msgstr "ミラーの URL"
-#: any.pm:169
+#: any.pm:171
#, c-format
msgid "URL must start with ftp:// or http://"
msgstr "URL は ftp:// または http:// で始まらなければなりません"
-#: any.pm:180
+#: any.pm:182
#, c-format
msgid ""
"Contacting Mandriva Linux web site to get the list of available mirrors..."
msgstr "Mandriva Linux のサイトに接続してミラーのリストを取得しています..."
-#: any.pm:185
+#: any.pm:187
#, c-format
msgid ""
"Failed contacting Mandriva Linux web site to get the list of available "
@@ -108,47 +83,47 @@ msgstr ""
"Mandriva Linux ウェブサイトへの接続に失敗したため、利用可能なミラーのリストを"
"取得できませんでした"
-#: any.pm:195
+#: any.pm:197
#, c-format
msgid "Choose a mirror from which to get the packages"
msgstr "パッケージを取得するミラーを選択"
-#: any.pm:225
+#: any.pm:227
#, c-format
msgid "NFS setup"
msgstr "NFS の設定"
-#: any.pm:226
+#: any.pm:228
#, c-format
msgid "Please enter the hostname and directory of your NFS media"
msgstr "NFS メディアのホスト名とディレクトリを入力してください"
-#: any.pm:230
+#: any.pm:232
#, c-format
msgid "Hostname missing"
msgstr "ホスト名がありません"
-#: any.pm:231
+#: any.pm:233
#, c-format
msgid "Directory must begin with \"/\""
msgstr "ディレクトリは \"/\" で始まらなければなりません"
-#: any.pm:235
+#: any.pm:237
#, c-format
msgid "Hostname of the NFS mount ?"
msgstr "NFS マウントのホスト名"
-#: any.pm:236
+#: any.pm:238
#, c-format
msgid "Directory"
msgstr "ディレクトリ"
-#: any.pm:258
+#: any.pm:260
#, c-format
msgid "Supplementary"
msgstr "補助"
-#: any.pm:293
+#: any.pm:295
#, c-format
msgid ""
"Can't find a package list file on this mirror. Make sure the location is "
@@ -157,22 +132,22 @@ msgstr ""
"パッケージリストのファイルが見つかりません。ミラーの場所が正しいか確認してく"
"ださい。"
-#: any.pm:328
+#: any.pm:334
#, c-format
msgid "Looking at packages already installed..."
msgstr "インストール済みパッケージを探しています..."
-#: any.pm:362
+#: any.pm:368
#, c-format
msgid "Finding packages to upgrade..."
msgstr "更新するパッケージを探しています..."
-#: any.pm:381
+#: any.pm:387
#, c-format
msgid "Removing packages prior to upgrade..."
msgstr "アップグレードする前にパッケージを削除しています..."
-#: any.pm:402
+#: any.pm:408
#, c-format
msgid ""
"You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -184,18 +159,18 @@ msgid ""
"please reboot your system and upgrade using the Mandriva update applet."
msgstr ""
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
#, c-format
msgid "Reboot"
msgstr "再起動"
-#: any.pm:407
+#: any.pm:413
#, c-format
msgid "Proceed"
msgstr "続行"
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -208,72 +183,72 @@ msgstr ""
"\n"
"これらのパッケージを削除してよろしいですか?\n"
-#: any.pm:815
+#: any.pm:821
#, c-format
msgid "Error reading file %s"
msgstr "ファイル %s を読み込み中にエラー"
-#: any.pm:1022
+#: any.pm:1028
#, c-format
msgid "The following disk(s) were renamed:"
msgstr "次のディスクの名前は変更されました:"
-#: any.pm:1024
+#: any.pm:1030
#, c-format
msgid "%s (previously named as %s)"
msgstr "%s (変更前の名前は %s)"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "HTTP"
msgstr "HTTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "FTP"
msgstr "FTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "NFS"
msgstr "NFS"
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
#, c-format
msgid "Network"
msgstr "ネットワーク"
-#: any.pm:1104
+#: any.pm:1110
#, c-format
msgid "Please choose a media"
msgstr "メディアを選んでください"
-#: any.pm:1120
+#: any.pm:1126
#, c-format
msgid "File already exists. Overwrite it?"
msgstr "ファイルが既に存在します。上書きしますか?"
-#: any.pm:1124
+#: any.pm:1130
#, c-format
msgid "Permission denied"
msgstr "アクセス許可がありません"
-#: any.pm:1172
+#: any.pm:1178
#, c-format
msgid "Bad NFS name"
msgstr "不正な NFS 名"
-#: any.pm:1193
+#: any.pm:1199
#, c-format
msgid "Bad media %s"
msgstr "不正なメディア %s"
-#: any.pm:1236
+#: any.pm:1242
#, c-format
msgid "Can not make screenshots before partitioning"
msgstr "パーティション設定が終わるまでスクリーンショットは撮れません"
-#: any.pm:1244
+#: any.pm:1250
#, c-format
msgid "Screenshots will be available after install in %s"
msgstr ""
@@ -285,11 +260,15 @@ msgid "Installation"
msgstr "インストール"
#: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
#, c-format
msgid "Configuration"
msgstr "設定"
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
#: install2.pm:168
#, c-format
msgid "You must also format %s"
@@ -314,22 +293,22 @@ msgstr "ネットワークを確立"
msgid "Bringing down the network"
msgstr "ネットワークを切断"
-#: media.pm:402
+#: media.pm:399
#, c-format
msgid "Please wait, retrieving file"
msgstr "ファイルを取得しています。お待ちください。"
-#: media.pm:734
+#: media.pm:718
#, c-format
-msgid "Downloading file %s..."
-msgstr "ファイル %s をダウンロード中..."
+msgid "unable to add medium"
+msgstr ""
-#: media.pm:822
+#: media.pm:758
#, c-format
msgid "Copying some packages on disks for future use"
msgstr "後で利用するためにパッケージをディスクにコピー"
-#: media.pm:875
+#: media.pm:811
#, c-format
msgid "Copying in progress"
msgstr "コピーしています"
@@ -373,27 +352,27 @@ msgstr ""
msgid "An error occurred:"
msgstr "エラーが発生しました"
-#: pkgs.pm:776
+#: pkgs.pm:780
#, c-format
msgid "%d installation transactions failed"
msgstr "%d 件のインストールが失敗しました"
-#: pkgs.pm:777
+#: pkgs.pm:781
#, fuzzy, c-format
msgid "Installation of packages failed:"
msgstr "パッケージ %s をインストール"
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
#, c-format
msgid "Workstation"
msgstr "ワークステーション"
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
#, c-format
msgid "Office Workstation"
msgstr "オフィスワークステーション"
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
#, c-format
msgid ""
"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -402,7 +381,7 @@ msgstr ""
"オフィスソフト: ワープロ (OpenOffice.org Writer, Kword), 表計算 (OpenOffice."
"org Calc, Kspread), PDF ビューアなど"
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
#, c-format
msgid ""
"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -411,262 +390,244 @@ msgstr ""
"オフィスソフト: ワープロ (kword,abiword), 表計算 (kspread,gnumeric), PDF "
"ビューアなど"
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
#, c-format
msgid "Game station"
msgstr "ゲームステーション"
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
#, c-format
msgid "Amusement programs: arcade, boards, strategy, etc"
msgstr "ゲームプログラム: アーケードゲーム, ボードゲーム, 戦略ゲームなど"
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
#, c-format
msgid "Multimedia station"
msgstr "マルチメディアステーション"
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
#, c-format
msgid "Sound and video playing/editing programs"
msgstr "サウンドと動画の再生/編集ソフト"
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
#, c-format
msgid "Internet station"
msgstr "インターネットステーション"
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
#, c-format
msgid ""
"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
"Web"
msgstr "メールとニュースの送受信用ツール (mutt,tin..) とウェブブラウズ用ツール"
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
#, c-format
msgid "Network Computer (client)"
msgstr "ネットワーク (クライアント)"
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
#, c-format
msgid "Clients for different protocols including ssh"
msgstr "ssh などの各種プロトコル用クライアント"
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
#, c-format
msgid "Tools to ease the configuration of your computer"
msgstr "コンピュータの設定を簡単にするツール"
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
#, c-format
msgid "Console Tools"
msgstr "コンソールツール"
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
#, c-format
msgid "Editors, shells, file tools, terminals"
msgstr "エディタ, シェル, ファイル関連ツール, ターミナル"
#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
#, c-format
msgid "Development"
msgstr "開発用"
#: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
#, c-format
msgid "C and C++ development libraries, programs and include files"
msgstr "C/C++ の開発ライブラリ, プログラム, include ファイル"
#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
#, c-format
msgid "Documentation"
msgstr "ドキュメント"
#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
#, c-format
msgid "Books and Howto's on Linux and Free Software"
msgstr "Linux/フリーソフト関連の文書とHowto"
#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
#, c-format
msgid "LSB"
msgstr "LSB"
#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
#, c-format
msgid "Linux Standard Base. Third party applications support"
msgstr "Linux Standard Base, サードパーティのアプリケーションをサポート"
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
#, c-format
msgid "Web Server"
msgstr "Web サーバ"
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
#, c-format
msgid "Apache"
msgstr "Apache"
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
#, c-format
msgid "Groupware"
msgstr "グループウェア"
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
#, c-format
msgid "Kolab Server"
msgstr "Kolabサーバ"
#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
#, c-format
msgid "Firewall/Router"
msgstr "ファイアウォール/ルータ"
#: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
#, c-format
msgid "Internet gateway"
msgstr "インターネットゲートウェイ"
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
#, c-format
msgid "Mail/News"
msgstr "メール/ニュース"
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
#, c-format
msgid "Postfix mail server, Inn news server"
msgstr "Postfix メールサーバ, Inn ニュースサーバ"
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
#, c-format
msgid "Directory Server"
msgstr "ディレクトリサーバ"
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
#, c-format
msgid "FTP Server"
msgstr "FTP サーバ"
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
#, c-format
msgid "ProFTPd"
msgstr "ProFTPd"
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
#, c-format
msgid "DNS/NIS"
msgstr "DNS/NIS"
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
#, c-format
msgid "Domain Name and Network Information Server"
msgstr "ドメイン名/ネットワークインフォメーションサーバ"
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
#, c-format
msgid "File and Printer Sharing Server"
msgstr "ファイル/プリンタ共有サーバ"
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
#, c-format
msgid "NFS Server, Samba server"
msgstr "NFS サーバ/Samba サーバ"
#: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
#, c-format
msgid "Database"
msgstr "データベース"
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
#, c-format
msgid "PostgreSQL and MySQL Database Server"
msgstr "PostgreSQL/MySQLデータベースサーバ"
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
#, c-format
msgid "Web/FTP"
msgstr "Web/FTP"
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
#, c-format
msgid "Apache, Pro-ftpd"
msgstr "Apache, Pro-ftpd"
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
#, c-format
msgid "Mail"
msgstr "メール"
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
#, c-format
msgid "Postfix mail server"
msgstr "Postfix メールサーバ"
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
#, c-format
msgid "PostgreSQL or MySQL database server"
msgstr "PostgreSQL/MySQL データベースサーバ"
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
#, c-format
msgid "Network Computer server"
msgstr "ネットワークコンピュータサーバ"
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
#, c-format
msgid "NFS server, SMB server, Proxy server, ssh server"
msgstr "NFS サーバ, SMB サーバ, プロキシサーバ, SSH サーバ"
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
#, c-format
msgid "Graphical Environment"
msgstr "グラフィカル環境"
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
#, c-format
msgid "KDE Workstation"
msgstr "KDE ワークステーション"
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
#, c-format
msgid ""
"The K Desktop Environment, the basic graphical environment with a collection "
"of accompanying tools"
msgstr "KDE - さまざまなツールを含む定番グラフィカル環境"
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
#, c-format
msgid "GNOME Workstation"
msgstr "GNOME ワークステーション"
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
#, c-format
msgid ""
"A graphical environment with user-friendly set of applications and desktop "
"tools"
msgstr "使いやすいアプリケーションとデスクトップツールを含むグラフィカル環境"
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
#, c-format
msgid "LXDE Desktop"
msgstr "LXDE デスクトップ"
@@ -678,54 +639,52 @@ msgid ""
"applications and desktop tools"
msgstr "使いやすいアプリケーションとデスクトップツールを含むグラフィカル環境"
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
#, c-format
msgid "Other Graphical Desktops"
msgstr "その他のグラフィカルデスクトップ"
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
#, c-format
msgid "Window Maker, Enlightenment, Fvwm, etc"
msgstr "Window Maker, Enlightenment, Fvwm など"
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
#, c-format
msgid "Utilities"
msgstr "ユーティリティ"
#: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
#, c-format
msgid "SSH Server"
msgstr "SSH サーバ"
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
#, c-format
msgid "Webmin"
msgstr "Webmin"
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
#, c-format
msgid "Webmin Remote Configuration Server"
msgstr "Webmin リモート設定サーバ"
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
#, c-format
msgid "Network Utilities/Monitoring"
msgstr "ネットワークユーティリティ/モニタリング"
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
#, c-format
msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
msgstr "モニタリングツール, プロセス管理, tcpdump, nmap..."
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
#, c-format
msgid "Mandriva Wizards"
msgstr "Mandriva ウィザード"
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
#, c-format
msgid "Wizards to configure server"
msgstr "サーバ設定ウィザード"
@@ -824,19 +783,19 @@ msgstr "%s デスクトップのプレビューです。"
msgid "Click on images in order to see a bigger preview"
msgstr "画像をクリックすると大きなプレビューが表示されます"
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
#, c-format
msgid "Package Group Selection"
msgstr "パッケージグループを選択"
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
#, c-format
msgid "Individual package selection"
msgstr "パッケージを個別に選択"
# Changed "total size" to "total", due to problem of available
# space on screen.
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
#, c-format
msgid "Total size: %d / %d MB"
msgstr "合計: %d/%d MB"
@@ -954,12 +913,12 @@ msgstr "最小インストール"
msgid "Software Management"
msgstr "ソフトウェアの管理"
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
#, c-format
msgid "Choose the packages you want to install"
msgstr "インストールするパッケージを選んでください"
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
#, c-format
msgid "Installing"
msgstr "インストール中"
@@ -985,7 +944,7 @@ msgid "%d package"
msgid_plural "%d packages"
msgstr[0] "%d 個のパッケージ"
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
#, c-format
msgid "Summary"
msgstr "まとめ"
@@ -995,7 +954,7 @@ msgstr "まとめ"
msgid "Configure"
msgstr "設定"
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
#, c-format
msgid "not configured"
msgstr "設定されていません"
@@ -1005,7 +964,7 @@ msgstr "設定されていません"
msgid "Media Selection"
msgstr "メディアの選択"
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
#, c-format
msgid ""
"The following installation media have been found.\n"
@@ -1014,7 +973,7 @@ msgstr ""
"次のインストールメディアを検出しました。\n"
"使用しないものがあればここで選択を解除してください。"
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
#, c-format
msgid ""
"You have the option to copy the contents of the CDs onto the hard drive "
@@ -1026,7 +985,7 @@ msgstr ""
"そうするとインストーラはハードドライブからインストールを続けます。コピーされ"
"たパッケージはインストール完了後も利用できます。"
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
#, c-format
msgid "Copy whole CDs"
msgstr "CD 全体をコピー"
@@ -1046,63 +1005,49 @@ msgstr "キーボードの配列を選んでください"
msgid "Here is the full list of available keyboards:"
msgstr "利用可能なすべてのキーボードのリスト:"
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
#, c-format
msgid "Install/Upgrade"
msgstr "インストール/更新"
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
#, c-format
msgid "Is this an install or an upgrade?"
msgstr "インストールか更新を選んでください"
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
#, c-format
msgid ""
"_: This is a noun:\n"
"Install"
msgstr "インストール"
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
#, c-format
msgid "Upgrade %s"
msgstr "%s を更新"
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr ""
-"32bit から 64bit ディストリビューションへのアップグレードはサポートされていま"
-"せん"
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr ""
-"64bit から 32bit ディストリビューションへのアップグレードはサポートされていま"
-"せん"
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
#, c-format
msgid "Encryption key for %s"
msgstr "%s の暗号鍵"
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
#, c-format
msgid "Cancel installation, reboot system"
msgstr "インストールを中止し、システムを再起動"
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
#, c-format
msgid "New Installation"
msgstr "新しくインストール"
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
#, c-format
msgid "Upgrade previous installation (not recommended)"
msgstr "既存のシステムをアップグレード (非推奨)"
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
#, c-format
msgid ""
"Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1121,17 +1066,17 @@ msgstr ""
"警告: 「新しくインストール」を選択する前に、必ず個人データの\n"
"バックアップを作成してください。"
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "IDE"
msgstr "IDE"
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "Configuring IDE"
msgstr "IDE を設定"
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
#, c-format
msgid ""
"No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1141,7 +1086,7 @@ msgstr ""
"ステムを起動するには、DiskDrake でブートストラップパーティションを作成する必"
"要があります。"
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
#, c-format
msgid ""
"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1152,7 +1097,7 @@ msgstr ""
"システムを起動するには、DiskDrake でブートストラップパーティションを作成する"
"必要があります。"
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
#, c-format
msgid ""
"Change your Cd-Rom!\n"
@@ -1164,12 +1109,12 @@ msgstr ""
"\"%s\" という CD-ROM をドライブに入れて「OK」を押してください。\n"
"お持ちでない場合は「キャンセル」を押してください。"
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
#, c-format
msgid "Looking for available packages..."
msgstr "利用可能なパッケージを探しています..."
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
#, c-format
msgid ""
"Your system does not have enough space left for installation or upgrade (%"
@@ -1178,7 +1123,7 @@ msgstr ""
"あなたのシステムにはインストールまたはアップグレードに必要な空き容量がありま"
"せん (%dMB > %dMB)"
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
#, c-format
msgid ""
"Please choose load or save package selection.\n"
@@ -1187,52 +1132,52 @@ msgstr ""
"パッケージの選択を読み込むか保存するかを選んでください。\n"
"形式は auto_install で生成されたファイルと同じです。"
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Load"
msgstr "読み込む"
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Save"
msgstr "保存する"
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
#, c-format
msgid "Bad file"
msgstr "不正なファイル"
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
#, c-format
msgid "KDE"
msgstr "KDE"
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
#, c-format
msgid "GNOME"
msgstr "GNOME"
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
#, c-format
msgid "Desktop Selection"
msgstr "デスクトップの選択"
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
#, c-format
msgid "You can choose your workstation desktop profile."
msgstr "ワークステーションのデスクトッププロファイルを選択."
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
#, c-format
msgid "Selected size is larger than available space"
msgstr "指定されたサイズが空き容量を超えています"
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
#, c-format
msgid "Type of install"
msgstr "インストールの種類"
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
#, c-format
msgid ""
"You have not selected any group of packages.\n"
@@ -1241,82 +1186,82 @@ msgstr ""
"パッケージグループが選択されていません。\n"
"インストールする最低限のものを選んでください:"
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
#, c-format
msgid "With X"
msgstr "X を使う"
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
#, c-format
msgid "With basic documentation (recommended!)"
msgstr "基本的なドキュメントを入れる (推奨)"
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
#, c-format
msgid "Truly minimal install (especially no urpmi)"
msgstr "最小限のインストール (urpmi も含まれません)"
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
#, c-format
msgid "Preparing installation"
msgstr "インストールの準備"
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
#, c-format
msgid "Installing package %s"
msgstr "パッケージ %s をインストール"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "There was an error ordering packages:"
msgstr "パッケージを並べ替え中にエラーが発生:"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "Go on anyway?"
msgstr "続けますか?"
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
#, c-format
msgid "Retry"
msgstr "再試行"
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
#, c-format
msgid "Skip this package"
msgstr "このパッケージを飛ばす"
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
#, c-format
msgid "Skip all packages from medium \"%s\""
msgstr "メディア %s のすべてのパッケージを飛ばす"
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
#, c-format
msgid "Go back to media and packages selection"
msgstr "メディアとパッケージの選択に戻る"
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
#, c-format
msgid "There was an error installing package %s."
msgstr "パッケージ %s のインストール中にエラーが発生しました。"
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
#, c-format
msgid "Post-install configuration"
msgstr "インストール後の設定"
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
#, c-format
msgid "Please ensure the Update Modules media is in drive %s"
msgstr "更新モジュールメディアがドライブ %s に入っていることを確認してください"
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
#, c-format
msgid "Updates"
msgstr "更新"
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
#, c-format
msgid ""
"You now have the opportunity to download updated packages. These packages\n"
@@ -1336,28 +1281,28 @@ msgstr ""
"\n"
"更新されたパッケージをインストールしますか?"
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
#, c-format
msgid "%s on %s"
msgstr "%2$s の %1$s"
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
#, c-format
msgid "Hardware"
msgstr "ハードウェア"
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
#, c-format
msgid "Sound card"
msgstr "サウンドカード"
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
#, c-format
msgid "Do you have an ISA sound card?"
msgstr "ISA サウンドカードをお使いですか?"
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
#, c-format
msgid ""
"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1366,69 +1311,69 @@ msgstr ""
"インストール後に alsaconf か sndconfig を実行してサウンドカードを設定してくだ"
"さい。"
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
#, c-format
msgid "No sound card detected. Try \"harddrake\" after installation"
msgstr ""
"サウンドカードが見つかりません。インストール後に harddrake で再度設定を試みて"
"ください。"
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
#, c-format
msgid "Graphical interface"
msgstr "グラフィカルインターフェース"
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
#, c-format
msgid "Network & Internet"
msgstr "ネットワークとインターネット"
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
#, c-format
msgid "Proxies"
msgstr "プロキシ"
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
#, c-format
msgid "configured"
msgstr "設定済み"
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
#, c-format
msgid "Security Level"
msgstr "セキュリティレベル"
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
#, c-format
msgid "Firewall"
msgstr "ファイアウォール"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "activated"
msgstr "有効"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "disabled"
msgstr "無効"
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
#, c-format
msgid "You have not configured X. Are you sure you really want this?"
msgstr "X が設定されていません。本当によろしいですか?"
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
#, c-format
msgid "Preparing bootloader..."
msgstr "ブートローダを準備中..."
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
#, c-format
msgid "Be patient, this may take a while..."
msgstr "しばらく時間がかかります。お待ちください。"
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
#, c-format
msgid ""
"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1440,7 +1385,7 @@ msgstr ""
"は yaboot は動きません。インストールを続けますが、マシンを起動するには、"
"BootX もしくは他の方法が必要です。'root fs' のカーネル引数は 'root=%s' です。"
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
#, c-format
msgid ""
"In this security level, access to the files in the Windows partition is "
@@ -1449,17 +1394,17 @@ msgstr ""
"このセキュリティレベルでは、Windows パーティションのファイルへのアクセスが管"
"理者のみに限定されます。"
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr "空のフロッピーをドライブ %s に入れてください"
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
#, c-format
msgid "Creating auto install floppy..."
msgstr "インストール自動化フロッピーを作成中..."
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
#, c-format
msgid ""
"Some steps are not completed.\n"
@@ -1470,7 +1415,7 @@ msgstr ""
"\n"
"本当に終了しますか?"
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
#, c-format
msgid "Congratulations"
msgstr "おめでとうございます"
@@ -1614,6 +1559,19 @@ msgid ""
"Exit"
msgstr "終了"
+#~ msgid "Downloading file %s..."
+#~ msgstr "ファイル %s をダウンロード中..."
+
+#~ msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
+#~ msgstr ""
+#~ "32bit から 64bit ディストリビューションへのアップグレードはサポートされて"
+#~ "いません"
+
+#~ msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
+#~ msgstr ""
+#~ "64bit から 32bit ディストリビューションへのアップグレードはサポートされて"
+#~ "いません"
+
#~ msgid ""
#~ "You have selected the following server(s): %s\n"
#~ "\n"
diff --git a/perl-install/install/share/po/ko.po b/perl-install/install/share/po/ko.po
index 3155f4f57..2bd5235d2 100644
--- a/perl-install/install/share/po/ko.po
+++ b/perl-install/install/share/po/ko.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ko(metanav)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
"PO-Revision-Date: 2007-06-18 14:54+0900\n"
"Last-Translator: meta <hbahn@metq.com>\n"
"Language-Team: ahb hong-bae <ko@li.org>\n"
@@ -20,31 +20,6 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: KBabel 1.11.4\n"
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr ""
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr ""
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr ""
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr ""
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr ""
-
#: any.pm:109
#, c-format
msgid "Do you have further supplementary media?"
@@ -84,23 +59,23 @@ msgstr "망(FTP)"
msgid "Network (NFS)"
msgstr "망(NFS)"
-#: any.pm:163
+#: any.pm:165
#, c-format
msgid "URL of the mirror?"
msgstr "미러사이트의 (URL)주소를 적어주십시오."
-#: any.pm:169
+#: any.pm:171
#, c-format
msgid "URL must start with ftp:// or http://"
msgstr "URL 주소는 ftp:// 또는 http:// 로 시작되어야 합니다."
-#: any.pm:180
+#: any.pm:182
#, c-format
msgid ""
"Contacting Mandriva Linux web site to get the list of available mirrors..."
msgstr "유효한 미러 목록을 받기 위해 Mandriva Linux 홈페이지에 접속 중..."
-#: any.pm:185
+#: any.pm:187
#, c-format
msgid ""
"Failed contacting Mandriva Linux web site to get the list of available "
@@ -108,47 +83,47 @@ msgid ""
msgstr ""
"Mandriva Linux 홈페이지에 접속하여 미러사이트목록을 받는 데 실패했습니다."
-#: any.pm:195
+#: any.pm:197
#, c-format
msgid "Choose a mirror from which to get the packages"
msgstr "패키지를 받을 미러 사이트를 선택하시오."
-#: any.pm:225
+#: any.pm:227
#, c-format
msgid "NFS setup"
msgstr "망 파일 시스템 (NFS) 구성"
-#: any.pm:226
+#: any.pm:228
#, c-format
msgid "Please enter the hostname and directory of your NFS media"
msgstr "NFS 매체의 호스트 이름과 디렉토리를 입력해 주십시요."
-#: any.pm:230
+#: any.pm:232
#, c-format
msgid "Hostname missing"
msgstr "호스트 이름을 찾을 수 없습니다"
-#: any.pm:231
+#: any.pm:233
#, c-format
msgid "Directory must begin with \"/\""
msgstr "디렉토리는 \"/\"로 시작되어야 합니다."
-#: any.pm:235
+#: any.pm:237
#, c-format
msgid "Hostname of the NFS mount ?"
msgstr "망 파일 시스템(NFS)의 호스트 이름을 설치합니까?"
-#: any.pm:236
+#: any.pm:238
#, c-format
msgid "Directory"
msgstr "디렉토리"
-#: any.pm:258
+#: any.pm:260
#, c-format
msgid "Supplementary"
msgstr "추가"
-#: any.pm:293
+#: any.pm:295
#, c-format
msgid ""
"Can't find a package list file on this mirror. Make sure the location is "
@@ -156,22 +131,22 @@ msgid ""
msgstr ""
"미러 사이트에서 패키지 리스트를 찾을 수 없습니다. 이 위치에 만드시겠습니까?"
-#: any.pm:328
+#: any.pm:334
#, c-format
msgid "Looking at packages already installed..."
msgstr "이미 설치된 패키지 찾는 중..."
-#: any.pm:362
+#: any.pm:368
#, c-format
msgid "Finding packages to upgrade..."
msgstr "업그레이드할 패키지를 검색중..."
-#: any.pm:381
+#: any.pm:387
#, c-format
msgid "Removing packages prior to upgrade..."
msgstr "업그레이드된 패키지를 제거하는 중..."
-#: any.pm:402
+#: any.pm:408
#, c-format
msgid ""
"You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -183,18 +158,18 @@ msgid ""
"please reboot your system and upgrade using the Mandriva update applet."
msgstr ""
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
#, c-format
msgid "Reboot"
msgstr "다시 시작"
-#: any.pm:407
+#: any.pm:413
#, c-format
msgid "Proceed"
msgstr ""
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -207,72 +182,72 @@ msgstr ""
"\n"
"정말 이 패키지들을 제거 하시겠습니까?\n"
-#: any.pm:815
+#: any.pm:821
#, c-format
msgid "Error reading file %s"
msgstr "%s 파일을 읽는중 오류가 발생했습니다."
-#: any.pm:1022
+#: any.pm:1028
#, c-format
msgid "The following disk(s) were renamed:"
msgstr "다음 디스크이름이 변경되었습니다. :"
-#: any.pm:1024
+#: any.pm:1030
#, c-format
msgid "%s (previously named as %s)"
msgstr "%s (이전 이름은 %s였음.)"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "HTTP"
msgstr "HTTP(하이퍼텍스트 전송 규약)"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "FTP"
msgstr "FTP(파일 전송규약)"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "NFS"
msgstr "NFS(망 파일 시스템)"
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
#, c-format
msgid "Network"
msgstr "망"
-#: any.pm:1104
+#: any.pm:1110
#, c-format
msgid "Please choose a media"
msgstr "매체를 선택하시오"
-#: any.pm:1120
+#: any.pm:1126
#, fuzzy, c-format
msgid "File already exists. Overwrite it?"
msgstr "파일이 이미 존재합니다. 덮어쓸까요?"
-#: any.pm:1124
+#: any.pm:1130
#, c-format
msgid "Permission denied"
msgstr "권한이 없습니다."
-#: any.pm:1172
+#: any.pm:1178
#, c-format
msgid "Bad NFS name"
msgstr "부정확한 NFS 이름입니다"
-#: any.pm:1193
+#: any.pm:1199
#, c-format
msgid "Bad media %s"
msgstr "알 수 없는 미디어 %s"
-#: any.pm:1236
+#: any.pm:1242
#, c-format
msgid "Can not make screenshots before partitioning"
msgstr "파티션을 나누기 전에는 스크린샷을 만들 수 없습니다."
-#: any.pm:1244
+#: any.pm:1250
#, c-format
msgid "Screenshots will be available after install in %s"
msgstr "스크린샷은 설치 이후에 %s에 위치 할 것입니다."
@@ -283,11 +258,15 @@ msgid "Installation"
msgstr "설치중"
#: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
#, c-format
msgid "Configuration"
msgstr "설정"
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
#: install2.pm:168
#, c-format
msgid "You must also format %s"
@@ -312,22 +291,22 @@ msgstr "망 활성화 중..."
msgid "Bringing down the network"
msgstr "망 해제 중..."
-#: media.pm:402
+#: media.pm:399
#, c-format
msgid "Please wait, retrieving file"
msgstr ""
-#: media.pm:734
-#, fuzzy, c-format
-msgid "Downloading file %s..."
-msgstr "파일 전송 중 ..."
+#: media.pm:718
+#, c-format
+msgid "unable to add medium"
+msgstr ""
-#: media.pm:822
+#: media.pm:758
#, c-format
msgid "Copying some packages on disks for future use"
msgstr "추후 사용하기 위해 디스크에 패키지 복사중... "
-#: media.pm:875
+#: media.pm:811
#, fuzzy, c-format
msgid "Copying in progress"
msgstr "검색 진행 중"
@@ -369,27 +348,27 @@ msgstr ""
msgid "An error occurred:"
msgstr "오류 발생"
-#: pkgs.pm:776
+#: pkgs.pm:780
#, fuzzy, c-format
msgid "%d installation transactions failed"
msgstr "설치 실패."
-#: pkgs.pm:777
+#: pkgs.pm:781
#, fuzzy, c-format
msgid "Installation of packages failed:"
msgstr "%s 패키지 설치중"
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
#, c-format
msgid "Workstation"
msgstr "워크스테이션"
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
#, c-format
msgid "Office Workstation"
msgstr "오피스 워크스테이션"
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
#, c-format
msgid ""
"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -398,7 +377,7 @@ msgstr ""
"오피스 프로그램들: 워드프로세서 (OpenOffice.org Writer, Kword), 스프레드쉬트 "
"(OpenOffice.org Calc, Kspread), PDF 뷰어, 등등"
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
#, c-format
msgid ""
"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -407,262 +386,244 @@ msgstr ""
"오피스 프로그램들: 워드프로세서 (kword, abiword), 스프레드쉬트 (kspread,"
"gnumeric), pdf 뷰어, 등등"
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
#, c-format
msgid "Game station"
msgstr "게임 스테이션"
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
#, c-format
msgid "Amusement programs: arcade, boards, strategy, etc"
msgstr "간단한 게임모음: 아케이드, 보드, 전략 등등"
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
#, c-format
msgid "Multimedia station"
msgstr "멀티미디어 스테이션"
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
#, c-format
msgid "Sound and video playing/editing programs"
msgstr "사운드 및 비디오 연주/편집 프로그램"
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
#, c-format
msgid "Internet station"
msgstr "인터넷 스테이션"
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
#, c-format
msgid ""
"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
"Web"
msgstr "메일/뉴스를 읽고 보내며 (mutt, tin..) 웹검색을 하기 위한 도구모음"
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
#, c-format
msgid "Network Computer (client)"
msgstr "망 컴퓨터 (클라이언트)"
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
#, c-format
msgid "Clients for different protocols including ssh"
msgstr "SSH를 포함한 여러 프로토콜의 클라이언트"
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
#, c-format
msgid "Tools to ease the configuration of your computer"
msgstr "쉽게 컴퓨터 설정을 하기 위한 도구"
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
#, c-format
msgid "Console Tools"
msgstr "콘솔 도구"
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
#, c-format
msgid "Editors, shells, file tools, terminals"
msgstr "에디터, 쉘, 파일도구, 터미널"
#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
#, c-format
msgid "Development"
msgstr "개발"
#: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
#, c-format
msgid "C and C++ development libraries, programs and include files"
msgstr "C/C++ 개발 라이브러리, 프로그램 및 헤더파일"
#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
#, c-format
msgid "Documentation"
msgstr "문서"
#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
#, c-format
msgid "Books and Howto's on Linux and Free Software"
msgstr "리눅스 및 자유 소프트웨어에 대한 서적과 Howto문서"
#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
#, c-format
msgid "LSB"
msgstr "리눅스 기본 규격(Linux Standard Base)"
#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
#, c-format
msgid "Linux Standard Base. Third party applications support"
msgstr "리눅스 기본 규격. 외부 애플리케이션 지원"
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
#, c-format
msgid "Web Server"
msgstr "웹 서버"
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
#, c-format
msgid "Apache"
msgstr "아파치"
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
#, c-format
msgid "Groupware"
msgstr "그룹웨어"
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
#, c-format
msgid "Kolab Server"
msgstr "Kolab 서버"
#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
#, c-format
msgid "Firewall/Router"
msgstr "방화벽/라우터"
#: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
#, c-format
msgid "Internet gateway"
msgstr "인터넷 게이트웨이"
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
#, fuzzy, c-format
msgid "Mail/News"
msgstr "/파일(F)/새로 만들기(_N)"
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
#, fuzzy, c-format
msgid "Postfix mail server, Inn news server"
msgstr "포스트픽스 메일 서버"
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
#, c-format
msgid "Directory Server"
msgstr "디렉토리 서버"
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
#, c-format
msgid "FTP Server"
msgstr "FTP 서버"
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
#, c-format
msgid "ProFTPd"
msgstr "ProFTPd"
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
#, c-format
msgid "DNS/NIS"
msgstr "도메인 이름 서버/망 정보 서버"
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
#, c-format
msgid "Domain Name and Network Information Server"
msgstr "도메인 이름 및 망 정보 서버"
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
#, fuzzy, c-format
msgid "File and Printer Sharing Server"
msgstr "프린터 서버"
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
#, c-format
msgid "NFS Server, Samba server"
msgstr "NFS 서비스, 삼바 서비스"
#: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
#, c-format
msgid "Database"
msgstr "데이터베이스"
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
#, fuzzy, c-format
msgid "PostgreSQL and MySQL Database Server"
msgstr "PostgreSQL 또는 MySQL 데이터베이스 서버"
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
#, c-format
msgid "Web/FTP"
msgstr "웹/FTP"
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
#, c-format
msgid "Apache, Pro-ftpd"
msgstr "아파치와 프로FTPD"
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
#, c-format
msgid "Mail"
msgstr "메일"
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
#, c-format
msgid "Postfix mail server"
msgstr "포스트픽스 메일 서버"
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
#, c-format
msgid "PostgreSQL or MySQL database server"
msgstr "PostgreSQL 또는 MySQL 데이터베이스 서버"
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
#, c-format
msgid "Network Computer server"
msgstr "망 컴퓨터 서버"
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
#, c-format
msgid "NFS server, SMB server, Proxy server, ssh server"
msgstr "NFS 서버, 삼바 서버, 프록시 서버, SSH 서버"
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
#, c-format
msgid "Graphical Environment"
msgstr "그래픽 환경"
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
#, c-format
msgid "KDE Workstation"
msgstr "K 데스크탑 환경 기반 워크스테이션"
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
#, c-format
msgid ""
"The K Desktop Environment, the basic graphical environment with a collection "
"of accompanying tools"
msgstr "K Desktop 환경, 여러가지 도구를 수반한 기본 그래픽 환경"
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
#, c-format
msgid "GNOME Workstation"
msgstr "GNOME 워크스테이션"
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
#, c-format
msgid ""
"A graphical environment with user-friendly set of applications and desktop "
"tools"
msgstr "사용자 친화적 응용 프로그램들과 데스크탑 도구들을 가진 그래픽 환경"
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
#, fuzzy, c-format
msgid "LXDE Desktop"
msgstr "IceWm 데스크탑"
@@ -674,54 +635,52 @@ msgid ""
"applications and desktop tools"
msgstr "사용자 친화적 응용 프로그램들과 데스크탑 도구들을 가진 그래픽 환경"
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
#, c-format
msgid "Other Graphical Desktops"
msgstr "기타 그래픽 데스크탑"
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
#, fuzzy, c-format
msgid "Window Maker, Enlightenment, Fvwm, etc"
msgstr "Icewm, 윈도우 메이커, 인라이튼먼트, Fvwm, 등등"
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
#, c-format
msgid "Utilities"
msgstr "유틸리티"
#: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
#, c-format
msgid "SSH Server"
msgstr "SSH 서비스"
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
#, fuzzy, c-format
msgid "Webmin"
msgstr "웹민 서비스"
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
#, c-format
msgid "Webmin Remote Configuration Server"
msgstr "Webmin 원격 설정 서버"
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
#, c-format
msgid "Network Utilities/Monitoring"
msgstr "망 유틸리티들/감시"
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
#, c-format
msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
msgstr "감시 도구, 프로세스 관리, tcpdump, nmap, ..."
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
#, fuzzy, c-format
msgid "Mandriva Wizards"
msgstr "맨드리바 제어 센터"
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
#, c-format
msgid "Wizards to configure server"
msgstr "서버 설정 도우미"
@@ -822,17 +781,17 @@ msgstr ""
msgid "Click on images in order to see a bigger preview"
msgstr ""
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
#, c-format
msgid "Package Group Selection"
msgstr "패키지 그룹 선택"
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
#, c-format
msgid "Individual package selection"
msgstr "개별 팩키지 선택"
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
#, c-format
msgid "Total size: %d / %d MB"
msgstr "전체 크기: %d / %d MB"
@@ -949,12 +908,12 @@ msgstr "최소 설치"
msgid "Software Management"
msgstr "소프트웨어 관리"
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
#, c-format
msgid "Choose the packages you want to install"
msgstr "설치할 패키지를 선택하시오."
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
#, c-format
msgid "Installing"
msgstr "설치중"
@@ -981,7 +940,7 @@ msgid_plural "%d packages"
msgstr[0] "%d 패키지"
msgstr[1] "%d 패키지"
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
#, c-format
msgid "Summary"
msgstr "요약설명"
@@ -991,7 +950,7 @@ msgstr "요약설명"
msgid "Configure"
msgstr "설정"
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
#, c-format
msgid "not configured"
msgstr "설정되지 않음"
@@ -1001,7 +960,7 @@ msgstr "설정되지 않음"
msgid "Media Selection"
msgstr "패키지 그룹 선택"
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
#, c-format
msgid ""
"The following installation media have been found.\n"
@@ -1010,7 +969,7 @@ msgstr ""
"다음 설치 매체를 찾았습니다.\n"
"설치 하지 않으려면 설치해제하십시오."
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
#, c-format
msgid ""
"You have the option to copy the contents of the CDs onto the hard drive "
@@ -1022,7 +981,7 @@ msgstr ""
"그러면 하드 드라이브에 설치한 후에도 패키지는 시스템에 남아서 재설치가 가능합"
"니다."
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
#, c-format
msgid "Copy whole CDs"
msgstr "전체 CD 복사"
@@ -1042,59 +1001,49 @@ msgstr "키보드 구성을 선택하시오"
msgid "Here is the full list of available keyboards:"
msgstr "지원되는 키보드 목록입니다."
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
#, c-format
msgid "Install/Upgrade"
msgstr "설치/업그레이드"
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
#, c-format
msgid "Is this an install or an upgrade?"
msgstr "설치합니까 아니면 업그레이드 합니까?"
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
#, c-format
msgid ""
"_: This is a noun:\n"
"Install"
msgstr ""
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
#, c-format
msgid "Upgrade %s"
msgstr "업그레이드 %s"
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
#, fuzzy, c-format
msgid "Encryption key for %s"
msgstr "암호화 키"
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
#, c-format
msgid "Cancel installation, reboot system"
msgstr ""
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
#, fuzzy, c-format
msgid "New Installation"
msgstr "설치중"
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
#, c-format
msgid "Upgrade previous installation (not recommended)"
msgstr ""
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
#, c-format
msgid ""
"Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1106,17 +1055,17 @@ msgid ""
"Installation\"."
msgstr ""
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "IDE"
msgstr "IDE"
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "Configuring IDE"
msgstr "IDE 설정중"
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
#, c-format
msgid ""
"No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1126,7 +1075,7 @@ msgstr ""
"설치는 계속할 수 있지만, 시스템을 부팅하기 위해서는 DiskDrake에서 부트스트랩 "
"파티션을 만들어야 합니다."
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
#, c-format
msgid ""
"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1137,7 +1086,7 @@ msgstr ""
"설치는 계속할 수 있지만, 시스템을 부팅하기 위해서는 DiskDrake에서 부트스트랩 "
"파티션을 만들어야 합니다."
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
#, c-format
msgid ""
"Change your Cd-Rom!\n"
@@ -1150,12 +1099,12 @@ msgstr ""
"「%s」라고 쓰여진 CDROM을 드라이브에 넣은 후, 「확인」을 눌러 주세요.\n"
"만약 CDROM을 가지고 있지 않다면, 「취소」를 눌러 추가 설치를 취소하세요."
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
#, c-format
msgid "Looking for available packages..."
msgstr "유효한 패키지를 찾고 있습니다."
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
#, c-format
msgid ""
"Your system does not have enough space left for installation or upgrade (%"
@@ -1164,7 +1113,7 @@ msgstr ""
"현재 시스템에는 설치 또는 업그레이드 할만한 충분한 공간이 \n"
"남아있지 않습니다.(%dMB > %dMB)"
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
#, c-format
msgid ""
"Please choose load or save package selection.\n"
@@ -1173,52 +1122,52 @@ msgstr ""
"패키지 선택목록을 불러올지 혹은 저장할지를 선택하세요.\n"
"형식(포맷)은 자동설치 생성 파일과 동일합니다."
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Load"
msgstr "불러오기"
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Save"
msgstr "저장"
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
#, c-format
msgid "Bad file"
msgstr "손상된 파일 혹은 없는 파일입니다."
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
#, fuzzy, c-format
msgid "KDE"
msgstr "IDE"
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
#, c-format
msgid "GNOME"
msgstr "그놈"
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
#, fuzzy, c-format
msgid "Desktop Selection"
msgstr "패키지 그룹 선택"
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
#, c-format
msgid "You can choose your workstation desktop profile."
msgstr ""
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
#, c-format
msgid "Selected size is larger than available space"
msgstr "선택된 용량이 사용할 수 있는 공간보다 큽니다."
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
#, c-format
msgid "Type of install"
msgstr "설치 타입"
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
#, c-format
msgid ""
"You have not selected any group of packages.\n"
@@ -1227,82 +1176,82 @@ msgstr ""
"어떤 패키지 그룹도 선택되지 않았습니다.\n"
"패키지 최소설치 이상을 선택하십시오."
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
#, c-format
msgid "With X"
msgstr "X 포함"
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
#, c-format
msgid "With basic documentation (recommended!)"
msgstr "기본 문서 포함(추천!)"
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
#, c-format
msgid "Truly minimal install (especially no urpmi)"
msgstr "최소 설치(특히 urpmi사용안함)"
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
#, c-format
msgid "Preparing installation"
msgstr "설치 준비중입니다"
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
#, c-format
msgid "Installing package %s"
msgstr "%s 패키지 설치중"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "There was an error ordering packages:"
msgstr "패키지를 정렬하는 중 오류발생:"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "Go on anyway?"
msgstr "계속 진행합니까?"
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
#, c-format
msgid "Retry"
msgstr "재시도"
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
#, c-format
msgid "Skip this package"
msgstr "이 패키지는 설치하지 않고 지나가기"
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
#, c-format
msgid "Skip all packages from medium \"%s\""
msgstr "\"%s\"에서 모든 패키지를 설치하지 않음"
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
#, c-format
msgid "Go back to media and packages selection"
msgstr "미디어나 패키지 선택목록으로 돌아가기"
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
#, c-format
msgid "There was an error installing package %s."
msgstr "다음 패키지 설치중 오류 발생: %s."
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
#, c-format
msgid "Post-install configuration"
msgstr "설치 후 환경설정"
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
#, c-format
msgid "Please ensure the Update Modules media is in drive %s"
msgstr "업데이트 모듈 매체가 %s 드라이브에 있도록 하십시오."
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
#, c-format
msgid "Updates"
msgstr "업데이트"
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
#, c-format
msgid ""
"You now have the opportunity to download updated packages. These packages\n"
@@ -1320,28 +1269,28 @@ msgstr ""
"이 패키지들을 다운로드 받으려면 인터넷이 연결되어 있어야 합니다.\n"
"업데이트를 설치 하시겠습니까?"
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
#, c-format
msgid "%s on %s"
msgstr "%s (%s 컴퓨터)"
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
#, c-format
msgid "Hardware"
msgstr "하드웨어"
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
#, c-format
msgid "Sound card"
msgstr "사운드 카드"
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
#, c-format
msgid "Do you have an ISA sound card?"
msgstr "ISA 사운드 카드가 있습니까?"
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
#, c-format
msgid ""
"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1350,69 +1299,69 @@ msgstr ""
"사운드 카드를 설정하려면 설치 후에\n"
"「alsaconf」 또는 「sndconfig」명령을 실행해주십시요."
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
#, c-format
msgid "No sound card detected. Try \"harddrake\" after installation"
msgstr ""
"사운드 카드가 발견되지 않았습니다.\n"
"설치 후에「harddrake」명령을 실행해주십시요."
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
#, c-format
msgid "Graphical interface"
msgstr "시작시 바로 X-Window 실행"
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
#, c-format
msgid "Network & Internet"
msgstr "망과 인터넷"
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
#, c-format
msgid "Proxies"
msgstr "프록시"
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
#, c-format
msgid "configured"
msgstr "재설정되었습니다."
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
#, c-format
msgid "Security Level"
msgstr "보안 등급"
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
#, c-format
msgid "Firewall"
msgstr "방화벽"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "activated"
msgstr "활성화"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "disabled"
msgstr "금지"
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
#, c-format
msgid "You have not configured X. Are you sure you really want this?"
msgstr "X 설정이 되지 않았습니다. 설정하시겠습니까?"
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
#, c-format
msgid "Preparing bootloader..."
msgstr "부트 로더 준비중"
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
#, c-format
msgid "Be patient, this may take a while..."
msgstr ""
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
#, c-format
msgid ""
"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1426,7 +1375,7 @@ msgstr ""
"BootX나 또는 몇몇 방법을 써야 될수도 있습니다. \n"
"root fs를 위한 kernel argument : root=%s"
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
#, c-format
msgid ""
"In this security level, access to the files in the Windows partition is "
@@ -1435,17 +1384,17 @@ msgstr ""
"이 보안 등급에서는 윈도우즈 파티션에서의 파일 접근이 관리자에 의해 제한 됩니"
"다."
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr "%s 드라이브에 빈 플로피 디스크를 넣으세요"
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
#, c-format
msgid "Creating auto install floppy..."
msgstr "자동 설치 플로피 디스크 생성 중"
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
#, c-format
msgid ""
"Some steps are not completed.\n"
@@ -1456,7 +1405,7 @@ msgstr ""
"\n"
"정말 지금 종료 하시겠습니까?"
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
#, c-format
msgid "Congratulations"
msgstr "축하합니다."
@@ -1600,6 +1549,10 @@ msgid ""
"Exit"
msgstr "종료"
+#, fuzzy
+#~ msgid "Downloading file %s..."
+#~ msgstr "파일 전송 중 ..."
+
#~ msgid ""
#~ "You have selected the following server(s): %s\n"
#~ "\n"
diff --git a/perl-install/install/share/po/ky.po b/perl-install/install/share/po/ky.po
index ac6863cf1..033a50f77 100644
--- a/perl-install/install/share/po/ky.po
+++ b/perl-install/install/share/po/ky.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: DrakX-ky\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
"PO-Revision-Date: 2009-03-06 22:10+0600\n"
"Last-Translator: Ilyas Bakirov <just_ilyas@yahoo.com>\n"
"Language-Team: Kyrgyz\n"
@@ -18,31 +18,6 @@ msgstr ""
"X-Generator: KBabel 1.3\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr "Сиздин иш столуңуз USBде"
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr "100%% ачык кодду Mandriva Linux дистрибутиви"
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr "Linux'ту Mandriva One менен аралап үйрөнүү"
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr "Толук Mandriva Linux иш столу жардам менен"
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr "Mandriva: ар бирдин керектеген дистрибутив"
-
#: any.pm:109
#, c-format
msgid "Do you have further supplementary media?"
@@ -82,113 +57,128 @@ msgstr "Желе (FTP)"
msgid "Network (NFS)"
msgstr "Тармак (NFS)"
-#: any.pm:163
+#: any.pm:165
#, c-format
msgid "URL of the mirror?"
msgstr "Күзгүсүнүн URL'и?"
-#: any.pm:169
+#: any.pm:171
#, c-format
msgid "URL must start with ftp:// or http://"
msgstr "URL ftp:// же http:// менен башталышы керек"
-#: any.pm:180
+#: any.pm:182
#, c-format
-msgid "Contacting Mandriva Linux web site to get the list of available mirrors..."
+msgid ""
+"Contacting Mandriva Linux web site to get the list of available mirrors..."
msgstr "Бар болгон күзгүлөр тизмесин Mandriva Linux веб сайтындан алынууда..."
-#: any.pm:185
+#: any.pm:187
#, c-format
-msgid "Failed contacting Mandriva Linux web site to get the list of available mirrors"
-msgstr "Бар болгон күзгүлөр тизмесин Mandriva Linux веб сайтындан алынууда ийгиликсиз айяктады..."
+msgid ""
+"Failed contacting Mandriva Linux web site to get the list of available "
+"mirrors"
+msgstr ""
+"Бар болгон күзгүлөр тизмесин Mandriva Linux веб сайтындан алынууда "
+"ийгиликсиз айяктады..."
-#: any.pm:195
+#: any.pm:197
#, c-format
msgid "Choose a mirror from which to get the packages"
msgstr "Пакеттерди алуучу күзгүнү тандаңыз"
-#: any.pm:225
+#: any.pm:227
#, c-format
msgid "NFS setup"
msgstr "NFS орнотуу"
-#: any.pm:226
+#: any.pm:228
#, c-format
msgid "Please enter the hostname and directory of your NFS media"
msgstr "NFS топтомунун компьютер атын жана директориясын кириңиз"
-#: any.pm:230
+#: any.pm:232
#, c-format
msgid "Hostname missing"
msgstr "Түйюндүн аты көрсөтүлгөн жок"
-#: any.pm:231
+#: any.pm:233
#, c-format
msgid "Directory must begin with \"/\""
msgstr "Директория \"/\" белги менен башталышы керек"
-#: any.pm:235
+#: any.pm:237
#, c-format
msgid "Hostname of the NFS mount ?"
msgstr "NFS туташуунун түйюн аты ?"
-#: any.pm:236
+#: any.pm:238
#, c-format
msgid "Directory"
msgstr "Каталог"
-#: any.pm:258
+#: any.pm:260
#, c-format
msgid "Supplementary"
msgstr "Кошумча"
-#: any.pm:293
+#: any.pm:295
#, c-format
-msgid "Can't find a package list file on this mirror. Make sure the location is correct."
-msgstr "Бул күзгүдө пакеттердин тизмеси атбылган жок. Жайгашуусунун тууралыгын текшериңиз."
+msgid ""
+"Can't find a package list file on this mirror. Make sure the location is "
+"correct."
+msgstr ""
+"Бул күзгүдө пакеттердин тизмеси атбылган жок. Жайгашуусунун тууралыгын "
+"текшериңиз."
-#: any.pm:328
+#: any.pm:334
#, c-format
msgid "Looking at packages already installed..."
msgstr "Орнотулган пакеттер изделип жатат..."
-#: any.pm:362
+#: any.pm:368
#, c-format
msgid "Finding packages to upgrade..."
msgstr "Жаңыланычуу пакеттер изделип жатат..."
-#: any.pm:381
+#: any.pm:387
#, c-format
msgid "Removing packages prior to upgrade..."
msgstr "Жаңылоодон мурда пакеттер өчүрүлүп жатат..."
-#: any.pm:402
+#: any.pm:408
#, c-format
msgid ""
"You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
-"on your system. This installer cannot preserve KDE 3.5 in an upgrade. If you choose to proceed, \n"
-"KDE 4 will replace KDE 3, and you will lose your personal KDE configuration settings. \n"
+"on your system. This installer cannot preserve KDE 3.5 in an upgrade. If you "
+"choose to proceed, \n"
+"KDE 4 will replace KDE 3, and you will lose your personal KDE configuration "
+"settings. \n"
"To upgrade with KDE 3.5 and your personal settings preserved, \n"
"please reboot your system and upgrade using the Mandriva update applet."
msgstr ""
"%s чейин системанын жаңылоосун чечтиңиз. KDE 3.5 системаңызда табылды.\n"
-"Буд орноткуч жаңылоодо KDE 3.5'ти сакатабайт. Эгерде орнотууну уланта берсеңиз, \n"
-"KDE 4 KDE 3'тү алмаштырып салат жана жеке ырастоолоруңуз менен KDE ырастоолору \n"
-"жоголуп кетет. KDE 3.5'тен жаңылоо жана жеке ырастоолорду сактап калуу үчүн, \n"
-"системаны кайрадан жүктөп жана Mandriva жаңылоо аплети менен жаңыланым көрүңүз."
+"Буд орноткуч жаңылоодо KDE 3.5'ти сакатабайт. Эгерде орнотууну уланта "
+"берсеңиз, \n"
+"KDE 4 KDE 3'тү алмаштырып салат жана жеке ырастоолоруңуз менен KDE "
+"ырастоолору \n"
+"жоголуп кетет. KDE 3.5'тен жаңылоо жана жеке ырастоолорду сактап калуу "
+"үчүн, \n"
+"системаны кайрадан жүктөп жана Mandriva жаңылоо аплети менен жаңыланым "
+"көрүңүз."
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
#, c-format
msgid "Reboot"
msgstr "Кайра жүктөө"
-#: any.pm:407
+#: any.pm:413
#, c-format
msgid "Proceed"
msgstr "Аткарылды"
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -202,72 +192,72 @@ msgstr ""
"\n"
"Бул пакеттердин алынып ташталуусун каалайсызбы?\n"
-#: any.pm:815
+#: any.pm:821
#, c-format
msgid "Error reading file %s"
msgstr "%s файлын окуудагы ката"
-#: any.pm:1022
+#: any.pm:1028
#, c-format
msgid "The following disk(s) were renamed:"
msgstr "Төмөнкү диск(тер)дин аты өзгөртүлдү:"
-#: any.pm:1024
+#: any.pm:1030
#, c-format
msgid "%s (previously named as %s)"
msgstr "%s (мурунку аты %s)"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "HTTP"
msgstr "HTTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "FTP"
msgstr "FTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "NFS"
msgstr "NFS"
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
#, c-format
msgid "Network"
msgstr "Желе"
-#: any.pm:1104
+#: any.pm:1110
#, c-format
msgid "Please choose a media"
msgstr "Алып жүрүүчүнү тандаңыз"
-#: any.pm:1120
+#: any.pm:1126
#, c-format
msgid "File already exists. Overwrite it?"
msgstr "Файл алдагачан бар. Үстүнө кайра жазылсынбы?"
-#: any.pm:1124
+#: any.pm:1130
#, c-format
msgid "Permission denied"
msgstr "Кирүү укугу четке кагылды"
-#: any.pm:1172
+#: any.pm:1178
#, c-format
msgid "Bad NFS name"
msgstr "Жаман NFS аты"
-#: any.pm:1193
+#: any.pm:1199
#, c-format
msgid "Bad media %s"
msgstr "%s жараксыз алып жүрүүчү"
-#: any.pm:1236
+#: any.pm:1242
#, c-format
msgid "Can not make screenshots before partitioning"
msgstr "Бөлүмдөрдү жаратууга чейин скриншотторду түзүүгө болбойт"
-#: any.pm:1244
+#: any.pm:1250
#, c-format
msgid "Screenshots will be available after install in %s"
msgstr "Орнотуудан кийин скриншоттор %s ичинде болот"
@@ -277,13 +267,16 @@ msgstr "Орнотуудан кийин скриншоттор %s ичинде
msgid "Installation"
msgstr "Орнотуу"
-#: gtk.pm:134
-#: share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
+#: gtk.pm:134 share/meta-task/compssUsers.pl:44
#, c-format
msgid "Configuration"
msgstr "Конфигурациялоо"
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
#: install2.pm:168
#, c-format
msgid "You must also format %s"
@@ -295,7 +288,8 @@ msgid ""
"Some hardware on your computer needs ``proprietary'' drivers to work.\n"
"You can find some information about them at: %s"
msgstr ""
-"Компьютериңизде кээбир жабдыктар иштөө үчүн эркин эмес драйверлерди талап кылат.\n"
+"Компьютериңизде кээбир жабдыктар иштөө үчүн эркин эмес драйверлерди талап "
+"кылат.\n"
"Алар жөнүндө маалыматты көрсөтүлгөн жерден табып аласыз: %s"
#: interactive.pm:22
@@ -308,22 +302,22 @@ msgstr "Тармак көтөрүлүүдө"
msgid "Bringing down the network"
msgstr "Тармак өчүрүлүүдө"
-#: media.pm:402
+#: media.pm:399
#, c-format
msgid "Please wait, retrieving file"
msgstr "Күтө туруңуз, файл жүктөлүп жатат"
-#: media.pm:734
+#: media.pm:718
#, c-format
-msgid "Downloading file %s..."
-msgstr "%s файлы жүктөөлүп жатат..."
+msgid "unable to add medium"
+msgstr ""
-#: media.pm:822
+#: media.pm:758
#, c-format
msgid "Copying some packages on disks for future use"
msgstr "Кээбир пакеттерди келечекте колдонуу үчүн дискке көчүрүп жатат"
-#: media.pm:875
+#: media.pm:811
#, c-format
msgid "Copying in progress"
msgstr "Көчүрүү жүрүүдө"
@@ -367,289 +361,294 @@ msgstr ""
msgid "An error occurred:"
msgstr "Жаңылыштык орун алды"
-#: pkgs.pm:776
+#: pkgs.pm:780
#, c-format
msgid "%d installation transactions failed"
msgstr "%d орнотуу транзакциялары ишке ашпады"
-#: pkgs.pm:777
+#: pkgs.pm:781
#, fuzzy, c-format
msgid "Installation of packages failed:"
msgstr "%s пакети орнотуулууда"
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
#, c-format
msgid "Workstation"
msgstr "Иш станциясы"
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
#, c-format
msgid "Office Workstation"
msgstr "Офис станциясы"
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
#, c-format
-msgid "Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets (OpenOffice.org Calc, Kspread), PDF viewers, etc"
-msgstr "Офис программалары: текст процессорлору (OpenOffice.org Writer, Kword), электрондук таблицалар (OpenOffice.org Calc, Kspread), pdf файлдарын көрүү программалары, ж.б."
+msgid ""
+"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
+"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
+msgstr ""
+"Офис программалары: текст процессорлору (OpenOffice.org Writer, Kword), "
+"электрондук таблицалар (OpenOffice.org Calc, Kspread), pdf файлдарын көрүү "
+"программалары, ж.б."
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
#, c-format
-msgid "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, gnumeric), pdf viewers, etc"
-msgstr "Офис программалары: текст процессорлору (kword, abiword), электрондук таблицалар (kspread, gnumeric), pdf файлдарын көрүү программалары, ж.б."
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+"Офис программалары: текст процессорлору (kword, abiword), электрондук "
+"таблицалар (kspread, gnumeric), pdf файлдарын көрүү программалары, ж.б."
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
#, c-format
msgid "Game station"
msgstr "Оюн станциясы"
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
#, c-format
msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "Оюн-зоок программалары: аркада оюндары, тактай оюндары, стратегия оюндары, ж.б."
+msgstr ""
+"Оюн-зоок программалары: аркада оюндары, тактай оюндары, стратегия оюндары, ж."
+"б."
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
#, c-format
msgid "Multimedia station"
msgstr "Мультимедиа станциясы"
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
#, c-format
msgid "Sound and video playing/editing programs"
msgstr "Үн жана видео ойнотуу/терүү программалары"
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
#, c-format
msgid "Internet station"
msgstr "Интернет станциясы"
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
#, c-format
-msgid "Set of tools to read and send mail and news (mutt, tin..) and to browse the Web"
-msgstr "Почтаны жана жаңылыктарды (mutt, tin..) окууга жана жөнөтүүгө, жана вебде иштөөгө арналган куралдар тобу"
+msgid ""
+"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
+"Web"
+msgstr ""
+"Почтаны жана жаңылыктарды (mutt, tin..) окууга жана жөнөтүүгө, жана вебде "
+"иштөөгө арналган куралдар тобу"
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
#, c-format
msgid "Network Computer (client)"
msgstr "Тармак компьютери (клиент)"
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
#, c-format
msgid "Clients for different protocols including ssh"
msgstr "Ар түрдүү протоколдор клиенттери, ssh да кошулган"
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
#, c-format
msgid "Tools to ease the configuration of your computer"
msgstr "Компьютериңизди жеңил конфигурациялоо куралдары"
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
#, c-format
msgid "Console Tools"
msgstr "Консоль куралдары"
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
#, c-format
msgid "Editors, shells, file tools, terminals"
msgstr "Редакторлор, шелдер, файл куралдары, терминалдар"
#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
#, c-format
msgid "Development"
msgstr "Иштеп түзүү"
#: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
#, c-format
msgid "C and C++ development libraries, programs and include files"
-msgstr "C жана C++ иштеп чыгуу библиотекалары, программалар жана include файлдары"
+msgstr ""
+"C жана C++ иштеп чыгуу библиотекалары, программалар жана include файлдары"
#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
#, c-format
msgid "Documentation"
msgstr "Документация"
#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
#, c-format
msgid "Books and Howto's on Linux and Free Software"
msgstr "Linux жана Free Software жөнүндөгү китептер жана HOWTOлар"
#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
#, c-format
msgid "LSB"
msgstr "LSB"
#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
#, c-format
msgid "Linux Standard Base. Third party applications support"
-msgstr "Linux стандарттык базасы. Үчүнчү тараптык иштеп чыгуучулардын тиркемелерин колдоо"
+msgstr ""
+"Linux стандарттык базасы. Үчүнчү тараптык иштеп чыгуучулардын тиркемелерин "
+"колдоо"
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
#, c-format
msgid "Web Server"
msgstr "Веб-сервери"
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
#, c-format
msgid "Apache"
msgstr "Apache"
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
#, c-format
msgid "Groupware"
msgstr "Groupware"
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
#, c-format
msgid "Kolab Server"
msgstr "Kolab сервери"
-#: share/meta-task/compssUsers.pl:81
-#: share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
+#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
#, c-format
msgid "Firewall/Router"
msgstr "Файрволл/Маршруттагыч"
-#: share/meta-task/compssUsers.pl:82
-#: share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
+#: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
#, c-format
msgid "Internet gateway"
msgstr "Интернет дарбазасы"
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
#, c-format
msgid "Mail/News"
msgstr "Почта/Жаңылыктар"
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
#, c-format
msgid "Postfix mail server, Inn news server"
msgstr "Postfix почта сервери, Inn жаңылыктар сервери"
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
#, c-format
msgid "Directory Server"
msgstr "Каталогдор сервери"
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
#, c-format
msgid "FTP Server"
msgstr "FTP сервери"
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
#, c-format
msgid "ProFTPd"
msgstr "ProFTPd"
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
#, c-format
msgid "DNS/NIS"
msgstr "DNS/NIS"
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
#, c-format
msgid "Domain Name and Network Information Server"
msgstr "DNS жана NIS"
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
#, c-format
msgid "File and Printer Sharing Server"
msgstr "Файл жана принтер бөлүшүү сервери"
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
#, c-format
msgid "NFS Server, Samba server"
msgstr "NFS сервери, Samba сервери"
-#: share/meta-task/compssUsers.pl:105
-#: share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
+#: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
#, c-format
msgid "Database"
msgstr "Берилиштер базасы"
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
#, c-format
msgid "PostgreSQL and MySQL Database Server"
msgstr "PostgreSQL жана MySQL берилиштер базасынын сервери"
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
#, c-format
msgid "Web/FTP"
msgstr "Web/FTP"
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
#, c-format
msgid "Apache, Pro-ftpd"
msgstr "Apache, Pro-ftpd"
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
#, c-format
msgid "Mail"
msgstr "Почта"
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
#, c-format
msgid "Postfix mail server"
msgstr "Postfix почта сервери"
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
#, c-format
msgid "PostgreSQL or MySQL database server"
msgstr "PostgreSQL же MySQL берилиштер базасынын сервери"
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
#, c-format
msgid "Network Computer server"
msgstr "Тармак сервери"
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
#, c-format
msgid "NFS server, SMB server, Proxy server, ssh server"
msgstr "NFS сервери, SMB сервери, Proxy сервери, ssh сервери"
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
#, c-format
msgid "Graphical Environment"
msgstr "Графикалык чөйрө"
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
#, c-format
msgid "KDE Workstation"
msgstr "KDE иш станциясы"
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
#, c-format
-msgid "The K Desktop Environment, the basic graphical environment with a collection of accompanying tools"
-msgstr "K Desktop Environment - негизги графикалык чөйрө, кошумча куралдар коллекциясы менен"
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr ""
+"K Desktop Environment - негизги графикалык чөйрө, кошумча куралдар "
+"коллекциясы менен"
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
#, c-format
msgid "GNOME Workstation"
msgstr "GNOME иш станциясы"
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
#, c-format
-msgid "A graphical environment with user-friendly set of applications and desktop tools"
-msgstr "Колдонуучуга ыңгайлашкан тиркемелерин жана иш столунун кураларын камтыган графикалык чөйрө"
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr ""
+"Колдонуучуга ыңгайлашкан тиркемелерин жана иш столунун кураларын камтыган "
+"графикалык чөйрө"
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
#, c-format
msgid "LXDE Desktop"
msgstr "LXDE иш столу"
@@ -663,54 +662,52 @@ msgstr ""
"Колдонуучуга ыңгайлашкан тиркемелерин жана иш столунун кураларын камтыган "
"графикалык чөйрө"
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
#, c-format
msgid "Other Graphical Desktops"
msgstr "Башка графикалык иш столдору"
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
#, c-format
msgid "Window Maker, Enlightenment, Fvwm, etc"
msgstr "Window Maker, Enlightenment, Fvwm, ж.б. "
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
#, c-format
msgid "Utilities"
msgstr "Утилиталар"
#: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
#, c-format
msgid "SSH Server"
msgstr "SSH сервери"
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
#, c-format
msgid "Webmin"
msgstr "Webmin"
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
#, c-format
msgid "Webmin Remote Configuration Server"
msgstr "Webmin узактан башкаруу сервери"
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
#, c-format
msgid "Network Utilities/Monitoring"
msgstr "Тармак аспаптары/Мониторинг"
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
#, c-format
msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
msgstr "Мониторинг аспаптар, процесс эсептүүчүлөр, tcpdump, nmap, ..."
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
#, c-format
msgid "Mandriva Wizards"
msgstr "Mandriva Усталары"
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
#, c-format
msgid "Wizards to configure server"
msgstr "Серверди ырастоо усталары"
@@ -729,14 +726,15 @@ msgstr ""
msgid ""
"Some important packages did not get installed properly.\n"
"Either your cdrom drive or your cdrom is defective.\n"
-"Check the cdrom on an installed computer using \"rpm -qpl media/main/*.rpm\"\n"
+"Check the cdrom on an installed computer using \"rpm -qpl media/main/*.rpm"
+"\"\n"
msgstr ""
"Кээбир негизги пакеттер туура эмес орнотулду.\n"
"CDROM түзүлүшү же диск бузук болушу мүмкүн.\n"
-"Киргизилген дискти \"rpm -qpl media/main/*.rpm\" коммандасы менен текшериңиз\n"
+"Киргизилген дискти \"rpm -qpl media/main/*.rpm\" коммандасы менен "
+"текшериңиз\n"
-#: steps_auto_install.pm:71
-#: steps_stdio.pm:27
+#: steps_auto_install.pm:71 steps_stdio.pm:27
#, c-format
msgid "Entering step `%s'\n"
msgstr "`%s' кадамына өтүү аракети\n"
@@ -760,7 +758,8 @@ msgstr "Xorg жай башталып жатат. Күтө туруңуз..."
#, c-format
msgid ""
"Your system is low on resources. You may have some problem installing\n"
-"Mandriva Linux. If that occurs, you can try a text install instead. For this,\n"
+"Mandriva Linux. If that occurs, you can try a text install instead. For "
+"this,\n"
"press `F1' when booting on CDROM, then enter `text'."
msgstr ""
"Системага жетеринче ресурс жетпей жатат. Mandriva Linux системасын\n"
@@ -808,17 +807,17 @@ msgstr "Мына '%s' иш столдун алдын ала көрүнүшү."
msgid "Click on images in order to see a bigger preview"
msgstr "Чоң көрүнүштү көрүү үчүн сүрөткө басыңыз"
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
#, c-format
msgid "Package Group Selection"
msgstr "Пакеттердин группасын тандоо"
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
#, c-format
msgid "Individual package selection"
msgstr "Пакеттерди өз алдынча тандоо"
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
#, c-format
msgid "Total size: %d / %d MB"
msgstr "Жалпы көлөмү: %d / %d Мб"
@@ -875,8 +874,12 @@ msgstr "%s сактоо үчүн"
#: steps_gtk.pm:452
#, c-format
-msgid "You can not select this package as there is not enough space left to install it"
-msgstr "Сиз бул пакетти тандап алалбайсыз, анткени аны орнотуу үчүн жетеринче бош боштук жок"
+msgid ""
+"You can not select this package as there is not enough space left to install "
+"it"
+msgstr ""
+"Сиз бул пакетти тандап алалбайсыз, анткени аны орнотуу үчүн жетеринче бош "
+"боштук жок"
#: steps_gtk.pm:455
#, c-format
@@ -933,12 +936,12 @@ msgstr "Минималдык орнотуу"
msgid "Software Management"
msgstr "Пакеттерди башкаруу"
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
#, c-format
msgid "Choose the packages you want to install"
msgstr "Сиз орнотууну каалаган пакеттерди тандаңыз"
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
#, c-format
msgid "Installing"
msgstr "Орнотуу"
@@ -964,7 +967,7 @@ msgid "%d package"
msgid_plural "%d packages"
msgstr[0] "%d- пакет"
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
#, c-format
msgid "Summary"
msgstr "Жыйынтык"
@@ -974,7 +977,7 @@ msgstr "Жыйынтык"
msgid "Configure"
msgstr "Конфигурация"
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
#, c-format
msgid "not configured"
msgstr "конфигурацияланбаган"
@@ -984,7 +987,7 @@ msgstr "конфигурацияланбаган"
msgid "Media Selection"
msgstr "Пакеттердин группасын тандоо"
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
#, c-format
msgid ""
"The following installation media have been found.\n"
@@ -993,16 +996,20 @@ msgstr ""
"Төмөнкү орнотуу булактары табылды.\n"
"Эгерде кээбирин аттап өтүүнү кааласаңыз, анда аларды тандабай өтүңүз."
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
#, c-format
msgid ""
-"You have the option to copy the contents of the CDs onto the hard drive before installation.\n"
-"It will then continue from the hard drive and the packages will remain available once the system is fully installed."
+"You have the option to copy the contents of the CDs onto the hard drive "
+"before installation.\n"
+"It will then continue from the hard drive and the packages will remain "
+"available once the system is fully installed."
msgstr ""
-"Компакт-диск мазмунун орнотуудан мурун компьютер дискине көчүрүп алуу мүмкүн.\n"
-"Андан кийин орнотуу компьютер дискинен улантылат жана пакеттер толук системанын орнотулуп бүткөндөн кийин калышат."
+"Компакт-диск мазмунун орнотуудан мурун компьютер дискине көчүрүп алуу "
+"мүмкүн.\n"
+"Андан кийин орнотуу компьютер дискинен улантылат жана пакеттер толук "
+"системанын орнотулуп бүткөндөн кийин калышат."
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
#, c-format
msgid "Copy whole CDs"
msgstr "CD дискти толугу менен көчүрүү"
@@ -1022,59 +1029,49 @@ msgstr "Өзүңүздүн алиптакта картасын тандаңыз"
msgid "Here is the full list of available keyboards:"
msgstr "Мүмкүн болгон бардык клавиөлкөлөр тизмеси"
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
#, c-format
msgid "Install/Upgrade"
msgstr "Орнотуу/Жаңылоо"
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
#, c-format
msgid "Is this an install or an upgrade?"
msgstr "Бул орнотуубу же жаңылообу?"
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
#, c-format
msgid ""
"_: This is a noun:\n"
"Install"
msgstr "Орнотуу"
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
#, c-format
msgid "Upgrade %s"
msgstr "%s жаңылоо"
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr "32bit тен 64bit ке жаңылоо мүмкүе эмес"
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr "64bit тен 32bit ке жаңылоо мүмкүн эмес"
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
#, c-format
msgid "Encryption key for %s"
msgstr "%s үчүн шифрлөө ачкычы"
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
#, c-format
msgid "Cancel installation, reboot system"
msgstr "Орнотууну айну, система өчүп жандыруу"
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
#, c-format
msgid "New Installation"
msgstr "Жаңы орнотуу"
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
#, c-format
msgid "Upgrade previous installation (not recommended)"
msgstr "Мурунку орнотууну жаңылоо (сунуш кылынбайт)"
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
#, c-format
msgid ""
"Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1093,48 +1090,64 @@ msgstr ""
"Эскертүү : \"Жаңы орнотулуш\" тандоодон мурун, бардык жеке\n"
"маалыматтарды архивдөө менен көчүрүп алышыңыз керек."
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "IDE"
msgstr "IDE"
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "Configuring IDE"
msgstr "IDE конфигурацияланууда"
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
#, c-format
-msgid "No free space for 1MB bootstrap! Install will continue, but to boot your system, you'll need to create the bootstrap partition in DiskDrake"
-msgstr "Өз жүктөлүү программасы үчүн жетеринче бош боштук калган жок! Орнотуу улантылат, бирок системанын жүктөлүшү үчүн DiskDrake менен баштапкы жүктөлүү бөлүгүн түзүү керек"
+msgid ""
+"No free space for 1MB bootstrap! Install will continue, but to boot your "
+"system, you'll need to create the bootstrap partition in DiskDrake"
+msgstr ""
+"Өз жүктөлүү программасы үчүн жетеринче бош боштук калган жок! Орнотуу "
+"улантылат, бирок системанын жүктөлүшү үчүн DiskDrake менен баштапкы жүктөлүү "
+"бөлүгүн түзүү керек"
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
#, c-format
-msgid "You'll need to create a PPC PReP Boot bootstrap! Install will continue, but to boot your system, you'll need to create the bootstrap partition in DiskDrake"
-msgstr "PPC PReP жүктөлүү бөлүгүн түзүү керек! Орнотуу улантылат, бирок системанын жүктөлүшү үчүн DiskDrake менен баштапкы жүктөлүү бөлүгүн түзүү керек"
+msgid ""
+"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
+"to boot your system, you'll need to create the bootstrap partition in "
+"DiskDrake"
+msgstr ""
+"PPC PReP жүктөлүү бөлүгүн түзүү керек! Орнотуу улантылат, бирок системанын "
+"жүктөлүшү үчүн DiskDrake менен баштапкы жүктөлүү бөлүгүн түзүү керек"
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
#, c-format
msgid ""
"Change your Cd-Rom!\n"
-"Please insert the Cd-Rom labelled \"%s\" in your drive and press Ok when done.\n"
+"Please insert the Cd-Rom labelled \"%s\" in your drive and press Ok when "
+"done.\n"
"If you do not have it, press Cancel to avoid installation from this Cd-Rom."
msgstr ""
"Компакт-дискти алмаштырыңыз!\n"
"\"%s\" атту компакт-дискти киргизиңиз, андан кийин \"Ok\" баскычын басыңыз.\n"
-"Эгерде сизде жок болсо, анда ушул компакт-дисктен орнотууну айнуу үчүн \"Айнуу\" баскычын басыңыз."
+"Эгерде сизде жок болсо, анда ушул компакт-дисктен орнотууну айнуу үчүн "
+"\"Айнуу\" баскычын басыңыз."
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
#, c-format
msgid "Looking for available packages..."
msgstr "Мүмкүн болгон пакеттер изделүүдө..."
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
#, c-format
-msgid "Your system does not have enough space left for installation or upgrade (%dMB > %dMB)"
-msgstr "Системаңыз орнотууга же жаңылоого жетеринче бош боштукка ээ эмес (%d МБ > %d МБ)"
+msgid ""
+"Your system does not have enough space left for installation or upgrade (%"
+"dMB > %dMB)"
+msgstr ""
+"Системаңыз орнотууга же жаңылоого жетеринче бош боштукка ээ эмес (%d МБ > %d "
+"МБ)"
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
#, c-format
msgid ""
"Please choose load or save package selection.\n"
@@ -1143,52 +1156,52 @@ msgstr ""
"Жүктөө же пакеттер тандоосун сактоону тандаңыз.\n"
"Файлдар форматы автоматтык орнотууда түзүлгөн файлдар менен окшош."
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Load"
msgstr "Жүктөө"
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Save"
msgstr "Сактоо"
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
#, c-format
msgid "Bad file"
msgstr "Туура эмес файл"
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
#, c-format
msgid "KDE"
msgstr "KDE"
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
#, c-format
msgid "GNOME"
msgstr "GNOME"
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
#, c-format
msgid "Desktop Selection"
msgstr "Иш столун тандоо"
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
#, c-format
msgid "You can choose your workstation desktop profile."
msgstr "Иштоо станцияңыздын иш столдун профилин тандап аласыз."
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
#, c-format
msgid "Selected size is larger than available space"
msgstr "Тандалган өлчөм бар болгон боштуктан чоң"
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
#, c-format
msgid "Type of install"
msgstr "Орнотуу тиби"
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
#, c-format
msgid ""
"You have not selected any group of packages.\n"
@@ -1197,82 +1210,82 @@ msgstr ""
"Эч кандай пакеттер группасы тандалган жок.\n"
"Минималдык орнотуу тибин тандаңыз:"
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
#, c-format
msgid "With X"
msgstr "X менен"
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
#, c-format
msgid "With basic documentation (recommended!)"
msgstr "Башкы документация менен (сунушталат!)"
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
#, c-format
msgid "Truly minimal install (especially no urpmi)"
msgstr "Чыныгы минималдуу орнотуулуш (атайын urpmi'сиз)"
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
#, c-format
msgid "Preparing installation"
msgstr "Орнотуу даярдалууда"
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
#, c-format
msgid "Installing package %s"
msgstr "%s пакети орнотуулууда"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "There was an error ordering packages:"
msgstr "Пакеттерди кабыл алууда ката пайда болду:"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "Go on anyway?"
msgstr "Буга карабай улантайынбы?"
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
#, c-format
msgid "Retry"
msgstr "Кайталоо"
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
#, c-format
msgid "Skip this package"
msgstr "Бул пакетти аттап өтүү"
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
#, c-format
msgid "Skip all packages from medium \"%s\""
msgstr "\"%s\" ичинен бардык пакеттерди аттап өтүү"
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
#, c-format
msgid "Go back to media and packages selection"
msgstr "Артка баруу жана орнотууга пакеттерди нандоо"
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
#, c-format
msgid "There was an error installing package %s."
msgstr "%s пакетти орнотууда ката чыкты."
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
#, c-format
msgid "Post-install configuration"
msgstr "Орнотуулуштан кийинки ырастоолор"
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
#, c-format
msgid "Please ensure the Update Modules media is in drive %s"
msgstr "%s ичинде Update Modules топтомунун бар экендигин текшерип көрүңүз"
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
#, c-format
msgid "Updates"
msgstr "Жаңылоолор"
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
#, c-format
msgid ""
"You now have the opportunity to download updated packages. These packages\n"
@@ -1293,113 +1306,131 @@ msgstr ""
"\n"
"Пакеттер орнотулсунбу?"
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
#, c-format
msgid "%s on %s"
msgstr "%s %s'да"
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
#, c-format
msgid "Hardware"
msgstr "Техникалык жабдуу"
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
#, c-format
msgid "Sound card"
msgstr "Добуш картасы"
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
#, c-format
msgid "Do you have an ISA sound card?"
msgstr "Сизде ISA добуш карточкасы барбы?"
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
#, c-format
-msgid "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound card"
-msgstr "Үн картасын ырастоо үчүн орнотуудан кийин \"alsaconf\" же \"sndconfig\" коммандаларын аткарыңыз"
+msgid ""
+"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
+"card"
+msgstr ""
+"Үн картасын ырастоо үчүн орнотуудан кийин \"alsaconf\" же \"sndconfig\" "
+"коммандаларын аткарыңыз"
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
#, c-format
msgid "No sound card detected. Try \"harddrake\" after installation"
-msgstr "Эч кандай добуш карточкасы табылган жок. Орнотуудан кийин \"harddrake\" кайталап көрүңүз"
+msgstr ""
+"Эч кандай добуш карточкасы табылган жок. Орнотуудан кийин \"harddrake\" "
+"кайталап көрүңүз"
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
#, c-format
msgid "Graphical interface"
msgstr "Графикалык интерфейс"
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
#, c-format
msgid "Network & Internet"
msgstr "Тармак жана Интернет"
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
#, c-format
msgid "Proxies"
msgstr "Проксилер"
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
#, c-format
msgid "configured"
msgstr "ырасталды"
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
#, c-format
msgid "Security Level"
msgstr "Коосуздук деңгээли"
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
#, c-format
msgid "Firewall"
msgstr "Файервол"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "activated"
msgstr "активдештирилди"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "disabled"
msgstr "өчүк"
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
#, c-format
msgid "You have not configured X. Are you sure you really want this?"
msgstr "Сиз X'ти ырастаган жоксуз.Чындап ушуну каалайсызбы?"
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
#, c-format
msgid "Preparing bootloader..."
msgstr "Система жүктөөгүч даярдалууда..."
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
#, c-format
msgid "Be patient, this may take a while..."
msgstr "Күтө туруңуз, бул бир нече убакытты алышы мүмкүн..."
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
#, c-format
-msgid "You appear to have an OldWorld or Unknown machine, the yaboot bootloader will not work for you. The install will continue, but you'll need to use BootX or some other means to boot your machine. The kernel argument for the root fs is: root=%s"
-msgstr "Сиз өтө эски тарыхый же белгисиз машинанын ээси окшойсуз жана 'yaboot' баштапкы жүктөгүчү машинаңызга иштебеши мүмкүн. Орнотуу улантылат, бирок системанын жүктөлүшү үчүн 'BootX' же башка жүктөгүч колдонулушу керек. Ядронун тамырдык файл системанын параметри: root=%s"
+msgid ""
+"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
+"will not work for you. The install will continue, but you'll need to use "
+"BootX or some other means to boot your machine. The kernel argument for the "
+"root fs is: root=%s"
+msgstr ""
+"Сиз өтө эски тарыхый же белгисиз машинанын ээси окшойсуз жана 'yaboot' "
+"баштапкы жүктөгүчү машинаңызга иштебеши мүмкүн. Орнотуу улантылат, бирок "
+"системанын жүктөлүшү үчүн 'BootX' же башка жүктөгүч колдонулушу керек. "
+"Ядронун тамырдык файл системанын параметри: root=%s"
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
#, c-format
-msgid "In this security level, access to the files in the Windows partition is restricted to the administrator."
-msgstr "Бул коопсудук деңгээлде Windows бөлүмүндө жайгашкан файларда жетүү жалгыз гана администраторга уруксат берилген."
+msgid ""
+"In this security level, access to the files in the Windows partition is "
+"restricted to the administrator."
+msgstr ""
+"Бул коопсудук деңгээлде Windows бөлүмүндө жайгашкан файларда жетүү жалгыз "
+"гана администраторга уруксат берилген."
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr "%s ичине бош флоппи дискти киргизиңиз"
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
#, c-format
msgid "Creating auto install floppy..."
msgstr "Авто орнотуу флоппини түзүү..."
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
#, c-format
msgid ""
"Some steps are not completed.\n"
@@ -1410,7 +1441,7 @@ msgstr ""
"\n"
"Сиз чындап азыр чыгууну каалайсызбы?"
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
#, c-format
msgid "Congratulations"
msgstr "Конфигурациялар"
@@ -1423,8 +1454,7 @@ msgid ""
"Language"
msgstr "Тил тандоо"
-#: steps_list.pm:16
-#: steps_list.pm:23
+#: steps_list.pm:16 steps_list.pm:23
#, c-format
msgid "Localization"
msgstr "Локализация"
@@ -1443,16 +1473,14 @@ msgid ""
"Mouse"
msgstr "Чычкан"
-#: steps_list.pm:19
-#: steps_list.pm:20
+#: steps_list.pm:19 steps_list.pm:20
#, c-format
msgid ""
"_: Keep these entry short\n"
"Hard drive detection"
msgstr "Таш дискти аныктоо"
-#: steps_list.pm:21
-#: steps_list.pm:22
+#: steps_list.pm:21 steps_list.pm:22
#, c-format
msgid ""
"_: Keep these entry short\n"
@@ -1480,8 +1508,7 @@ msgid ""
"Partitioning"
msgstr "Бөлүмдөргө бөлүү"
-#: steps_list.pm:27
-#: steps_list.pm:28
+#: steps_list.pm:27 steps_list.pm:28
#, c-format
msgid ""
"_: Keep these entry short\n"
@@ -1509,24 +1536,21 @@ msgid ""
"Users"
msgstr "Колдонуучулар"
-#: steps_list.pm:36
-#: steps_list.pm:37
+#: steps_list.pm:36 steps_list.pm:37
#, c-format
msgid ""
"_: Keep these entry short\n"
"Networking"
msgstr "Тармактар"
-#: steps_list.pm:38
-#: steps_list.pm:39
+#: steps_list.pm:38 steps_list.pm:39
#, c-format
msgid ""
"_: Keep these entry short\n"
"Bootloader"
msgstr "Баштапкы жүктөгүч"
-#: steps_list.pm:40
-#: steps_list.pm:41
+#: steps_list.pm:40 steps_list.pm:41
#, c-format
msgid ""
"_: Keep these entry short\n"
@@ -1540,8 +1564,7 @@ msgid ""
"Summary"
msgstr "Жыйынтык"
-#: steps_list.pm:44
-#: steps_list.pm:45
+#: steps_list.pm:44 steps_list.pm:45
#, c-format
msgid ""
"_: Keep these entry short\n"
@@ -1562,6 +1585,30 @@ msgid ""
"Exit"
msgstr "Чыгуу"
+#~ msgid "Your desktop on a USB key"
+#~ msgstr "Сиздин иш столуңуз USBде"
+
+#~ msgid "The 100%% open source Mandriva Linux distribution"
+#~ msgstr "100%% ачык кодду Mandriva Linux дистрибутиви"
+
+#~ msgid "Explore Linux easily with Mandriva One"
+#~ msgstr "Linux'ту Mandriva One менен аралап үйрөнүү"
+
+#~ msgid "A full Mandriva Linux desktop, with support"
+#~ msgstr "Толук Mandriva Linux иш столу жардам менен"
+
+#~ msgid "Mandriva: distributions for everybody's needs"
+#~ msgstr "Mandriva: ар бирдин керектеген дистрибутив"
+
+#~ msgid "Downloading file %s..."
+#~ msgstr "%s файлы жүктөөлүп жатат..."
+
+#~ msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
+#~ msgstr "32bit тен 64bit ке жаңылоо мүмкүе эмес"
+
+#~ msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
+#~ msgstr "64bit тен 32bit ке жаңылоо мүмкүн эмес"
+
#~ msgid ""
#~ "You have selected the following server(s): %s\n"
#~ "\n"
@@ -1586,24 +1633,33 @@ msgstr "Чыгуу"
#~ "\n"
#~ "\n"
#~ "Сиз бул серверлерди орнотууну каалайсызбы?\n"
+
#~ msgid "IceWm Desktop"
#~ msgstr "IceWm иш столу"
+
#~ msgid "Replay"
#~ msgstr "Кайталоо"
+
#~ msgid "Automated"
#~ msgstr "Автоматтык"
+
#~ msgid "Save packages selection"
#~ msgstr "Тандалган пакеттерди сактоо"
+
#~ msgid "All"
#~ msgstr "Бардыгы"
+
#~ msgid "TV card"
#~ msgstr "ТВ-карта"
+
#~ msgid "Boot"
#~ msgstr "Жүктөө"
+
#~ msgid ""
#~ "_: Keep these entry short\n"
#~ "Authentication"
#~ msgstr "Аутентификация"
+
#~ msgid "Gwenview"
#~ msgstr "Gwenview"
@@ -1618,10 +1674,12 @@ msgstr "Чыгуу"
#, fuzzy
#~ msgid "Choosing packages"
#~ msgstr "Орнотуу үчүн пакеттерди тандаңыз"
+
#~ msgid "Users"
#~ msgstr "Колдонуучулар"
+
#~ msgid "Networking"
#~ msgstr "Тармактар"
+
#~ msgid "Configure X"
#~ msgstr "X конфигурациялоо"
-
diff --git a/perl-install/install/share/po/lt.po b/perl-install/install/share/po/lt.po
index a530f1bbb..d3d7a3785 100644
--- a/perl-install/install/share/po/lt.po
+++ b/perl-install/install/share/po/lt.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: DrakX VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
"PO-Revision-Date: 2000-12-23 13:50+0200\n"
"Last-Translator: Mykolas Norvai­as <Myka@centras.lt>\n"
"Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -15,31 +15,6 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%"
"100<10 || n%100>=20) ? 1 : 2);\n"
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr ""
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr ""
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr ""
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr ""
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr ""
-
#: any.pm:109
#, fuzzy, c-format
msgid "Do you have further supplementary media?"
@@ -75,24 +50,24 @@ msgstr "Tinklo interfeisas"
msgid "Network (NFS)"
msgstr ""
-#: any.pm:163
+#: any.pm:165
#, c-format
msgid "URL of the mirror?"
msgstr ""
-#: any.pm:169
+#: any.pm:171
#, c-format
msgid "URL must start with ftp:// or http://"
msgstr ""
-#: any.pm:180
+#: any.pm:182
#, fuzzy, c-format
msgid ""
"Contacting Mandriva Linux web site to get the list of available mirrors..."
msgstr ""
"Jungiamasi prie atvaizdžio (mirror), kad gautume prieinamų paketų sąrašą"
-#: any.pm:185
+#: any.pm:187
#, fuzzy, c-format
msgid ""
"Failed contacting Mandriva Linux web site to get the list of available "
@@ -100,69 +75,69 @@ msgid ""
msgstr ""
"Jungiamasi prie atvaizdžio (mirror), kad gautume prieinamų paketų sąrašą"
-#: any.pm:195
+#: any.pm:197
#, c-format
msgid "Choose a mirror from which to get the packages"
msgstr "Pasirink atvaizdį (mirror), iš kurio imti paketus"
-#: any.pm:225
+#: any.pm:227
#, c-format
msgid "NFS setup"
msgstr ""
-#: any.pm:226
+#: any.pm:228
#, c-format
msgid "Please enter the hostname and directory of your NFS media"
msgstr ""
-#: any.pm:230
+#: any.pm:232
#, c-format
msgid "Hostname missing"
msgstr ""
-#: any.pm:231
+#: any.pm:233
#, c-format
msgid "Directory must begin with \"/\""
msgstr ""
-#: any.pm:235
+#: any.pm:237
#, c-format
msgid "Hostname of the NFS mount ?"
msgstr ""
-#: any.pm:236
+#: any.pm:238
#, c-format
msgid "Directory"
msgstr "Aplankas"
-#: any.pm:258
+#: any.pm:260
#, c-format
msgid "Supplementary"
msgstr ""
-#: any.pm:293
+#: any.pm:295
#, fuzzy, c-format
msgid ""
"Can't find a package list file on this mirror. Make sure the location is "
"correct."
msgstr "Adapteris %s: %s"
-#: any.pm:328
+#: any.pm:334
#, fuzzy, c-format
msgid "Looking at packages already installed..."
msgstr "Tu negali atžymėti šio paketo. Jis jau yra įdiegtas"
-#: any.pm:362
+#: any.pm:368
#, c-format
msgid "Finding packages to upgrade..."
msgstr "Ieškoma atnaujintinų paketų"
-#: any.pm:381
+#: any.pm:387
#, c-format
msgid "Removing packages prior to upgrade..."
msgstr ""
-#: any.pm:402
+#: any.pm:408
#, c-format
msgid ""
"You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -174,18 +149,18 @@ msgid ""
"please reboot your system and upgrade using the Mandriva update applet."
msgstr ""
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
#, c-format
msgid "Reboot"
msgstr "Perkrauti"
-#: any.pm:407
+#: any.pm:413
#, c-format
msgid "Proceed"
msgstr ""
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -194,72 +169,72 @@ msgid ""
"Do you really want to remove these packages?\n"
msgstr ""
-#: any.pm:815
+#: any.pm:821
#, c-format
msgid "Error reading file %s"
msgstr "Klaida skaitant bylą %s"
-#: any.pm:1022
+#: any.pm:1028
#, fuzzy, c-format
msgid "The following disk(s) were renamed:"
msgstr "Ruošiamasi įdiegti šiuos paketus"
-#: any.pm:1024
+#: any.pm:1030
#, c-format
msgid "%s (previously named as %s)"
msgstr ""
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "HTTP"
msgstr ""
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "FTP"
msgstr "FTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "NFS"
msgstr "NFS"
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
#, c-format
msgid "Network"
msgstr "Tinklas"
-#: any.pm:1104
+#: any.pm:1110
#, fuzzy, c-format
msgid "Please choose a media"
msgstr "Pasirinkite kitą vardą."
-#: any.pm:1120
+#: any.pm:1126
#, fuzzy, c-format
msgid "File already exists. Overwrite it?"
msgstr "Jau yra tokia byla. Užrašyti ant jos?"
-#: any.pm:1124
+#: any.pm:1130
#, c-format
msgid "Permission denied"
msgstr "Priėjimas draudžiamas"
-#: any.pm:1172
+#: any.pm:1178
#, c-format
msgid "Bad NFS name"
msgstr ""
-#: any.pm:1193
+#: any.pm:1199
#, c-format
msgid "Bad media %s"
msgstr ""
-#: any.pm:1236
+#: any.pm:1242
#, fuzzy, c-format
msgid "Can not make screenshots before partitioning"
msgstr "Aš daugiau negaliu pridėti nė vieno skirsnio"
-#: any.pm:1244
+#: any.pm:1250
#, fuzzy, c-format
msgid "Screenshots will be available after install in %s"
msgstr "Tu gali pasirinkti kitas kalbas, kurios bus prieinamos po įdiegimo"
@@ -270,11 +245,15 @@ msgid "Installation"
msgstr "Įdiegiama"
#: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
#, c-format
msgid "Configuration"
msgstr "Nustatymai"
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
#: install2.pm:168
#, c-format
msgid "You must also format %s"
@@ -301,22 +280,22 @@ msgstr "Paleidžiamas tinklas"
msgid "Bringing down the network"
msgstr "Išjungiamas tinklas"
-#: media.pm:402
+#: media.pm:399
#, c-format
msgid "Please wait, retrieving file"
msgstr ""
-#: media.pm:734
-#, fuzzy, c-format
-msgid "Downloading file %s..."
-msgstr "Išsaugoti į bylą"
+#: media.pm:718
+#, c-format
+msgid "unable to add medium"
+msgstr ""
-#: media.pm:822
+#: media.pm:758
#, c-format
msgid "Copying some packages on disks for future use"
msgstr ""
-#: media.pm:875
+#: media.pm:811
#, fuzzy, c-format
msgid "Copying in progress"
msgstr "aptiktas prievade %s"
@@ -358,27 +337,27 @@ msgstr ""
msgid "An error occurred:"
msgstr "Įvyko klaida"
-#: pkgs.pm:776
+#: pkgs.pm:780
#, c-format
msgid "%d installation transactions failed"
msgstr "%d įdiegimo operacijos nepavyko"
-#: pkgs.pm:777
+#: pkgs.pm:781
#, fuzzy, c-format
msgid "Installation of packages failed:"
msgstr "Įdiegiamas paketas %s"
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
#, fuzzy, c-format
msgid "Workstation"
msgstr "KDE darbo stotis"
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
#, c-format
msgid "Office Workstation"
msgstr "Biuro darbo stotis"
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
#, c-format
msgid ""
"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -387,7 +366,7 @@ msgstr ""
"Biuro programos: tekstų redaktoriai (OpenOffice.org Writer, Kword), "
"skaičiuoklės (OpenOffice.org Calc, Kspread), pdf peržiūros programos ir pan."
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
#, c-format
msgid ""
"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -396,33 +375,33 @@ msgstr ""
"Biuro programos: tekstų redaktoriai (kword, abiword), skaičiuoklės (kspread, "
"gnumeric), pdf peržiūros programos ir pan."
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
#, c-format
msgid "Game station"
msgstr "Žaidimų stotis"
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
#, c-format
msgid "Amusement programs: arcade, boards, strategy, etc"
msgstr ""
"Programos pasilinksminimui: lentos, strateginiai, kortų žaidimai ir pan."
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
#, c-format
msgid "Multimedia station"
msgstr "Multimedija stotis"
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
#, c-format
msgid "Sound and video playing/editing programs"
msgstr "Garso ir vaizdo grojimo/redagavimo programos"
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
#, c-format
msgid "Internet station"
msgstr "Interneto stotis"
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
#, fuzzy, c-format
msgid ""
"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -431,211 +410,193 @@ msgstr ""
"Rinkinys įrankių skaityti ir siųsti paštą bei naujienas (pine, mutt, tin) ir "
"naršyti žiniatinklį (WWW)"
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
#, fuzzy, c-format
msgid "Network Computer (client)"
msgstr "Tinklo Kompiuteris, X klientas"
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
#, c-format
msgid "Clients for different protocols including ssh"
msgstr ""
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
#, fuzzy, c-format
msgid "Tools to ease the configuration of your computer"
msgstr "Ar tu nori išbandyti nustatymus?"
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
#, c-format
msgid "Console Tools"
msgstr "Konsolės įrankiai"
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
#, c-format
msgid "Editors, shells, file tools, terminals"
msgstr "Redaktoriai, shell'ai, bylų įrankiai, terminalai"
#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
#, c-format
msgid "Development"
msgstr "Programavimas"
#: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
#, c-format
msgid "C and C++ development libraries, programs and include files"
msgstr "C bei C++ kūrimo bibliotekos, programos ir include bylos"
#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
#, c-format
msgid "Documentation"
msgstr "Dokumentacija"
#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
#, c-format
msgid "Books and Howto's on Linux and Free Software"
msgstr "Knygos ir HOWTO apie Linux ir Free Software"
#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
#, c-format
msgid "LSB"
msgstr ""
#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
#, c-format
msgid "Linux Standard Base. Third party applications support"
msgstr ""
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
#, fuzzy, c-format
msgid "Web Server"
msgstr "serveris"
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
#, c-format
msgid "Apache"
msgstr "Apache"
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
#, c-format
msgid "Groupware"
msgstr "Grupinis darbas"
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
#, c-format
msgid "Kolab Server"
msgstr "Kolab serveris"
#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
#, c-format
msgid "Firewall/Router"
msgstr "Serveris, Firewall/Routeris"
#: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
#, fuzzy, c-format
msgid "Internet gateway"
msgstr "Priėjimas prie Interneto"
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
#, fuzzy, c-format
msgid "Mail/News"
msgstr "/Byla/_Nauja"
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
#, fuzzy, c-format
msgid "Postfix mail server, Inn news server"
msgstr "Serveris, Duomenų bazių"
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
#, fuzzy, c-format
msgid "Directory Server"
msgstr "Atstatyti iš diskelio"
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
#, c-format
msgid "FTP Server"
msgstr "FTP serveris"
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
#, c-format
msgid "ProFTPd"
msgstr ""
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
#, c-format
msgid "DNS/NIS"
msgstr "DNS/NIS"
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
#, fuzzy, c-format
msgid "Domain Name and Network Information Server"
msgstr "Domeno vardas"
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
#, fuzzy, c-format
msgid "File and Printer Sharing Server"
msgstr "Spausdinimo serveris"
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
#, fuzzy, c-format
msgid "NFS Server, Samba server"
msgstr "NIS serveris"
#: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
#, c-format
msgid "Database"
msgstr "Serveris, Duomenų bazių"
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
#, c-format
msgid "PostgreSQL and MySQL Database Server"
msgstr ""
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
#, c-format
msgid "Web/FTP"
msgstr "Serveris, Tinklapių/FTP"
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
#, c-format
msgid "Apache, Pro-ftpd"
msgstr ""
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
#, c-format
msgid "Mail"
msgstr "Paštas"
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
#, fuzzy, c-format
msgid "Postfix mail server"
msgstr "Serveris, Duomenų bazių"
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
#, c-format
msgid "PostgreSQL or MySQL database server"
msgstr ""
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
#, fuzzy, c-format
msgid "Network Computer server"
msgstr "Serveris, Tinklo Kompiuterio serveris"
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
#, c-format
msgid "NFS server, SMB server, Proxy server, ssh server"
msgstr ""
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
#, c-format
msgid "Graphical Environment"
msgstr ""
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
#, c-format
msgid "KDE Workstation"
msgstr "KDE darbo stotis"
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
#, c-format
msgid ""
"The K Desktop Environment, the basic graphical environment with a collection "
@@ -644,12 +605,12 @@ msgstr ""
"The K Desktop Environment, pagrindinė grafinė aplinka su dideliu rinkiniu "
"pritaikytų programų"
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
#, c-format
msgid "GNOME Workstation"
msgstr "Gnome darbo stotis"
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
#, c-format
msgid ""
"A graphical environment with user-friendly set of applications and desktop "
@@ -658,7 +619,7 @@ msgstr ""
"Grafinė aplinka su vartotojui draugiškų programų ir darbalaukio įrankių "
"rinkiniu"
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
#, fuzzy, c-format
msgid "LXDE Desktop"
msgstr "Darbastalis"
@@ -672,54 +633,52 @@ msgstr ""
"Grafinė aplinka su vartotojui draugiškų programų ir darbalaukio įrankių "
"rinkiniu"
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
#, c-format
msgid "Other Graphical Desktops"
msgstr "Kiti grafiniai darbalaukiai"
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
#, fuzzy, c-format
msgid "Window Maker, Enlightenment, Fvwm, etc"
msgstr "IceWM, Window Maker, Enlightenment, Fvwm ir pan."
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
#, c-format
msgid "Utilities"
msgstr "Naudės"
#: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
#, fuzzy, c-format
msgid "SSH Server"
msgstr "NIS serveris"
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
#, fuzzy, c-format
msgid "Webmin"
msgstr "įrenginys"
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
#, fuzzy, c-format
msgid "Webmin Remote Configuration Server"
msgstr "Interneto konfigūravimas"
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
#, fuzzy, c-format
msgid "Network Utilities/Monitoring"
msgstr "Tinklo konfigūravimas"
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
#, c-format
msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
msgstr ""
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
#, fuzzy, c-format
msgid "Mandriva Wizards"
msgstr "Prisijungti prie interneto"
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
#, fuzzy, c-format
msgid "Wizards to configure server"
msgstr "Nustatyti spausdintuvą"
@@ -818,17 +777,17 @@ msgstr ""
msgid "Click on images in order to see a bigger preview"
msgstr ""
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
#, c-format
msgid "Package Group Selection"
msgstr "Paketų grupių pasirinkimas"
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
#, c-format
msgid "Individual package selection"
msgstr "Atskirų paketų pasirinkimas"
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
#, c-format
msgid "Total size: %d / %d MB"
msgstr "Bendras dydis: %d / %d MB"
@@ -946,12 +905,12 @@ msgstr "Išmesti"
msgid "Software Management"
msgstr "Programinės įrangos tvarkyklė"
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
#, c-format
msgid "Choose the packages you want to install"
msgstr "Pasirink paketus, kuriuos tu nori įdiegti"
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
#, c-format
msgid "Installing"
msgstr "Įdiegiama"
@@ -979,7 +938,7 @@ msgstr[0] "%d paketų"
msgstr[1] "%d paketų"
msgstr[2] "%d paketų"
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
#, c-format
msgid "Summary"
msgstr "Apibendrinimas"
@@ -989,7 +948,7 @@ msgstr "Apibendrinimas"
msgid "Configure"
msgstr "Nustatyti"
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
#, fuzzy, c-format
msgid "not configured"
msgstr "iš naujo nustatyti"
@@ -999,14 +958,14 @@ msgstr "iš naujo nustatyti"
msgid "Media Selection"
msgstr "Paketų grupių pasirinkimas"
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
#, c-format
msgid ""
"The following installation media have been found.\n"
"If you want to skip some of them, you can unselect them now."
msgstr ""
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
#, c-format
msgid ""
"You have the option to copy the contents of the CDs onto the hard drive "
@@ -1015,7 +974,7 @@ msgid ""
"available once the system is fully installed."
msgstr ""
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
#, c-format
msgid "Copy whole CDs"
msgstr ""
@@ -1035,59 +994,49 @@ msgstr "Prašom pasirinkti klaviatūros išdėstymą"
msgid "Here is the full list of available keyboards:"
msgstr "Čia yra galimų klaviatūrų sąrašas"
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
#, fuzzy, c-format
msgid "Install/Upgrade"
msgstr "Įdiegti/Atnaujinti"
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
#, fuzzy, c-format
msgid "Is this an install or an upgrade?"
msgstr "Ar tai įdiegimas, ar atnaujinimas?"
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
#, fuzzy, c-format
msgid ""
"_: This is a noun:\n"
"Install"
msgstr "Įdiegti"
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
#, fuzzy, c-format
msgid "Upgrade %s"
msgstr "Atnaujinimas"
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
#, fuzzy, c-format
msgid "Encryption key for %s"
msgstr "Slaptažodžiai nesutampa"
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
#, c-format
msgid "Cancel installation, reboot system"
msgstr ""
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
#, fuzzy, c-format
msgid "New Installation"
msgstr "Įdiegiama"
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
#, c-format
msgid "Upgrade previous installation (not recommended)"
msgstr ""
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
#, c-format
msgid ""
"Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1099,24 +1048,24 @@ msgid ""
"Installation\"."
msgstr ""
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "IDE"
msgstr "IDE"
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "Configuring IDE"
msgstr "Nustatome IDE"
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
#, c-format
msgid ""
"No free space for 1MB bootstrap! Install will continue, but to boot your "
"system, you'll need to create the bootstrap partition in DiskDrake"
msgstr ""
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
#, c-format
msgid ""
"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1124,7 +1073,7 @@ msgid ""
"DiskDrake"
msgstr ""
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
#, c-format
msgid ""
"Change your Cd-Rom!\n"
@@ -1137,153 +1086,153 @@ msgstr ""
"Prašom įkišti CD su užrašu „%s“ į kaupiklį, tada paspausk Gerai.\n"
"Jei tu jo neturi, spausk Nutraukti, kad išvengtum įdiegimo iš šio CD."
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
#, c-format
msgid "Looking for available packages..."
msgstr "Ieškomi galimi paketai"
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
#, c-format
msgid ""
"Your system does not have enough space left for installation or upgrade (%"
"dMB > %dMB)"
msgstr ""
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
#, c-format
msgid ""
"Please choose load or save package selection.\n"
"The format is the same as auto_install generated files."
msgstr ""
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Load"
msgstr "Įkelti"
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Save"
msgstr "Išsaugoti"
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
#, fuzzy, c-format
msgid "Bad file"
msgstr "Įkelti bylą"
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
#, fuzzy, c-format
msgid "KDE"
msgstr "IDE"
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
#, c-format
msgid "GNOME"
msgstr "GNOME"
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
#, fuzzy, c-format
msgid "Desktop Selection"
msgstr "Paketų grupių pasirinkimas"
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
#, c-format
msgid "You can choose your workstation desktop profile."
msgstr ""
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
#, c-format
msgid "Selected size is larger than available space"
msgstr ""
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
#, fuzzy, c-format
msgid "Type of install"
msgstr "Pasirink paketą įdiegimui"
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
#, c-format
msgid ""
"You have not selected any group of packages.\n"
"Please choose the minimal installation you want:"
msgstr ""
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
#, fuzzy, c-format
msgid "With X"
msgstr "Palauk"
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
#, c-format
msgid "With basic documentation (recommended!)"
msgstr ""
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
#, c-format
msgid "Truly minimal install (especially no urpmi)"
msgstr ""
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
#, c-format
msgid "Preparing installation"
msgstr "Ruošiamas įdiegimas"
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
#, c-format
msgid "Installing package %s"
msgstr "Įdiegiamas paketas %s"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "There was an error ordering packages:"
msgstr "Įvyko klaida, bandant sutvarkyti paketus:"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "Go on anyway?"
msgstr "Vis tiek tęsti?"
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
#, c-format
msgid "Retry"
msgstr ""
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
#, c-format
msgid "Skip this package"
msgstr ""
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
#, c-format
msgid "Skip all packages from medium \"%s\""
msgstr ""
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
#, fuzzy, c-format
msgid "Go back to media and packages selection"
msgstr "Išsaugoti paketų pasirinkimą"
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
#, fuzzy, c-format
msgid "There was an error installing package %s."
msgstr "Įvyko klaida, įdiegiant paketus:"
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
#, c-format
msgid "Post-install configuration"
msgstr "Konfigūracija po įdiegimo"
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
#, c-format
msgid "Please ensure the Update Modules media is in drive %s"
msgstr ""
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
#, c-format
msgid "Updates"
msgstr "Atnaujinimai"
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
#, c-format
msgid ""
"You now have the opportunity to download updated packages. These packages\n"
@@ -1296,95 +1245,95 @@ msgid ""
"Do you want to install the updates?"
msgstr ""
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
#, c-format
msgid "%s on %s"
msgstr "%s iš %s"
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
#, c-format
msgid "Hardware"
msgstr "Geležis"
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
#, fuzzy, c-format
msgid "Sound card"
msgstr "Standartinė"
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
#, fuzzy, c-format
msgid "Do you have an ISA sound card?"
msgstr "Ar turi dar vieną?"
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
#, c-format
msgid ""
"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
"card"
msgstr ""
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
#, c-format
msgid "No sound card detected. Try \"harddrake\" after installation"
msgstr ""
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
#, fuzzy, c-format
msgid "Graphical interface"
msgstr "X paleidžiant"
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
#, c-format
msgid "Network & Internet"
msgstr "Tinklas & Internetas"
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
#, c-format
msgid "Proxies"
msgstr "Tarpinės stotys (proxies)"
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
#, fuzzy, c-format
msgid "configured"
msgstr "iš naujo nustatyti"
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
#, c-format
msgid "Security Level"
msgstr "Saugumo lygis"
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
#, fuzzy, c-format
msgid "Firewall"
msgstr "Serveris, Firewall/Routeris"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, fuzzy, c-format
msgid "activated"
msgstr "Aktyvus"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "disabled"
msgstr "uždraustas"
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
#, c-format
msgid "You have not configured X. Are you sure you really want this?"
msgstr ""
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
#, c-format
msgid "Preparing bootloader..."
msgstr "Ruošiama įkrovos tvarkyklė"
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
#, c-format
msgid "Be patient, this may take a while..."
msgstr ""
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
#, c-format
msgid ""
"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1393,24 +1342,24 @@ msgid ""
"root fs is: root=%s"
msgstr ""
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
#, c-format
msgid ""
"In this security level, access to the files in the Windows partition is "
"restricted to the administrator."
msgstr ""
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr "Įdėk tuščią diskelį į kaupiklį %s"
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
#, c-format
msgid "Creating auto install floppy..."
msgstr "Kuriamas automatinio įdiegimo diskelis"
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
#, c-format
msgid ""
"Some steps are not completed.\n"
@@ -1421,7 +1370,7 @@ msgstr ""
"\n"
"Ar tu nori išeiti dabar?"
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
#, c-format
msgid "Congratulations"
msgstr "Sveikinimai"
@@ -1566,6 +1515,10 @@ msgid ""
msgstr "Išeiti"
#, fuzzy
+#~ msgid "Downloading file %s..."
+#~ msgstr "Išsaugoti į bylą"
+
+#, fuzzy
#~ msgid "IceWm Desktop"
#~ msgstr "Darbastalis"
diff --git a/perl-install/install/share/po/ltg.po b/perl-install/install/share/po/ltg.po
index 06aac689b..ea180293a 100644
--- a/perl-install/install/share/po/ltg.po
+++ b/perl-install/install/share/po/ltg.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: DrakX\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
"PO-Revision-Date: 2006-09-24 17:51+0200\n"
"Last-Translator: Māris Laureckis <marlau@inbox.lv>\n"
"Language-Team: Latgalian <linux@latgola.lv>\n"
@@ -14,31 +14,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr ""
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr ""
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr ""
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr ""
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr ""
-
#: any.pm:109
#, c-format
msgid "Do you have further supplementary media?"
@@ -79,17 +54,17 @@ msgstr "Teiklys (FTP)"
msgid "Network (NFS)"
msgstr "Teiklys (NFS)"
-#: any.pm:163
+#: any.pm:165
#, c-format
msgid "URL of the mirror?"
msgstr "Voi spūguļservera URL?"
-#: any.pm:169
+#: any.pm:171
#, c-format
msgid "URL must start with ftp:// or http://"
msgstr "URL juosasuoc ar ftp:// voi http://"
-#: any.pm:180
+#: any.pm:182
#, c-format
msgid ""
"Contacting Mandriva Linux web site to get the list of available mirrors..."
@@ -97,7 +72,7 @@ msgstr ""
"Pīsaslādzu Mandriva Linux teimekļam, lai sajimtu pīejamū spūguļserveru "
"sarokstu..."
-#: any.pm:185
+#: any.pm:187
#, c-format
msgid ""
"Failed contacting Mandriva Linux web site to get the list of available "
@@ -106,47 +81,47 @@ msgstr ""
"Dasasliegšona Mandriva Linux teimekļam cīta naveiksmi, lai sajimtu pīejamū "
"spūguļserveru sarokstu"
-#: any.pm:195
+#: any.pm:197
#, c-format
msgid "Choose a mirror from which to get the packages"
msgstr "Izavielejit spūguļserveri, nu kura jimt pakūtnis"
-#: any.pm:225
+#: any.pm:227
#, c-format
msgid "NFS setup"
msgstr "NFS uzstuodeišona"
-#: any.pm:226
+#: any.pm:228
#, c-format
msgid "Please enter the hostname and directory of your NFS media"
msgstr "Lyudzu, īvodit hosta vuordu i jiusu NFS datu nesieja katalogu"
-#: any.pm:230
+#: any.pm:232
#, c-format
msgid "Hostname missing"
msgstr ""
-#: any.pm:231
+#: any.pm:233
#, c-format
msgid "Directory must begin with \"/\""
msgstr ""
-#: any.pm:235
+#: any.pm:237
#, c-format
msgid "Hostname of the NFS mount ?"
msgstr "Kaids ir NFS monteišonys hosta vuords?"
-#: any.pm:236
+#: any.pm:238
#, c-format
msgid "Directory"
msgstr "Katalogs"
-#: any.pm:258
+#: any.pm:260
#, c-format
msgid "Supplementary"
msgstr ""
-#: any.pm:293
+#: any.pm:295
#, c-format
msgid ""
"Can't find a package list file on this mirror. Make sure the location is "
@@ -155,22 +130,22 @@ msgstr ""
"Iz ituo spūguļservera navar atrast pakūtņu saroksta failu. Puorbaudit, voi "
"atsarūn pareizā vītā."
-#: any.pm:328
+#: any.pm:334
#, c-format
msgid "Looking at packages already installed..."
msgstr "Mekleju jau īprīkš uzinstaleituos pakūtnis..."
-#: any.pm:362
+#: any.pm:368
#, c-format
msgid "Finding packages to upgrade..."
msgstr "Mekleju uzlobuojamuos pakūtnis"
-#: any.pm:381
+#: any.pm:387
#, c-format
msgid "Removing packages prior to upgrade..."
msgstr "Teik nūdzāstys pakūtnis pyrms atjaunynuošonys..."
-#: any.pm:402
+#: any.pm:408
#, c-format
msgid ""
"You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -182,18 +157,18 @@ msgid ""
"please reboot your system and upgrade using the Mandriva update applet."
msgstr ""
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
#, c-format
msgid "Reboot"
msgstr "Puorsuoknēt"
-#: any.pm:407
+#: any.pm:413
#, c-format
msgid "Proceed"
msgstr ""
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -206,72 +181,72 @@ msgstr ""
"\n"
"Voi teišom gribit nūjimt ituos pakūtnis?\n"
-#: any.pm:815
+#: any.pm:821
#, c-format
msgid "Error reading file %s"
msgstr "Kliuda, nūlosūt failu %s"
-#: any.pm:1022
+#: any.pm:1028
#, c-format
msgid "The following disk(s) were renamed:"
msgstr "Sekojūši diski tika puorsaukti:"
-#: any.pm:1024
+#: any.pm:1030
#, c-format
msgid "%s (previously named as %s)"
msgstr "%s (īprīkš tika saukta kai %s)"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "HTTP"
msgstr "HTTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "FTP"
msgstr "FTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "NFS"
msgstr "NFS"
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
#, c-format
msgid "Network"
msgstr "Teiklys"
-#: any.pm:1104
+#: any.pm:1110
#, c-format
msgid "Please choose a media"
msgstr "Lyudzu, izavielejit datu nesieju"
-#: any.pm:1120
+#: any.pm:1126
#, c-format
msgid "File already exists. Overwrite it?"
msgstr "Fails jau eksistej. Voi puorrakstēt pa viersu?"
-#: any.pm:1124
+#: any.pm:1130
#, c-format
msgid "Permission denied"
msgstr "Pīeja līgta"
-#: any.pm:1172
+#: any.pm:1178
#, c-format
msgid "Bad NFS name"
msgstr "Naveiksmeigs NFS vuords"
-#: any.pm:1193
+#: any.pm:1199
#, c-format
msgid "Bad media %s"
msgstr "Napareizs datu nesiejs %s"
-#: any.pm:1236
+#: any.pm:1242
#, c-format
msgid "Can not make screenshots before partitioning"
msgstr "Navar izveiduot ekrana attālus pyrms sadaļu izveidis"
-#: any.pm:1244
+#: any.pm:1250
#, c-format
msgid "Screenshots will be available after install in %s"
msgstr "Ekrana attāli byus pīejami piec instaleišonys %s"
@@ -282,11 +257,15 @@ msgid "Installation"
msgstr "Instalaceja"
#: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
#, c-format
msgid "Configuration"
msgstr "Konfiguraceja"
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
#: install2.pm:168
#, c-format
msgid "You must also format %s"
@@ -311,22 +290,22 @@ msgstr "Īdorbynoju teiklu"
msgid "Bringing down the network"
msgstr "Atslādzu teiklu"
-#: media.pm:402
+#: media.pm:399
#, c-format
msgid "Please wait, retrieving file"
msgstr ""
-#: media.pm:734
+#: media.pm:718
#, c-format
-msgid "Downloading file %s..."
-msgstr "Teik šursyuteiti fail %s..."
+msgid "unable to add medium"
+msgstr ""
-#: media.pm:822
+#: media.pm:758
#, c-format
msgid "Copying some packages on disks for future use"
msgstr "Teik kopātys dažys pakūtnis lītuošonai nuokūtnē"
-#: media.pm:875
+#: media.pm:811
#, c-format
msgid "Copying in progress"
msgstr "Nūteik kopeišona"
@@ -368,27 +347,27 @@ msgstr ""
msgid "An error occurred:"
msgstr "Atkluota kliuda"
-#: pkgs.pm:776
+#: pkgs.pm:780
#, fuzzy, c-format
msgid "%d installation transactions failed"
msgstr "Instalaceja naizadeve"
-#: pkgs.pm:777
+#: pkgs.pm:781
#, fuzzy, c-format
msgid "Installation of packages failed:"
msgstr "Instaleju pakūtni %s"
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
#, c-format
msgid "Workstation"
msgstr "Dorba staceja"
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
#, c-format
msgid "Office Workstation"
msgstr "Biroja dators"
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
#, c-format
msgid ""
"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -397,7 +376,7 @@ msgstr ""
"Biroja programmys: teksta procesori (OpenOffice.org Writer, Kword), "
"izkluojlopys (OpenOffice.org Calc, Kspread), PDF skateituoji, u.c."
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
#, c-format
msgid ""
"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -406,32 +385,32 @@ msgstr ""
"Biroja programmys: teksta procesori (kword, abiword), izkluojlopys (kspread, "
"gnumeric), pdf skateituoji, u.c."
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
#, c-format
msgid "Game station"
msgstr "Spēļu dators"
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
#, c-format
msgid "Amusement programs: arcade, boards, strategy, etc"
msgstr "Izklaidis programmys: arkade, goldaspēlis, strategeja u.c."
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
#, c-format
msgid "Multimedia station"
msgstr "Multimedeju dators"
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
#, c-format
msgid "Sound and video playing/editing programs"
msgstr "Skanis i video atskaņuošonys/redigeišonys programmys"
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
#, c-format
msgid "Internet station"
msgstr "Interneta dators"
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
#, c-format
msgid ""
"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -440,211 +419,193 @@ msgstr ""
"Reiku komplekts, lai laseitu i syuteitu postu voi jaunumus (mutt, tin..), i "
"puorlyukuotu Puorstaipteiklu"
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
#, c-format
msgid "Network Computer (client)"
msgstr "Teikla dators (klients)"
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
#, c-format
msgid "Clients for different protocols including ssh"
msgstr "Klienti dažaidim protokolim, īskaitūt ssh"
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
#, c-format
msgid "Tools to ease the configuration of your computer"
msgstr "Reiki datora konfigureišonys atvīgluošonai"
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
#, c-format
msgid "Console Tools"
msgstr "Konsolis reiki"
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
#, c-format
msgid "Editors, shells, file tools, terminals"
msgstr "Redaktori, čaulys, failu reiki, terminali"
#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
#, c-format
msgid "Development"
msgstr "Izstruode"
#: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
#, c-format
msgid "C and C++ development libraries, programs and include files"
msgstr "C i C++ izstruodis bibliotekys, programmys i īkļautī faili"
#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
#, c-format
msgid "Documentation"
msgstr "Dokumentaceja"
#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
#, c-format
msgid "Books and Howto's on Linux and Free Software"
msgstr "Gruomotys i vaicuojumu par Linux i Breivū programmaturu"
#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
#, c-format
msgid "LSB"
msgstr "LSB"
#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
#, c-format
msgid "Linux Standard Base. Third party applications support"
msgstr "Linuks Standarta Bāze. Trešū izstruoduoju aplikaceju atbolsts"
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
#, c-format
msgid "Web Server"
msgstr "Puorstaipteikla (Web) servers"
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
#, c-format
msgid "Apache"
msgstr "Apache"
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
#, c-format
msgid "Groupware"
msgstr "Groupware"
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
#, c-format
msgid "Kolab Server"
msgstr "Kolab servers"
#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
#, c-format
msgid "Firewall/Router"
msgstr "Gunsmyurs/Maršrutizators"
#: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
#, c-format
msgid "Internet gateway"
msgstr "Interneta vuorteja"
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
#, c-format
msgid "Mail/News"
msgstr "Posts/Jauns"
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
#, c-format
msgid "Postfix mail server, Inn news server"
msgstr "Postfix posta servers, Inn ziņu servers"
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
#, c-format
msgid "Directory Server"
msgstr "Katalogu Servers"
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
#, c-format
msgid "FTP Server"
msgstr "FTP servers"
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
#, c-format
msgid "ProFTPd"
msgstr "ProFTPd"
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
#, c-format
msgid "DNS/NIS"
msgstr "DNS/NIS"
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
#, c-format
msgid "Domain Name and Network Information Server"
msgstr "DNS i NIS servers"
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
#, c-format
msgid "File and Printer Sharing Server"
msgstr "Failu un Printeru Kūplītuošonys servers"
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
#, c-format
msgid "NFS Server, Samba server"
msgstr "NFS servers, Samba servers"
#: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
#, c-format
msgid "Database"
msgstr "Datubāzis"
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
#, c-format
msgid "PostgreSQL and MySQL Database Server"
msgstr "PostgreSQL i MySQL datubāžu servers"
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
#, c-format
msgid "Web/FTP"
msgstr "Teimeklis/FTP"
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
#, c-format
msgid "Apache, Pro-ftpd"
msgstr "Apache, Pro-ftpd"
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
#, c-format
msgid "Mail"
msgstr "Posts"
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
#, c-format
msgid "Postfix mail server"
msgstr "Postfix posta servers"
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
#, c-format
msgid "PostgreSQL or MySQL database server"
msgstr "PostgreSQL voi MySQL datubāžu servers"
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
#, c-format
msgid "Network Computer server"
msgstr "Teikla datoru servers"
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
#, c-format
msgid "NFS server, SMB server, Proxy server, ssh server"
msgstr "NFS servers, SMB servers, storpnīkservers (Proxy), ssh servers"
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
#, c-format
msgid "Graphical Environment"
msgstr "Grafiskuo vide"
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
#, c-format
msgid "KDE Workstation"
msgstr "KDE dorba staceja"
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
#, c-format
msgid ""
"The K Desktop Environment, the basic graphical environment with a collection "
@@ -653,12 +614,12 @@ msgstr ""
"K Desktop Environment, golvonuo grafiskuo vide kūpā ar papyldus reiku "
"kolekceju"
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
#, c-format
msgid "GNOME Workstation"
msgstr "Gnome dorba staceja"
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
#, c-format
msgid ""
"A graphical environment with user-friendly set of applications and desktop "
@@ -667,7 +628,7 @@ msgstr ""
"Grafiskuo vide ar lītuotuojam draudzeigu programmu komplektu i dorba "
"viersmys reikim"
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
#, fuzzy, c-format
msgid "LXDE Desktop"
msgstr "IceWm Dorba viersma"
@@ -681,54 +642,52 @@ msgstr ""
"Grafiskuo vide ar lītuotuojam draudzeigu programmu komplektu i dorba "
"viersmys reikim"
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
#, c-format
msgid "Other Graphical Desktops"
msgstr "Cytys grafiskuos dorba viersmys"
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
#, c-format
msgid "Window Maker, Enlightenment, Fvwm, etc"
msgstr "Window Maker, Enlightenment, Fvwm u.c."
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
#, c-format
msgid "Utilities"
msgstr "Utilitys"
#: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
#, c-format
msgid "SSH Server"
msgstr "SSH servers"
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
#, c-format
msgid "Webmin"
msgstr "Webmin"
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
#, c-format
msgid "Webmin Remote Configuration Server"
msgstr "Webmin attuolynuotuos konfiguracejis servers "
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
#, c-format
msgid "Network Utilities/Monitoring"
msgstr "Teikla utilitys/puorraudzeiba"
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
#, c-format
msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
msgstr "Puorraudzeibys reiki, procesu uzskaite, tcpdump, nmap, ..."
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
#, c-format
msgid "Mandriva Wizards"
msgstr "Mandriva paleigi"
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
#, c-format
msgid "Wizards to configure server"
msgstr "Servera konfiguracejis paleigi"
@@ -828,17 +787,17 @@ msgstr ""
msgid "Click on images in order to see a bigger preview"
msgstr ""
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
#, c-format
msgid "Package Group Selection"
msgstr "Pakūtņu grupu izviele"
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
#, c-format
msgid "Individual package selection"
msgstr "Atsevišku pakūtņu izviele"
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
#, c-format
msgid "Total size: %d / %d MB"
msgstr "Kūpejais izmārs: %d / %d MB"
@@ -957,12 +916,12 @@ msgstr "Minimala instaleišona"
msgid "Software Management"
msgstr "Programmaturys puorvaļdeišona"
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
#, c-format
msgid "Choose the packages you want to install"
msgstr "Izavielejit pakūtnis, kū gribit instalēt"
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
#, c-format
msgid "Installing"
msgstr "Teik instaleits"
@@ -989,7 +948,7 @@ msgid_plural "%d packages"
msgstr[0] "%d pakūtnis"
msgstr[1] "%d pakūtnis"
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
#, c-format
msgid "Summary"
msgstr "Kūpsavylkums"
@@ -999,7 +958,7 @@ msgstr "Kūpsavylkums"
msgid "Configure"
msgstr "Konfigurēt"
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
#, c-format
msgid "not configured"
msgstr "nav konfigurāts"
@@ -1009,7 +968,7 @@ msgstr "nav konfigurāts"
msgid "Media Selection"
msgstr "Pakūtņu grupu izviele"
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
#, c-format
msgid ""
"The following installation media have been found.\n"
@@ -1018,7 +977,7 @@ msgstr ""
"Atrosti sekojūši instalacejis datu nesieji.\n"
"Ja jius gribit izlaist dažus nu tim, jius tagad varit nūjimt atzeimi nu tim."
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
#, c-format
msgid ""
"You have the option to copy the contents of the CDs onto the hard drive "
@@ -1031,7 +990,7 @@ msgstr ""
"Taidā veidā turpynuosīs nu cītuo diska un pakūtnis byus pīejamys cikom "
"sistema tiks piļneibā uzinstaleita."
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
#, c-format
msgid "Copy whole CDs"
msgstr "Kopēt vysu kompaktdisku"
@@ -1051,59 +1010,49 @@ msgstr "Lyudzu izavielejit jiusu klaviaturys izkuortuojumu"
msgid "Here is the full list of available keyboards:"
msgstr "Ite ir pylns pīejamū klaviaturu saroksts"
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
#, c-format
msgid "Install/Upgrade"
msgstr "Instalēt/Atjaunynuot"
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
#, c-format
msgid "Is this an install or an upgrade?"
msgstr "Itei ir instaleišona voi atjaunynuošona?"
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
#, fuzzy, c-format
msgid ""
"_: This is a noun:\n"
"Install"
msgstr "Instalēt"
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
#, c-format
msgid "Upgrade %s"
msgstr "Atjaunynuot %s"
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
#, c-format
msgid "Encryption key for %s"
msgstr "Šifreišonys atslāga deļ %s"
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
#, c-format
msgid "Cancel installation, reboot system"
msgstr ""
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
#, fuzzy, c-format
msgid "New Installation"
msgstr "Instalaceja"
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
#, c-format
msgid "Upgrade previous installation (not recommended)"
msgstr ""
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
#, c-format
msgid ""
"Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1115,17 +1064,17 @@ msgid ""
"Installation\"."
msgstr ""
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "IDE"
msgstr "IDE"
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "Configuring IDE"
msgstr "Teik konfigurāts IDE"
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
#, c-format
msgid ""
"No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1135,7 +1084,7 @@ msgstr ""
"lai īluodātu sistemu, jiusim vajadzēs izveiduot suokneišonys programmys "
"diska sadali programmā DiskDrake"
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
#, c-format
msgid ""
"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1146,7 +1095,7 @@ msgstr ""
"turpynuosīs, bet lai īluodātu sistemu, jiusim vajadzēs izveiduot "
"suokneišonys programmys diska sadali programmā DiskDrake"
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
#, c-format
msgid ""
"Change your Cd-Rom!\n"
@@ -1160,19 +1109,19 @@ msgstr ""
"Ja jiusim nav ituo diska, nūspīdit Atceļt, lai nainstaleitu nu ituo "
"kompaktdiska."
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
#, c-format
msgid "Looking for available packages..."
msgstr "Mekleju pīejamuos pakūtnis"
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
#, c-format
msgid ""
"Your system does not have enough space left for installation or upgrade (%"
"dMB > %dMB)"
msgstr ""
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
#, c-format
msgid ""
"Please choose load or save package selection.\n"
@@ -1181,52 +1130,52 @@ msgstr ""
"Lyudzu izavielejit īluodēt voi saglobuot pakūtņu izvieli.\n"
"Formats ir taids pats, kai ar auto_install generātom failim."
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Load"
msgstr "Īluodēt"
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Save"
msgstr "Saglobuot"
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
#, c-format
msgid "Bad file"
msgstr "Napareizs fails"
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
#, fuzzy, c-format
msgid "KDE"
msgstr "IDE"
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
#, c-format
msgid "GNOME"
msgstr ""
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
#, fuzzy, c-format
msgid "Desktop Selection"
msgstr "Pakūtņu grupu izviele"
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
#, c-format
msgid "You can choose your workstation desktop profile."
msgstr ""
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
#, c-format
msgid "Selected size is larger than available space"
msgstr "Izvālātais apjūms ir leluoks nakai pīejamuo vīta"
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
#, c-format
msgid "Type of install"
msgstr "Instalacejis tips"
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
#, c-format
msgid ""
"You have not selected any group of packages.\n"
@@ -1235,82 +1184,82 @@ msgstr ""
"Jius naizavielēt nivīnu pakūtņu grupu.\n"
"Lyudzu, izavielejit minimalū instalaceju, kaidu jius gribit:"
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
#, c-format
msgid "With X"
msgstr "Ar X"
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
#, c-format
msgid "With basic documentation (recommended!)"
msgstr "Ar pamatdokumentaceju (īteicams!)"
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
#, c-format
msgid "Truly minimal install (especially no urpmi)"
msgstr "Patīši minimala instalaceja (īpaši bez urpmi)"
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
#, c-format
msgid "Preparing installation"
msgstr "Sagataveju instaleišonu"
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
#, c-format
msgid "Installing package %s"
msgstr "Instaleju pakūtni %s"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "There was an error ordering packages:"
msgstr "Pakūtņu kuortuošonys laikā atkluota kliuda:"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "Go on anyway?"
msgstr "Tūmār turpynuot?"
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
#, c-format
msgid "Retry"
msgstr ""
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
#, c-format
msgid "Skip this package"
msgstr ""
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
#, c-format
msgid "Skip all packages from medium \"%s\""
msgstr ""
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
#, fuzzy, c-format
msgid "Go back to media and packages selection"
msgstr "Saglobuot pakūtņu izvieli"
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
#, fuzzy, c-format
msgid "There was an error installing package %s."
msgstr "Pakūtņu instaleišonys laikā atkluota kliuda:"
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
#, c-format
msgid "Post-install configuration"
msgstr "Piecinstaleišonys konfigureišona"
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
#, c-format
msgid "Please ensure the Update Modules media is in drive %s"
msgstr "Lyudzu, puorsalīcynojit ka Update Modules atsarū īkuortā %s"
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
#, c-format
msgid "Updates"
msgstr "Atjaunynuojumi"
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
#, c-format
msgid ""
"You now have the opportunity to download updated packages. These packages\n"
@@ -1332,28 +1281,28 @@ msgstr ""
"\n"
"Voi jius gribit instalēt atjaunynuojumus?"
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
#, c-format
msgid "%s on %s"
msgstr "%s iz %s"
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
#, c-format
msgid "Hardware"
msgstr "Aparatura"
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
#, c-format
msgid "Sound card"
msgstr "Skanis karte"
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
#, c-format
msgid "Do you have an ISA sound card?"
msgstr "Vai jiusim ir ISA skanis karte?"
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
#, c-format
msgid ""
"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1362,69 +1311,69 @@ msgstr ""
"Piec instaleišonys palaidit \"alsaconf\" voi \"sndconfig\", lai konfigurātu "
"jiusu skanis karti"
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
#, c-format
msgid "No sound card detected. Try \"harddrake\" after installation"
msgstr "Nav atrosta skanis karte. Piec instaleišonys izmieginit \"harddrake\""
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
#, c-format
msgid "Graphical interface"
msgstr "Grafiskuo saskarne"
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
#, c-format
msgid "Network & Internet"
msgstr "Teiklys & Internets"
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
#, c-format
msgid "Proxies"
msgstr "Storpnīkserveri"
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
#, c-format
msgid "configured"
msgstr "konfigurāts"
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
#, c-format
msgid "Security Level"
msgstr "Drūšeibys leimiņs"
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
#, c-format
msgid "Firewall"
msgstr "Guņsmyurs"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "activated"
msgstr "aktivizāts"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "disabled"
msgstr "atslāgts"
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
#, c-format
msgid "You have not configured X. Are you sure you really want this?"
msgstr ""
"Jiusim nav nūkonfigurāts X servers. Voi jius asot puorlīcynuoti, ka jius tū "
"gribit?"
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
#, c-format
msgid "Preparing bootloader..."
msgstr "Sagataveju suokneituoju"
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
#, c-format
msgid "Be patient, this may take a while..."
msgstr ""
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
#, c-format
msgid ""
"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1437,7 +1386,7 @@ msgstr ""
"juoizmontoj BootX voi kas cyts, lai īluodātu datoru. Kūdula arguments deļ "
"root fs ir: root=%s"
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
#, c-format
msgid ""
"In this security level, access to the files in the Windows partition is "
@@ -1446,17 +1395,17 @@ msgstr ""
"Šymā drūšeibys leiminī, pīeeja Windows sadalis failim ir tikai "
"administratoram."
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr "Īlicit tukšu disketi īkuortā %s"
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
#, c-format
msgid "Creating auto install floppy..."
msgstr "Sagataveju auto instaleišonys disketi"
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
#, c-format
msgid ""
"Some steps are not completed.\n"
@@ -1467,7 +1416,7 @@ msgstr ""
"\n"
"Voi tīšom gribit izīt tagad?"
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
#, c-format
msgid "Congratulations"
msgstr "Apsveicam"
@@ -1611,6 +1560,9 @@ msgid ""
"Exit"
msgstr "Izīt"
+#~ msgid "Downloading file %s..."
+#~ msgstr "Teik šursyuteiti fail %s..."
+
#~ msgid ""
#~ "You have selected the following server(s): %s\n"
#~ "\n"
diff --git a/perl-install/install/share/po/lv.po b/perl-install/install/share/po/lv.po
index 580f9d281..32da7d449 100644
--- a/perl-install/install/share/po/lv.po
+++ b/perl-install/install/share/po/lv.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: DrakX\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
"PO-Revision-Date: 2002-09-27 17:45+0200\n"
"Last-Translator: Raivo Saars <spaiks@inbox.lv>\n"
"Language-Team: Latvian <ll10nt@listes.murds.lv>\n"
@@ -16,31 +16,6 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
"2);\n"
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr ""
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr ""
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr ""
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr ""
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr ""
-
#: any.pm:109
#, fuzzy, c-format
msgid "Do you have further supplementary media?"
@@ -76,17 +51,17 @@ msgstr "Tīkls"
msgid "Network (NFS)"
msgstr ""
-#: any.pm:163
+#: any.pm:165
#, c-format
msgid "URL of the mirror?"
msgstr ""
-#: any.pm:169
+#: any.pm:171
#, c-format
msgid "URL must start with ftp:// or http://"
msgstr ""
-#: any.pm:180
+#: any.pm:182
#, c-format
msgid ""
"Contacting Mandriva Linux web site to get the list of available mirrors..."
@@ -94,7 +69,7 @@ msgstr ""
"Pieslēdzos Mandriva Linux tīmeklim, lai saņemtu pieejamo spoguļserveru "
"sarakstu sarakstu..."
-#: any.pm:185
+#: any.pm:187
#, fuzzy, c-format
msgid ""
"Failed contacting Mandriva Linux web site to get the list of available "
@@ -103,69 +78,69 @@ msgstr ""
"Pieslēdzos Mandriva Linux tīmeklim, lai saņemtu pieejamo spoguļserveru "
"sarakstu sarakstu..."
-#: any.pm:195
+#: any.pm:197
#, c-format
msgid "Choose a mirror from which to get the packages"
msgstr "Izvēlieties spoguļserveri, no kura ņemt pakotnes"
-#: any.pm:225
+#: any.pm:227
#, c-format
msgid "NFS setup"
msgstr ""
-#: any.pm:226
+#: any.pm:228
#, c-format
msgid "Please enter the hostname and directory of your NFS media"
msgstr ""
-#: any.pm:230
+#: any.pm:232
#, c-format
msgid "Hostname missing"
msgstr ""
-#: any.pm:231
+#: any.pm:233
#, c-format
msgid "Directory must begin with \"/\""
msgstr ""
-#: any.pm:235
+#: any.pm:237
#, c-format
msgid "Hostname of the NFS mount ?"
msgstr ""
-#: any.pm:236
+#: any.pm:238
#, c-format
msgid "Directory"
msgstr "Katalogs"
-#: any.pm:258
+#: any.pm:260
#, c-format
msgid "Supplementary"
msgstr ""
-#: any.pm:293
+#: any.pm:295
#, fuzzy, c-format
msgid ""
"Can't find a package list file on this mirror. Make sure the location is "
"correct."
msgstr "Nevar atrast %s uz %s"
-#: any.pm:328
+#: any.pm:334
#, c-format
msgid "Looking at packages already installed..."
msgstr "Meklēju jau iepriekš uzinstalētās pakotnes..."
-#: any.pm:362
+#: any.pm:368
#, c-format
msgid "Finding packages to upgrade..."
msgstr "Meklēju uzlabojamās pakotnes"
-#: any.pm:381
+#: any.pm:387
#, c-format
msgid "Removing packages prior to upgrade..."
msgstr ""
-#: any.pm:402
+#: any.pm:408
#, c-format
msgid ""
"You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -177,18 +152,18 @@ msgid ""
"please reboot your system and upgrade using the Mandriva update applet."
msgstr ""
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
#, c-format
msgid "Reboot"
msgstr "Pārstartēt"
-#: any.pm:407
+#: any.pm:413
#, c-format
msgid "Proceed"
msgstr ""
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -201,72 +176,72 @@ msgstr ""
"\n"
"Vai tiešām vēlaties noņemt šīs pakotnes?\n"
-#: any.pm:815
+#: any.pm:821
#, c-format
msgid "Error reading file %s"
msgstr "Kļūda, nolasot failu %s"
-#: any.pm:1022
+#: any.pm:1028
#, fuzzy, c-format
msgid "The following disk(s) were renamed:"
msgstr "Tiks instalētas sekojošas pakotnes"
-#: any.pm:1024
+#: any.pm:1030
#, c-format
msgid "%s (previously named as %s)"
msgstr ""
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "HTTP"
msgstr ""
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "FTP"
msgstr "FTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "NFS"
msgstr "NFS"
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
#, c-format
msgid "Network"
msgstr "Tīkls"
-#: any.pm:1104
+#: any.pm:1110
#, fuzzy, c-format
msgid "Please choose a media"
msgstr "Lūdzu izvēlieties"
-#: any.pm:1120
+#: any.pm:1126
#, fuzzy, c-format
msgid "File already exists. Overwrite it?"
msgstr "Fails jau eksistē. Pārrakstīt?"
-#: any.pm:1124
+#: any.pm:1130
#, c-format
msgid "Permission denied"
msgstr "Pieeja liegta"
-#: any.pm:1172
+#: any.pm:1178
#, c-format
msgid "Bad NFS name"
msgstr ""
-#: any.pm:1193
+#: any.pm:1199
#, fuzzy, c-format
msgid "Bad media %s"
msgstr "pievienoju datu nesēju %s."
-#: any.pm:1236
+#: any.pm:1242
#, c-format
msgid "Can not make screenshots before partitioning"
msgstr "Nevar izveidot ekrāna attēlus pirms sadaļu izveides"
-#: any.pm:1244
+#: any.pm:1250
#, c-format
msgid "Screenshots will be available after install in %s"
msgstr "Ekrāna attēli būs pieejami pēc instalēšanas %s."
@@ -277,11 +252,15 @@ msgid "Installation"
msgstr "Instalēju"
#: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
#, c-format
msgid "Configuration"
msgstr "Konfigurācija"
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
#: install2.pm:168
#, c-format
msgid "You must also format %s"
@@ -306,22 +285,22 @@ msgstr "Iedarbinu tīklu"
msgid "Bringing down the network"
msgstr "Atslēdzu tīklu"
-#: media.pm:402
+#: media.pm:399
#, c-format
msgid "Please wait, retrieving file"
msgstr ""
-#: media.pm:734
-#, fuzzy, c-format
-msgid "Downloading file %s..."
-msgstr "Nosūtu failus..."
+#: media.pm:718
+#, c-format
+msgid "unable to add medium"
+msgstr ""
-#: media.pm:822
+#: media.pm:758
#, c-format
msgid "Copying some packages on disks for future use"
msgstr ""
-#: media.pm:875
+#: media.pm:811
#, fuzzy, c-format
msgid "Copying in progress"
msgstr "Notiek noteikšana"
@@ -363,27 +342,27 @@ msgstr ""
msgid "An error occurred:"
msgstr "Atklāta kļūda"
-#: pkgs.pm:776
+#: pkgs.pm:780
#, fuzzy, c-format
msgid "%d installation transactions failed"
msgstr "Instalēšana neizdevās"
-#: pkgs.pm:777
+#: pkgs.pm:781
#, fuzzy, c-format
msgid "Installation of packages failed:"
msgstr "Instalēju pakotni %s"
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
#, c-format
msgid "Workstation"
msgstr "Darbastacija"
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
#, c-format
msgid "Office Workstation"
msgstr "Biroja dators"
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
#, c-format
msgid ""
"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -392,7 +371,7 @@ msgstr ""
"Biroja programmas: teksta procesori (OpenOffice.org Writer, Kword), "
"izklājlapas (OpenOffice.org Calc, Kspread), pdf skatītāji, u.c."
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
#, c-format
msgid ""
"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -401,32 +380,32 @@ msgstr ""
"Biroja programmas: teksta procesori (kword, abiword), izklājlapas (kspread, "
"gnumeric), pdf skatītāji, u.c."
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
#, c-format
msgid "Game station"
msgstr "Spēļu dators"
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
#, c-format
msgid "Amusement programs: arcade, boards, strategy, etc"
msgstr "Izklaides programmas: arkāde, galdiņspēles, stratēģija u.c."
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
#, c-format
msgid "Multimedia station"
msgstr "Multimēdiju dators"
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
#, c-format
msgid "Sound and video playing/editing programs"
msgstr "Skaņas un video atskaņošanas/rediģēšanas programmas"
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
#, c-format
msgid "Internet station"
msgstr "Interneta dators"
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
#, fuzzy, c-format
msgid ""
"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -435,211 +414,193 @@ msgstr ""
"Rīku komplekts, lai lasītu un sūtītu pastu vai jaunumus (pine, mutt, tin..) "
"un pārlūkotu Tīmekli"
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
#, c-format
msgid "Network Computer (client)"
msgstr "Tīkla dators (klients)"
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
#, c-format
msgid "Clients for different protocols including ssh"
msgstr "Klienti dažādiem protokoliem, ieskaitot ssh"
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
#, c-format
msgid "Tools to ease the configuration of your computer"
msgstr "Rīki datora konfigurēšanas atvieglošanai"
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
#, c-format
msgid "Console Tools"
msgstr "Konsoles rīki"
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
#, c-format
msgid "Editors, shells, file tools, terminals"
msgstr "Redaktori, čaulas, failu rīki, termināļi"
#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
#, c-format
msgid "Development"
msgstr "Izstrāde"
#: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
#, c-format
msgid "C and C++ development libraries, programs and include files"
msgstr "C un C++ izstrādes bibliotēkas, programmas un include faili"
#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
#, c-format
msgid "Documentation"
msgstr "Dokumentācija"
#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
#, c-format
msgid "Books and Howto's on Linux and Free Software"
msgstr "Grāmatas un Howto faili par Linux un Brīvo programmatūru"
#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
#, c-format
msgid "LSB"
msgstr "LSB"
#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
#, c-format
msgid "Linux Standard Base. Third party applications support"
msgstr ""
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
#, c-format
msgid "Web Server"
msgstr "Web serveris"
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
#, c-format
msgid "Apache"
msgstr "Apache"
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
#, fuzzy, c-format
msgid "Groupware"
msgstr "grupa"
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
#, c-format
msgid "Kolab Server"
msgstr "Kolab serveris"
#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
#, c-format
msgid "Firewall/Router"
msgstr "Ugunsmūris/Maršrutizators"
#: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
#, c-format
msgid "Internet gateway"
msgstr "Interneta vārteja"
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
#, fuzzy, c-format
msgid "Mail/News"
msgstr "/Fails/_Jauns"
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
#, fuzzy, c-format
msgid "Postfix mail server, Inn news server"
msgstr "Postfix pasta serveris"
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
#, fuzzy, c-format
msgid "Directory Server"
msgstr "Atjanot no CD"
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
#, c-format
msgid "FTP Server"
msgstr "FTP serveris"
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
#, c-format
msgid "ProFTPd"
msgstr ""
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
#, c-format
msgid "DNS/NIS"
msgstr "DNS/NIS"
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
#, fuzzy, c-format
msgid "Domain Name and Network Information Server"
msgstr "Domēna nosaukumu serveris"
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
#, fuzzy, c-format
msgid "File and Printer Sharing Server"
msgstr "Printera serveris"
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
#, fuzzy, c-format
msgid "NFS Server, Samba server"
msgstr "Samba serveris"
#: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
#, c-format
msgid "Database"
msgstr "Datubāzes"
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
#, fuzzy, c-format
msgid "PostgreSQL and MySQL Database Server"
msgstr "PostgreSQL vai MySQL datubāzu serveris"
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
#, c-format
msgid "Web/FTP"
msgstr "Tīmeklis/FTP"
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
#, c-format
msgid "Apache, Pro-ftpd"
msgstr "Apache, Pro-ftpd"
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
#, c-format
msgid "Mail"
msgstr "Pasts"
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
#, fuzzy, c-format
msgid "Postfix mail server"
msgstr "Postfix pasta serveris"
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
#, c-format
msgid "PostgreSQL or MySQL database server"
msgstr "PostgreSQL vai MySQL datubāzu serveris"
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
#, c-format
msgid "Network Computer server"
msgstr "Tīkla datoru serveris"
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
#, c-format
msgid "NFS server, SMB server, Proxy server, ssh server"
msgstr "NFS serveris, SMB serveris, Proxy serveris, ssh serveris"
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
#, c-format
msgid "Graphical Environment"
msgstr "Grafiskā vide"
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
#, c-format
msgid "KDE Workstation"
msgstr "KDE darbastacija"
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
#, c-format
msgid ""
"The K Desktop Environment, the basic graphical environment with a collection "
@@ -647,12 +608,12 @@ msgid ""
msgstr ""
"K Desktop Environment, galvenā grafiskā vide kopā ar papildus rīku kolekciju"
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
#, c-format
msgid "GNOME Workstation"
msgstr "Gnome darbastacija"
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
#, c-format
msgid ""
"A graphical environment with user-friendly set of applications and desktop "
@@ -661,7 +622,7 @@ msgstr ""
"Grafiskā vide ar lietotājiem draudzīgu programmu komplektu un darbavirsmas "
"rīkiem"
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
#, fuzzy, c-format
msgid "LXDE Desktop"
msgstr "Darbavirsma"
@@ -675,54 +636,52 @@ msgstr ""
"Grafiskā vide ar lietotājiem draudzīgu programmu komplektu un darbavirsmas "
"rīkiem"
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
#, c-format
msgid "Other Graphical Desktops"
msgstr "Citas grafiskās darbavirsmas"
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
#, fuzzy, c-format
msgid "Window Maker, Enlightenment, Fvwm, etc"
msgstr "Icewm, Window Maker, Enlightenment, Fvwm u.c."
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
#, c-format
msgid "Utilities"
msgstr "Utilites"
#: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
#, c-format
msgid "SSH Server"
msgstr "SSH serveris"
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
#, fuzzy, c-format
msgid "Webmin"
msgstr "Webmin serviss"
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
#, fuzzy, c-format
msgid "Webmin Remote Configuration Server"
msgstr "Mandriva termināļu servera konfigurācija"
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
#, fuzzy, c-format
msgid "Network Utilities/Monitoring"
msgstr "Tīkla konfigurācija"
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
#, c-format
msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
msgstr ""
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
#, fuzzy, c-format
msgid "Mandriva Wizards"
msgstr "Mandriva Linux kontroles centrs"
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
#, fuzzy, c-format
msgid "Wizards to configure server"
msgstr "Konfigurēju printeri \"%s\"..."
@@ -822,17 +781,17 @@ msgstr ""
msgid "Click on images in order to see a bigger preview"
msgstr ""
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
#, c-format
msgid "Package Group Selection"
msgstr "Pakotņu grupu izvēle"
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
#, c-format
msgid "Individual package selection"
msgstr "Atsevišķu pakotņu izvēle"
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
#, c-format
msgid "Total size: %d / %d MB"
msgstr "Kopējais izmērs: %d / %d MB"
@@ -950,12 +909,12 @@ msgstr "Minimāla instalēšana"
msgid "Software Management"
msgstr "Software Management"
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
#, c-format
msgid "Choose the packages you want to install"
msgstr "Izvēlieties pakotnes, ko vēlaties instalēt"
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
#, c-format
msgid "Installing"
msgstr "Instalēju"
@@ -983,7 +942,7 @@ msgstr[0] "%d pakotnes"
msgstr[1] "%d pakotnes"
msgstr[2] "%d pakotnes"
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
#, c-format
msgid "Summary"
msgstr "Kopsavilkums"
@@ -993,7 +952,7 @@ msgstr "Kopsavilkums"
msgid "Configure"
msgstr "Konfigurēt"
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
#, fuzzy, c-format
msgid "not configured"
msgstr "pārkonfigurēt"
@@ -1003,14 +962,14 @@ msgstr "pārkonfigurēt"
msgid "Media Selection"
msgstr "Pakotņu grupu izvēle"
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
#, c-format
msgid ""
"The following installation media have been found.\n"
"If you want to skip some of them, you can unselect them now."
msgstr ""
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
#, c-format
msgid ""
"You have the option to copy the contents of the CDs onto the hard drive "
@@ -1019,7 +978,7 @@ msgid ""
"available once the system is fully installed."
msgstr ""
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
#, c-format
msgid "Copy whole CDs"
msgstr ""
@@ -1039,59 +998,49 @@ msgstr "Lūdzu izvēlieties jūsu tastatūras izkārtojumu"
msgid "Here is the full list of available keyboards:"
msgstr "Šeit ir pilns pieejamo tastatūru saraksts"
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
#, fuzzy, c-format
msgid "Install/Upgrade"
msgstr "Instalēt/Atjaunināt"
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
#, fuzzy, c-format
msgid "Is this an install or an upgrade?"
msgstr "Šī ir instalēšana vai atjaunināšana?"
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
#, fuzzy, c-format
msgid ""
"_: This is a noun:\n"
"Install"
msgstr "Instalēt"
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
#, fuzzy, c-format
msgid "Upgrade %s"
msgstr "Atjaunināt"
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
#, fuzzy, c-format
msgid "Encryption key for %s"
msgstr "Šifrēšanas atslēga"
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
#, c-format
msgid "Cancel installation, reboot system"
msgstr ""
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
#, fuzzy, c-format
msgid "New Installation"
msgstr "Instalēju"
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
#, c-format
msgid "Upgrade previous installation (not recommended)"
msgstr ""
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
#, c-format
msgid ""
"Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1103,17 +1052,17 @@ msgid ""
"Installation\"."
msgstr ""
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "IDE"
msgstr "IDE"
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "Configuring IDE"
msgstr "Konfigurēju IDE"
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
#, fuzzy, c-format
msgid ""
"No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1123,7 +1072,7 @@ msgstr ""
"lai ielādētu sistēmu, Jums būs nepieciešams izveidot sāknēšanas programmas "
"disaka sadaļu programmā DiskDrake"
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
#, fuzzy, c-format
msgid ""
"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1134,7 +1083,7 @@ msgstr ""
"lai ielādētu sistēmu, Jums būs nepieciešams izveidot sāknēšanas programmas "
"disaka sadaļu programmā DiskDrake"
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
#, c-format
msgid ""
"Change your Cd-Rom!\n"
@@ -1147,19 +1096,19 @@ msgstr ""
"Lūdzu ielieciet iekārtā Cd-Rom \"%s\", kad tas ir izdarīts, nospiediet Labi\n"
"Ja jums nav šī diska, nospiediet Atcelt, lai neinstalētu no šī Cd-Rom."
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
#, c-format
msgid "Looking for available packages..."
msgstr "Meklēju pieejamās pakotnes"
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
#, c-format
msgid ""
"Your system does not have enough space left for installation or upgrade (%"
"dMB > %dMB)"
msgstr ""
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
#, fuzzy, c-format
msgid ""
"Please choose load or save package selection.\n"
@@ -1168,52 +1117,52 @@ msgstr ""
"Lūdzu izvēlieties ielādēt vai saglabāt pakotnes no/uz disketes.\n"
"Formāts ir tāds pats, kā ar auto_install ģenerētām disketēm."
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Load"
msgstr "Ielādēt"
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Save"
msgstr "Saglabāt"
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
#, fuzzy, c-format
msgid "Bad file"
msgstr "Ielādēt failu"
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
#, fuzzy, c-format
msgid "KDE"
msgstr "IDE"
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
#, c-format
msgid "GNOME"
msgstr "GNOME"
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
#, fuzzy, c-format
msgid "Desktop Selection"
msgstr "Pakotņu grupu izvēle"
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
#, c-format
msgid "You can choose your workstation desktop profile."
msgstr ""
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
#, c-format
msgid "Selected size is larger than available space"
msgstr "Izvēlētais apjoms ir lielāks nekā pieejamā vieta"
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
#, c-format
msgid "Type of install"
msgstr "Instalācijas tips"
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
#, c-format
msgid ""
"You have not selected any group of packages.\n"
@@ -1222,82 +1171,82 @@ msgstr ""
"Jūs neizvēlējāties nevienu pakotņu grupu.\n"
"Lūdzu, izvēlieties minimālo instalāciju, kādu vēlaties:"
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
#, c-format
msgid "With X"
msgstr "Ar X"
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
#, c-format
msgid "With basic documentation (recommended!)"
msgstr "Ar pamatdokumentāciju (ieteicams!)"
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
#, c-format
msgid "Truly minimal install (especially no urpmi)"
msgstr "Patiesi minimāla instalācija (īpaši bez urpmi)"
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
#, c-format
msgid "Preparing installation"
msgstr "Sagatavoju instalēšanu"
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
#, c-format
msgid "Installing package %s"
msgstr "Instalēju pakotni %s"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "There was an error ordering packages:"
msgstr "Pakotņu kārtošanas laikā atklāta kļūda:"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "Go on anyway?"
msgstr "Tomēr turpināt?"
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
#, c-format
msgid "Retry"
msgstr ""
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
#, c-format
msgid "Skip this package"
msgstr ""
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
#, c-format
msgid "Skip all packages from medium \"%s\""
msgstr ""
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
#, fuzzy, c-format
msgid "Go back to media and packages selection"
msgstr "Saglabāt pakotņu izvēli"
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
#, fuzzy, c-format
msgid "There was an error installing package %s."
msgstr "Pakotņu instalēšanas laikā atklāta kļūda:"
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
#, c-format
msgid "Post-install configuration"
msgstr "Pēcinstalēšanas konfigurēšana"
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
#, c-format
msgid "Please ensure the Update Modules media is in drive %s"
msgstr ""
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
#, fuzzy, c-format
msgid "Updates"
msgstr "Atjaunināt"
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
#, fuzzy, c-format
msgid ""
"You now have the opportunity to download updated packages. These packages\n"
@@ -1318,95 +1267,95 @@ msgstr ""
"\n"
"Vai Jūs vēlaties instalēt jauninājumus?"
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
#, c-format
msgid "%s on %s"
msgstr "%s uz %s"
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
#, c-format
msgid "Hardware"
msgstr "Dzelži"
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
#, c-format
msgid "Sound card"
msgstr "Skaņas karte"
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
#, c-format
msgid "Do you have an ISA sound card?"
msgstr "Vai Jums ir ISA skaņas karte?"
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
#, fuzzy, c-format
msgid ""
"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
"card"
msgstr "Pēc instalēšanas palaidiet \"sndconfig\", lai konfigurētu skaņu karti"
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
#, c-format
msgid "No sound card detected. Try \"harddrake\" after installation"
msgstr "Nav atrasta skaņu karte. Pēc instalēšanas izmēģiniet \"harddrake\""
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
#, fuzzy, c-format
msgid "Graphical interface"
msgstr "X pēc startēšanas"
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
#, c-format
msgid "Network & Internet"
msgstr "Tīkls & Internets"
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
#, fuzzy, c-format
msgid "Proxies"
msgstr "Profils: "
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
#, fuzzy, c-format
msgid "configured"
msgstr "pārkonfigurēt"
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
#, c-format
msgid "Security Level"
msgstr "Drošības Līmenis"
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
#, c-format
msgid "Firewall"
msgstr "Ugunssiena"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, fuzzy, c-format
msgid "activated"
msgstr "aktivizēt"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "disabled"
msgstr "aizliegts"
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
#, c-format
msgid "You have not configured X. Are you sure you really want this?"
msgstr ""
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
#, c-format
msgid "Preparing bootloader..."
msgstr "Sagatavoju sāknētāju"
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
#, c-format
msgid "Be patient, this may take a while..."
msgstr ""
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
#, fuzzy, c-format
msgid ""
"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1419,24 +1368,24 @@ msgstr ""
"Instalēšana turpināsies, bet Jums būs jāizmanto\n"
"BootX, lai ielādētu datoru"
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
#, c-format
msgid ""
"In this security level, access to the files in the Windows partition is "
"restricted to the administrator."
msgstr ""
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr "Ielieciet tukšu disketi iekārtā %s"
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
#, c-format
msgid "Creating auto install floppy..."
msgstr "Sagatavoju auto instalēšanas disketi"
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
#, c-format
msgid ""
"Some steps are not completed.\n"
@@ -1447,7 +1396,7 @@ msgstr ""
"\n"
"Vai tiešām vēlaties iziet tūlīt?"
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
#, c-format
msgid "Congratulations"
msgstr "Apsveicam"
@@ -1592,6 +1541,10 @@ msgid ""
msgstr "Iziet"
#, fuzzy
+#~ msgid "Downloading file %s..."
+#~ msgstr "Nosūtu failus..."
+
+#, fuzzy
#~ msgid ""
#~ "You have selected the following server(s): %s\n"
#~ "\n"
diff --git a/perl-install/install/share/po/mk.po b/perl-install/install/share/po/mk.po
index c18b73156..24caeb0d5 100644
--- a/perl-install/install/share/po/mk.po
+++ b/perl-install/install/share/po/mk.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: DrakX-mk\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
"PO-Revision-Date: 2006-09-24 20:39-0700\n"
"Last-Translator: Zoran Dimovski <zoki.dimovski@gmail.com>\n"
"Language-Team: Macedonian <mkde-l10n@lists.sourceforge.net>\n"
@@ -21,31 +21,6 @@ msgstr ""
"X-Generator: KBabel 1.11.4\n"
"Plural-Forms: nplurals=2; plural= n==1 || n%10==1 ? 0 : 1\n"
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr ""
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr ""
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr ""
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr ""
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr ""
-
#: any.pm:109
#, c-format
msgid "Do you have further supplementary media?"
@@ -86,17 +61,17 @@ msgstr "Мрежа (FTP)"
msgid "Network (NFS)"
msgstr "Мрежа (NFS)"
-#: any.pm:163
+#: any.pm:165
#, c-format
msgid "URL of the mirror?"
msgstr "URL на огледалото?"
-#: any.pm:169
+#: any.pm:171
#, c-format
msgid "URL must start with ftp:// or http://"
msgstr "URL-то мора да започнува со „ftp://“ или „http://“"
-#: any.pm:180
+#: any.pm:182
#, c-format
msgid ""
"Contacting Mandriva Linux web site to get the list of available mirrors..."
@@ -104,7 +79,7 @@ msgstr ""
"Контактирање со веб сајтот на Мандрива Линукс за добивање на листата на "
"огледала..."
-#: any.pm:185
+#: any.pm:187
#, c-format
msgid ""
"Failed contacting Mandriva Linux web site to get the list of available "
@@ -113,71 +88,71 @@ msgstr ""
"Не може да се воспостави врска веб страница на „Mandriva Linux“ за да се "
"добие листата на достапни огледала"
-#: any.pm:195
+#: any.pm:197
#, c-format
msgid "Choose a mirror from which to get the packages"
msgstr "Изберете огледало од кое да се преземат пакетите"
-#: any.pm:225
+#: any.pm:227
#, c-format
msgid "NFS setup"
msgstr "Поставување на „NFS“"
-#: any.pm:226
+#: any.pm:228
#, c-format
msgid "Please enter the hostname and directory of your NFS media"
msgstr ""
"Ве молиме внесете го името на домаќинот и директориумот на вашиот „NFS“ "
"медиум"
-#: any.pm:230
+#: any.pm:232
#, c-format
msgid "Hostname missing"
msgstr ""
-#: any.pm:231
+#: any.pm:233
#, c-format
msgid "Directory must begin with \"/\""
msgstr ""
-#: any.pm:235
+#: any.pm:237
#, c-format
msgid "Hostname of the NFS mount ?"
msgstr "Име на домаќинот каде е монтиран „NFS“ ?"
-#: any.pm:236
+#: any.pm:238
#, c-format
msgid "Directory"
msgstr "Директориум"
-#: any.pm:258
+#: any.pm:260
#, c-format
msgid "Supplementary"
msgstr ""
-#: any.pm:293
+#: any.pm:295
#, c-format
msgid ""
"Can't find a package list file on this mirror. Make sure the location is "
"correct."
msgstr "Не мојажам да ја пронајдам hdlist датотеката на ова огледало"
-#: any.pm:328
+#: any.pm:334
#, c-format
msgid "Looking at packages already installed..."
msgstr "Барање пакети што се веќе инсталирањен..."
-#: any.pm:362
+#: any.pm:368
#, c-format
msgid "Finding packages to upgrade..."
msgstr "Барање пакети за надградба..."
-#: any.pm:381
+#: any.pm:387
#, c-format
msgid "Removing packages prior to upgrade..."
msgstr "Отстранување на пакети поради надградување..."
-#: any.pm:402
+#: any.pm:408
#, c-format
msgid ""
"You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -189,18 +164,18 @@ msgid ""
"please reboot your system and upgrade using the Mandriva update applet."
msgstr ""
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
#, c-format
msgid "Reboot"
msgstr "Рестартирај"
-#: any.pm:407
+#: any.pm:413
#, c-format
msgid "Proceed"
msgstr ""
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -214,72 +189,72 @@ msgstr ""
"\n"
"Дали навистина сакате да се избришат овие пакети?\n"
-#: any.pm:815
+#: any.pm:821
#, c-format
msgid "Error reading file %s"
msgstr "Грешка при читање на датотеката %s"
-#: any.pm:1022
+#: any.pm:1028
#, c-format
msgid "The following disk(s) were renamed:"
msgstr "Следниве дискови се преименувани:"
-#: any.pm:1024
+#: any.pm:1030
#, c-format
msgid "%s (previously named as %s)"
msgstr "%s (претходно именувано како %s)"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "HTTP"
msgstr "HTTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "FTP"
msgstr "FTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "NFS"
msgstr "NFS"
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
#, c-format
msgid "Network"
msgstr "Мрежа"
-#: any.pm:1104
+#: any.pm:1110
#, c-format
msgid "Please choose a media"
msgstr "Ве молиме изберете медиум"
-#: any.pm:1120
+#: any.pm:1126
#, c-format
msgid "File already exists. Overwrite it?"
msgstr "Датотеката веќе постои. Да се запише врз неа?"
-#: any.pm:1124
+#: any.pm:1130
#, c-format
msgid "Permission denied"
msgstr "Недозволен пристап"
-#: any.pm:1172
+#: any.pm:1178
#, c-format
msgid "Bad NFS name"
msgstr "Лошо „NFS“ име"
-#: any.pm:1193
+#: any.pm:1199
#, c-format
msgid "Bad media %s"
msgstr "Невалиден медиум %s"
-#: any.pm:1236
+#: any.pm:1242
#, c-format
msgid "Can not make screenshots before partitioning"
msgstr "Не можат да се прават снимки на екран пред партицирање"
-#: any.pm:1244
+#: any.pm:1250
#, c-format
msgid "Screenshots will be available after install in %s"
msgstr "Екранските снимки ќе бидат достапни по инсталацијата во %s"
@@ -290,11 +265,15 @@ msgid "Installation"
msgstr "Инсталација"
#: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
#, c-format
msgid "Configuration"
msgstr "Конфигурација"
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
#: install2.pm:168
#, c-format
msgid "You must also format %s"
@@ -320,22 +299,22 @@ msgstr "Подигање на мрежата"
msgid "Bringing down the network"
msgstr "Спуштање на мрежата"
-#: media.pm:402
+#: media.pm:399
#, c-format
msgid "Please wait, retrieving file"
msgstr ""
-#: media.pm:734
+#: media.pm:718
#, c-format
-msgid "Downloading file %s..."
-msgstr "Снимање на датотека %s..."
+msgid "unable to add medium"
+msgstr ""
-#: media.pm:822
+#: media.pm:758
#, c-format
msgid "Copying some packages on disks for future use"
msgstr "Копирање на некои пакети на дискот за понатамошна употреба"
-#: media.pm:875
+#: media.pm:811
#, c-format
msgid "Copying in progress"
msgstr "Копирањето е во тек"
@@ -377,27 +356,27 @@ msgstr ""
msgid "An error occurred:"
msgstr "Се случи грешка"
-#: pkgs.pm:776
+#: pkgs.pm:780
#, c-format
msgid "%d installation transactions failed"
msgstr "%d неуспешни трансакциии на инсталацијата"
-#: pkgs.pm:777
+#: pkgs.pm:781
#, fuzzy, c-format
msgid "Installation of packages failed:"
msgstr "Инсталирање на пакетот %s"
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
#, c-format
msgid "Workstation"
msgstr "Работна станица"
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
#, c-format
msgid "Office Workstation"
msgstr "Канцелариски"
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
#, c-format
msgid ""
"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -407,7 +386,7 @@ msgstr ""
"табеларни пресметки (OpenOffice.org Calc, Kspread), прегледувачи на „PDF“ "
"итн."
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
#, c-format
msgid ""
"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -416,32 +395,32 @@ msgstr ""
"Канцелариски програми: обработка на текст (kword, abiword), табеларни "
"пресметки (kspread, gnumeric), прегледувачи на „pdf“ итн."
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
#, c-format
msgid "Game station"
msgstr "Станица за игри"
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
#, c-format
msgid "Amusement programs: arcade, boards, strategy, etc"
msgstr "Забавни програми: аркадни, на табла, стратегија, итн."
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
#, c-format
msgid "Multimedia station"
msgstr "Мултимедијална станица"
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
#, c-format
msgid "Sound and video playing/editing programs"
msgstr "Програми за пуштање и уредување на звук и видео"
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
#, c-format
msgid "Internet station"
msgstr "Интернет станица"
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
#, c-format
msgid ""
"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -450,211 +429,193 @@ msgstr ""
"Комплет алатки за читање и пракање е-пошта и вести (mutt, tin..) и "
"прелистување на Интернет"
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
#, c-format
msgid "Network Computer (client)"
msgstr "Мрежен компјутер (клиент)"
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
#, c-format
msgid "Clients for different protocols including ssh"
msgstr "Клиенти за различни протоколи, вклучувајќи и „ssh“"
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
#, c-format
msgid "Tools to ease the configuration of your computer"
msgstr "Алатки за лесно конфигурирање на вашиот компјутер"
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
#, c-format
msgid "Console Tools"
msgstr "Конзолски алатки"
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
#, c-format
msgid "Editors, shells, file tools, terminals"
msgstr "Уредувачи, школки, алатки за датотеки, терминали"
#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
#, c-format
msgid "Development"
msgstr "Развој"
#: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
#, c-format
msgid "C and C++ development libraries, programs and include files"
msgstr "Развивачки датотеки за „C“ и „C++“, програми и „include“ датотеки"
#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
#, c-format
msgid "Documentation"
msgstr "Документација"
#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
#, c-format
msgid "Books and Howto's on Linux and Free Software"
msgstr "Книги и „Како да“ за „Linux“ и слободен софтвер"
#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
#, c-format
msgid "LSB"
msgstr "LSB"
#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
#, c-format
msgid "Linux Standard Base. Third party applications support"
msgstr "„Linux Standard Base“. Поддршка за апликации од други фирми"
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
#, c-format
msgid "Web Server"
msgstr "Веб сервер"
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
#, c-format
msgid "Apache"
msgstr "Apache"
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
#, c-format
msgid "Groupware"
msgstr "Групи"
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
#, c-format
msgid "Kolab Server"
msgstr "Kolab Сервер"
#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
#, c-format
msgid "Firewall/Router"
msgstr "Firewall/Router"
#: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
#, c-format
msgid "Internet gateway"
msgstr "Интернет gateway"
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
#, c-format
msgid "Mail/News"
msgstr "Пошта/Вести"
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
#, c-format
msgid "Postfix mail server, Inn news server"
msgstr "„Postfix“ сервер за пошта, „Inn“ сервер за вести"
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
#, c-format
msgid "Directory Server"
msgstr "Директориумски сервер"
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
#, c-format
msgid "FTP Server"
msgstr "„FTP“ сервер"
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
#, c-format
msgid "ProFTPd"
msgstr "ProFTPd"
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
#, c-format
msgid "DNS/NIS"
msgstr "DNS/NIS"
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
#, c-format
msgid "Domain Name and Network Information Server"
msgstr "Име на доменот и сервер за мрежни информации"
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
#, c-format
msgid "File and Printer Sharing Server"
msgstr "Сервер за споделување на датотеки и печатач"
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
#, c-format
msgid "NFS Server, Samba server"
msgstr "„NFS“ сервер, „Samba“ сервер"
#: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
#, c-format
msgid "Database"
msgstr "База на податоци"
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
#, c-format
msgid "PostgreSQL and MySQL Database Server"
msgstr "„PostgreSQL“ и „MySQL“ сервер за бази на податоци"
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
#, c-format
msgid "Web/FTP"
msgstr "Web/FTP"
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
#, c-format
msgid "Apache, Pro-ftpd"
msgstr "Apache, Pro-ftpd"
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
#, c-format
msgid "Mail"
msgstr "Пошта"
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
#, c-format
msgid "Postfix mail server"
msgstr "Postfix сервер за пошта"
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
#, c-format
msgid "PostgreSQL or MySQL database server"
msgstr "„PostgreSQL“ или „MySQL“ сервер за бази на податоци"
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
#, c-format
msgid "Network Computer server"
msgstr "Мрежен компјутер-сервер"
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
#, c-format
msgid "NFS server, SMB server, Proxy server, ssh server"
msgstr "„NFS“ сервер, „SMB“ сервер, „Proxy“ сервер, „ssh“ сервер"
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
#, c-format
msgid "Graphical Environment"
msgstr "Графичка околина"
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
#, c-format
msgid "KDE Workstation"
msgstr "„KDE“ работна станица"
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
#, c-format
msgid ""
"The K Desktop Environment, the basic graphical environment with a collection "
@@ -663,12 +624,12 @@ msgstr ""
"„К“ работна околина, основната графичка околина со додатна колекција на "
"придружни алатки"
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
#, c-format
msgid "GNOME Workstation"
msgstr "„GNOME“ работна станица"
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
#, c-format
msgid ""
"A graphical environment with user-friendly set of applications and desktop "
@@ -676,7 +637,7 @@ msgid ""
msgstr ""
"Графичка околина со кориснички пакет на алатки и алатки за работната површина"
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
#, fuzzy, c-format
msgid "LXDE Desktop"
msgstr "„IceWm“ работна површина"
@@ -689,54 +650,52 @@ msgid ""
msgstr ""
"Графичка околина со кориснички пакет на алатки и алатки за работната површина"
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
#, c-format
msgid "Other Graphical Desktops"
msgstr "Други графички работни околини"
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
#, c-format
msgid "Window Maker, Enlightenment, Fvwm, etc"
msgstr "Window Maker, Enlightenment, Fvwm, итн."
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
#, c-format
msgid "Utilities"
msgstr "Помошни алатки"
#: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
#, c-format
msgid "SSH Server"
msgstr "SSH Сервер"
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
#, c-format
msgid "Webmin"
msgstr "„Webmin“"
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
#, c-format
msgid "Webmin Remote Configuration Server"
msgstr "„Webmin“ оддалечен сервер за конфигурирање"
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
#, c-format
msgid "Network Utilities/Monitoring"
msgstr "Мрежни помошни алатки/надгледување"
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
#, c-format
msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
msgstr "Алатки за надгледување, раководење на процеси, tcpdump, nmap, ..."
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
#, c-format
msgid "Mandriva Wizards"
msgstr "„Mandriva“ волшебници"
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
#, c-format
msgid "Wizards to configure server"
msgstr "Волшебници за конфигурирање на сервер"
@@ -836,17 +795,17 @@ msgstr ""
msgid "Click on images in order to see a bigger preview"
msgstr ""
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
#, c-format
msgid "Package Group Selection"
msgstr "Групна селекција на пакети"
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
#, c-format
msgid "Individual package selection"
msgstr "Подделна селекција на пакети"
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
#, c-format
msgid "Total size: %d / %d MB"
msgstr "Вкупна големина: %d / %d MB"
@@ -966,12 +925,12 @@ msgstr "Минимална инсталација"
msgid "Software Management"
msgstr "Менаџмент на софтвер"
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
#, c-format
msgid "Choose the packages you want to install"
msgstr "Изберете ги пакетите што сакате да се инсталираат"
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
#, c-format
msgid "Installing"
msgstr "Инсталирање"
@@ -998,7 +957,7 @@ msgid_plural "%d packages"
msgstr[0] "%d пакети"
msgstr[1] "%d пакети"
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
#, c-format
msgid "Summary"
msgstr "Резиме"
@@ -1008,7 +967,7 @@ msgstr "Резиме"
msgid "Configure"
msgstr "Конфигурирај"
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
#, c-format
msgid "not configured"
msgstr "не е конфигурирано"
@@ -1018,7 +977,7 @@ msgstr "не е конфигурирано"
msgid "Media Selection"
msgstr "Групна селекција на пакети"
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
#, c-format
msgid ""
"The following installation media have been found.\n"
@@ -1027,7 +986,7 @@ msgstr ""
"Пронајдени се следниве инсталациски медиуми.\n"
"Ако сакате да отстранете некои, можете сега да ги дештиклирате."
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
#, c-format
msgid ""
"You have the option to copy the contents of the CDs onto the hard drive "
@@ -1040,7 +999,7 @@ msgstr ""
"Потоа, инсталацијата ќе продолжи од хард дискот и пакетите ќе бидат достапни "
"се додека системот е целосно инсталиран."
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
#, c-format
msgid "Copy whole CDs"
msgstr "Копирај ги сите CD-а"
@@ -1060,59 +1019,49 @@ msgstr "Изберете распоред на тастатура"
msgid "Here is the full list of available keyboards:"
msgstr "Ова е целосна листа на достапни тастатури"
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
#, c-format
msgid "Install/Upgrade"
msgstr "Инсталирај/Надогради"
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
#, c-format
msgid "Is this an install or an upgrade?"
msgstr "Дали е ова инсталација или надградба?"
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
#, fuzzy, c-format
msgid ""
"_: This is a noun:\n"
"Install"
msgstr "Инсталирај"
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
#, c-format
msgid "Upgrade %s"
msgstr "Надгради %s"
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
#, c-format
msgid "Encryption key for %s"
msgstr "Криптирачки клуч за %s"
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
#, c-format
msgid "Cancel installation, reboot system"
msgstr ""
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
#, fuzzy, c-format
msgid "New Installation"
msgstr "Инсталација"
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
#, c-format
msgid "Upgrade previous installation (not recommended)"
msgstr ""
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
#, c-format
msgid ""
"Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1124,17 +1073,17 @@ msgid ""
"Installation\"."
msgstr ""
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "IDE"
msgstr "IDE"
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "Configuring IDE"
msgstr "Конфигурирање на IDE"
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
#, c-format
msgid ""
"No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1144,7 +1093,7 @@ msgstr ""
"да го подигнете Вашиот систем, ќе треба да креирате bootstrap партиција во "
"DiskDrake"
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
#, c-format
msgid ""
"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1155,7 +1104,7 @@ msgstr ""
"за да го вклучите вашиот систем, ќе треба да креирате партиција за "
"подигнување во „DiskDrake“"
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
#, c-format
msgid ""
"Change your Cd-Rom!\n"
@@ -1168,19 +1117,19 @@ msgstr ""
"Внесете го CD-то со наслов \"%s\" во вашиот уред и притиснете \"Во ред\".\n"
"Ако го немате, притиснете \"Откажи\" за да не инсталирате од ова CD."
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
#, c-format
msgid "Looking for available packages..."
msgstr "Барање достапни пакети..."
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
#, c-format
msgid ""
"Your system does not have enough space left for installation or upgrade (%"
"dMB > %dMB)"
msgstr ""
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
#, c-format
msgid ""
"Please choose load or save package selection.\n"
@@ -1189,52 +1138,52 @@ msgstr ""
"Ве молиме изберете „вчитај“ или „зачувај“ го изборот на пакети\n"
"Форматот е ист како за генерирани датотеки од „auto_install“."
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Load"
msgstr "Вчитај"
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Save"
msgstr "Зачувај"
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
#, c-format
msgid "Bad file"
msgstr "Лоша датотека"
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
#, fuzzy, c-format
msgid "KDE"
msgstr "IDE"
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
#, c-format
msgid "GNOME"
msgstr "GNOME"
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
#, fuzzy, c-format
msgid "Desktop Selection"
msgstr "Групна селекција на пакети"
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
#, c-format
msgid "You can choose your workstation desktop profile."
msgstr ""
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
#, c-format
msgid "Selected size is larger than available space"
msgstr "Избраната големина е поголема од слободниот простор"
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
#, c-format
msgid "Type of install"
msgstr "Тип на инсталација"
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
#, c-format
msgid ""
"You have not selected any group of packages.\n"
@@ -1243,83 +1192,83 @@ msgstr ""
"Не сте избрале ниту една група пакети.\n"
"Изберете ја минималната инсталација што ја сакате:"
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
#, c-format
msgid "With X"
msgstr "Со X"
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
#, c-format
msgid "With basic documentation (recommended!)"
msgstr "Со основна документација (препорачано!)"
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
#, c-format
msgid "Truly minimal install (especially no urpmi)"
msgstr "Вистински минимална инсталација (без urpmi)"
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
#, c-format
msgid "Preparing installation"
msgstr "Подготовка на инсталацијата"
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
#, c-format
msgid "Installing package %s"
msgstr "Инсталирање на пакетот %s"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "There was an error ordering packages:"
msgstr "Се случи грешка во подредувањето на пакетите:"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "Go on anyway?"
msgstr "Да продолжиме?"
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
#, c-format
msgid "Retry"
msgstr ""
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
#, c-format
msgid "Skip this package"
msgstr ""
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
#, c-format
msgid "Skip all packages from medium \"%s\""
msgstr ""
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
#, fuzzy, c-format
msgid "Go back to media and packages selection"
msgstr "Зачувување на селекцијата пакети"
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
#, fuzzy, c-format
msgid "There was an error installing package %s."
msgstr "Се случи грешка во инсталирањето на пакетите:"
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
#, c-format
msgid "Post-install configuration"
msgstr "Пост-инсталациона конфигурација"
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
#, c-format
msgid "Please ensure the Update Modules media is in drive %s"
msgstr ""
"Ве молиме проверете дали медиумот со модулите за надградување е во уредот %s"
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
#, c-format
msgid "Updates"
msgstr "Надградби"
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
#, c-format
msgid ""
"You now have the opportunity to download updated packages. These packages\n"
@@ -1340,28 +1289,28 @@ msgstr ""
"\n"
"Дали сакате да ги инсталирате надградбите?"
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
#, c-format
msgid "%s on %s"
msgstr "%s на %s"
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
#, c-format
msgid "Hardware"
msgstr "Хардвер(машински дел)"
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
#, c-format
msgid "Sound card"
msgstr "Звучна картичка"
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
#, c-format
msgid "Do you have an ISA sound card?"
msgstr "Дали имате ISA звучна картичка?"
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
#, c-format
msgid ""
"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1370,69 +1319,69 @@ msgstr ""
"По инсталацијата вклучете \"alsaconf\" или \"sndconfig\" за да ја "
"конфигурирате звучаната картичка"
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
#, c-format
msgid "No sound card detected. Try \"harddrake\" after installation"
msgstr ""
"Не е детектирана звучна картичка. Обидете се со \"harddrake\" по "
"инсталацијата"
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
#, c-format
msgid "Graphical interface"
msgstr "Графички интерфејс"
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
#, c-format
msgid "Network & Internet"
msgstr "Мрежа и Интернет"
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
#, c-format
msgid "Proxies"
msgstr "Прокси"
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
#, c-format
msgid "configured"
msgstr "конфигурирано"
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
#, c-format
msgid "Security Level"
msgstr "Ниво на сигурност"
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
#, c-format
msgid "Firewall"
msgstr "Firewall"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "activated"
msgstr "активиран"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "disabled"
msgstr "оневозможено"
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
#, c-format
msgid "You have not configured X. Are you sure you really want this?"
msgstr "Се уште го ш конфигурирано Х. Дали навистина сакаш да го направиш ова?"
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
#, c-format
msgid "Preparing bootloader..."
msgstr "Подговтвување на подигачот..."
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
#, c-format
msgid "Be patient, this may take a while..."
msgstr ""
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
#, c-format
msgid ""
"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1445,7 +1394,7 @@ msgstr ""
"или некои други средства за подигнување на вашата машина. Аргументот на "
"кернелот за „root fs“ е следниов: root=%s"
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
#, c-format
msgid ""
"In this security level, access to the files in the Windows partition is "
@@ -1454,17 +1403,17 @@ msgstr ""
"Во ова безбедносно ниво, пристап до датотеките кои се наоѓаат на „Windows“ "
"партицијата е дозволен само на администраторот."
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr "Внесете празна дискета во %s"
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
#, c-format
msgid "Creating auto install floppy..."
msgstr "Создавање дискета за авто-инсталација..."
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
#, c-format
msgid ""
"Some steps are not completed.\n"
@@ -1475,7 +1424,7 @@ msgstr ""
"\n"
"Дали навистина сакате сега да напуштите?"
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
#, c-format
msgid "Congratulations"
msgstr "Честитки"
@@ -1619,6 +1568,9 @@ msgid ""
"Exit"
msgstr "Излез"
+#~ msgid "Downloading file %s..."
+#~ msgstr "Снимање на датотека %s..."
+
#~ msgid ""
#~ "You have selected the following server(s): %s\n"
#~ "\n"
diff --git a/perl-install/install/share/po/mn.po b/perl-install/install/share/po/mn.po
index 1e4ea60d4..a26866083 100644
--- a/perl-install/install/share/po/mn.po
+++ b/perl-install/install/share/po/mn.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: DrakX\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
"PO-Revision-Date: 2004-01-02 00:35+0100\n"
"Last-Translator: Sanlig Badral <Badral@openmn.org>\n"
"Language-Team: Mongolian <openmn-core@lists.sf.net>\n"
@@ -18,31 +18,6 @@ msgstr ""
"X-Generator: KBabel 1.0.2\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr ""
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr ""
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr ""
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr ""
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr ""
-
#: any.pm:109
#, fuzzy, c-format
msgid "Do you have further supplementary media?"
@@ -78,92 +53,92 @@ msgstr "Сүлжээ"
msgid "Network (NFS)"
msgstr ""
-#: any.pm:163
+#: any.pm:165
#, c-format
msgid "URL of the mirror?"
msgstr ""
-#: any.pm:169
+#: any.pm:171
#, c-format
msgid "URL must start with ftp:// or http://"
msgstr ""
-#: any.pm:180
+#: any.pm:182
#, fuzzy, c-format
msgid ""
"Contacting Mandriva Linux web site to get the list of available mirrors..."
msgstr "сайт жигсаалт аас."
-#: any.pm:185
+#: any.pm:187
#, fuzzy, c-format
msgid ""
"Failed contacting Mandriva Linux web site to get the list of available "
"mirrors"
msgstr "сайт жигсаалт аас."
-#: any.pm:195
+#: any.pm:197
#, fuzzy, c-format
msgid "Choose a mirror from which to get the packages"
msgstr "Сонгох"
-#: any.pm:225
+#: any.pm:227
#, c-format
msgid "NFS setup"
msgstr ""
-#: any.pm:226
+#: any.pm:228
#, c-format
msgid "Please enter the hostname and directory of your NFS media"
msgstr ""
-#: any.pm:230
+#: any.pm:232
#, c-format
msgid "Hostname missing"
msgstr ""
-#: any.pm:231
+#: any.pm:233
#, c-format
msgid "Directory must begin with \"/\""
msgstr ""
-#: any.pm:235
+#: any.pm:237
#, c-format
msgid "Hostname of the NFS mount ?"
msgstr ""
-#: any.pm:236
+#: any.pm:238
#, c-format
msgid "Directory"
msgstr "Лавлах"
-#: any.pm:258
+#: any.pm:260
#, c-format
msgid "Supplementary"
msgstr ""
-#: any.pm:293
+#: any.pm:295
#, fuzzy, c-format
msgid ""
"Can't find a package list file on this mirror. Make sure the location is "
"correct."
msgstr "%s: %s-ийг холбож чадахгүй: %s\n"
-#: any.pm:328
+#: any.pm:334
#, c-format
msgid "Looking at packages already installed..."
msgstr ""
-#: any.pm:362
+#: any.pm:368
#, c-format
msgid "Finding packages to upgrade..."
msgstr ""
-#: any.pm:381
+#: any.pm:387
#, c-format
msgid "Removing packages prior to upgrade..."
msgstr ""
-#: any.pm:402
+#: any.pm:408
#, c-format
msgid ""
"You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -175,18 +150,18 @@ msgid ""
"please reboot your system and upgrade using the Mandriva update applet."
msgstr ""
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
#, c-format
msgid "Reboot"
msgstr "Дахин ачаал"
-#: any.pm:407
+#: any.pm:413
#, c-format
msgid "Proceed"
msgstr ""
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -195,74 +170,74 @@ msgid ""
"Do you really want to remove these packages?\n"
msgstr ""
-#: any.pm:815
+#: any.pm:821
#, fuzzy, c-format
msgid "Error reading file %s"
msgstr "Файл уншихад алдаа\n"
-#: any.pm:1022
+#: any.pm:1028
#, fuzzy, c-format
msgid "The following disk(s) were renamed:"
msgstr "Дараах багцууд суулгагдах гэж байна"
-#: any.pm:1024
+#: any.pm:1030
#, c-format
msgid "%s (previously named as %s)"
msgstr ""
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "HTTP"
msgstr ""
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "FTP"
msgstr "FTP"
-#: any.pm:1081
+#: any.pm:1087
#, fuzzy, c-format
msgid "NFS"
msgstr "ТЭ"
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
#, c-format
msgid "Network"
msgstr "Сүлжээ"
-#: any.pm:1104
+#: any.pm:1110
#, fuzzy, c-format
msgid "Please choose a media"
msgstr ""
"Нөөцлөх зөөврийн төхөөрөмжөө\n"
"сонгоно уу."
-#: any.pm:1120
+#: any.pm:1126
#, fuzzy, c-format
msgid "File already exists. Overwrite it?"
msgstr "Файл?"
-#: any.pm:1124
+#: any.pm:1130
#, c-format
msgid "Permission denied"
msgstr "Хандалт нурлаа"
-#: any.pm:1172
+#: any.pm:1178
#, c-format
msgid "Bad NFS name"
msgstr ""
-#: any.pm:1193
+#: any.pm:1199
#, c-format
msgid "Bad media %s"
msgstr ""
-#: any.pm:1236
+#: any.pm:1242
#, c-format
msgid "Can not make screenshots before partitioning"
msgstr "Хуваалт үүсгэхийн өмнө агшин дэлгэцүүдийг хийж чадахгүй"
-#: any.pm:1244
+#: any.pm:1250
#, fuzzy, c-format
msgid "Screenshots will be available after install in %s"
msgstr "ямх"
@@ -273,11 +248,15 @@ msgid "Installation"
msgstr "Суулгалт"
#: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
#, c-format
msgid "Configuration"
msgstr "Тохиргоо"
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
#: install2.pm:168
#, c-format
msgid "You must also format %s"
@@ -300,22 +279,22 @@ msgstr ""
msgid "Bringing down the network"
msgstr ""
-#: media.pm:402
+#: media.pm:399
#, c-format
msgid "Please wait, retrieving file"
msgstr ""
-#: media.pm:734
-#, fuzzy, c-format
-msgid "Downloading file %s..."
-msgstr "Файлууд илгээж байна..."
+#: media.pm:718
+#, c-format
+msgid "unable to add medium"
+msgstr ""
-#: media.pm:822
+#: media.pm:758
#, c-format
msgid "Copying some packages on disks for future use"
msgstr ""
-#: media.pm:875
+#: media.pm:811
#, fuzzy, c-format
msgid "Copying in progress"
msgstr "ямх"
@@ -357,296 +336,278 @@ msgstr ""
msgid "An error occurred:"
msgstr ""
-#: pkgs.pm:776
+#: pkgs.pm:780
#, fuzzy, c-format
msgid "%d installation transactions failed"
msgstr "Суулгалт боломжтой"
-#: pkgs.pm:777
+#: pkgs.pm:781
#, fuzzy, c-format
msgid "Installation of packages failed:"
msgstr "Суулгалтын ангилалыг сонгох"
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
#, fuzzy, c-format
msgid "Workstation"
msgstr "LAN Тохируулга"
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
#, fuzzy, c-format
msgid "Office Workstation"
msgstr "Албан газар"
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
#, c-format
msgid ""
"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
msgstr ""
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
#, c-format
msgid ""
"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
"gnumeric), pdf viewers, etc"
msgstr ""
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
#, fuzzy, c-format
msgid "Game station"
msgstr "Тоглоом"
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
#, fuzzy, c-format
msgid "Amusement programs: arcade, boards, strategy, etc"
msgstr "Зугаа цэнгэл"
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
#, fuzzy, c-format
msgid "Multimedia station"
msgstr "Мультимедиа"
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
#, fuzzy, c-format
msgid "Sound and video playing/editing programs"
msgstr "Дуу"
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
#, fuzzy, c-format
msgid "Internet station"
msgstr "Интернэт"
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
#, fuzzy, c-format
msgid ""
"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
"Web"
msgstr "аас"
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
#, fuzzy, c-format
msgid "Network Computer (client)"
msgstr "Сүлжээ"
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
#, c-format
msgid "Clients for different protocols including ssh"
msgstr ""
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
#, fuzzy, c-format
msgid "Tools to ease the configuration of your computer"
msgstr "аас"
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
#, c-format
msgid "Console Tools"
msgstr ""
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
#, fuzzy, c-format
msgid "Editors, shells, file tools, terminals"
msgstr "Засварлагчууд"
#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
#, c-format
msgid "Development"
msgstr "Хөгжүүлэл"
#: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
#, fuzzy, c-format
msgid "C and C++ development libraries, programs and include files"
msgstr "C C"
#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
#, c-format
msgid "Documentation"
msgstr "Баримтжуулалт"
#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
#, c-format
msgid "Books and Howto's on Linux and Free Software"
msgstr ""
#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
#, c-format
msgid "LSB"
msgstr ""
#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
#, fuzzy, c-format
msgid "Linux Standard Base. Third party applications support"
msgstr "Стандарт"
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
#, fuzzy, c-format
msgid "Web Server"
msgstr "Вэб"
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
#, c-format
msgid "Apache"
msgstr ""
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
#, fuzzy, c-format
msgid "Groupware"
msgstr "бүлэг"
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
#, fuzzy, c-format
msgid "Kolab Server"
msgstr "Самба"
#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
#, c-format
msgid "Firewall/Router"
msgstr ""
#: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
#, c-format
msgid "Internet gateway"
msgstr "Интернэт гарц"
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
#, fuzzy, c-format
msgid "Mail/News"
msgstr "/Файл/_Шинэ"
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
#, fuzzy, c-format
msgid "Postfix mail server, Inn news server"
msgstr "Мэйл"
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
#, fuzzy, c-format
msgid "Directory Server"
msgstr "Сэргээх Илгээгч"
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
#, c-format
msgid "FTP Server"
msgstr "FTP Сервер"
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
#, c-format
msgid "ProFTPd"
msgstr ""
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
#, c-format
msgid "DNS/NIS"
msgstr ""
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
#, fuzzy, c-format
msgid "Domain Name and Network Information Server"
msgstr "Домэйн Нэрний Сервер"
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
#, fuzzy, c-format
msgid "File and Printer Sharing Server"
msgstr "Хэвлэгч"
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
#, fuzzy, c-format
msgid "NFS Server, Samba server"
msgstr "Самба"
#: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
#, c-format
msgid "Database"
msgstr "Өгөгдлийн сан"
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
#, c-format
msgid "PostgreSQL and MySQL Database Server"
msgstr ""
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
#, c-format
msgid "Web/FTP"
msgstr "Web/FTP"
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
#, c-format
msgid "Apache, Pro-ftpd"
msgstr ""
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
#, c-format
msgid "Mail"
msgstr "Мэйл"
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
#, fuzzy, c-format
msgid "Postfix mail server"
msgstr "Мэйл"
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
#, c-format
msgid "PostgreSQL or MySQL database server"
msgstr ""
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
#, fuzzy, c-format
msgid "Network Computer server"
msgstr "Сүлжээ"
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
#, fuzzy, c-format
msgid "NFS server, SMB server, Proxy server, ssh server"
msgstr "Итгэмжилэгч"
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
#, c-format
msgid "Graphical Environment"
msgstr ""
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
#, fuzzy, c-format
msgid "KDE Workstation"
msgstr "KDE"
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
#, fuzzy, c-format
msgid ""
"The K Desktop Environment, the basic graphical environment with a collection "
"of accompanying tools"
msgstr "Ажилын талбар аас"
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
#, fuzzy, c-format
msgid "GNOME Workstation"
msgstr "KDE"
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
#, fuzzy, c-format
msgid ""
"A graphical environment with user-friendly set of applications and desktop "
"tools"
msgstr "аас"
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
#, fuzzy, c-format
msgid "LXDE Desktop"
msgstr "Ширээний компьютер"
@@ -658,54 +619,52 @@ msgid ""
"applications and desktop tools"
msgstr "аас"
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
#, fuzzy, c-format
msgid "Other Graphical Desktops"
msgstr "Бусад"
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
#, fuzzy, c-format
msgid "Window Maker, Enlightenment, Fvwm, etc"
msgstr "Цонх"
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
#, fuzzy, c-format
msgid "Utilities"
msgstr "Филлипинни"
#: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
#, c-format
msgid "SSH Server"
msgstr ""
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
#, fuzzy, c-format
msgid "Webmin"
msgstr "Вэб дуран"
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
#, fuzzy, c-format
msgid "Webmin Remote Configuration Server"
msgstr "Терминал Сервер"
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
#, fuzzy, c-format
msgid "Network Utilities/Monitoring"
msgstr "Сүлжээ толидох"
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
#, c-format
msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
msgstr ""
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
#, fuzzy, c-format
msgid "Mandriva Wizards"
msgstr "Мандрива удирдлагын төв"
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
#, fuzzy, c-format
msgid "Wizards to configure server"
msgstr "\"%s\" хэвлэгч дээр хэвлэж байна"
@@ -795,17 +754,17 @@ msgstr ""
msgid "Click on images in order to see a bigger preview"
msgstr ""
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
#, fuzzy, c-format
msgid "Package Group Selection"
msgstr "Пакет Групп"
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
#, c-format
msgid "Individual package selection"
msgstr "Тусдаа дан багц сонгох"
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
#, fuzzy, c-format
msgid "Total size: %d / %d MB"
msgstr "Нийт хэмжээ"
@@ -922,12 +881,12 @@ msgstr ""
msgid "Software Management"
msgstr ""
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
#, c-format
msgid "Choose the packages you want to install"
msgstr "Сонгохыг хүсэж буй багцаа сонгоно уу"
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
#, c-format
msgid "Installing"
msgstr "Суулгалт"
@@ -954,7 +913,7 @@ msgid_plural "%d packages"
msgstr[0] "Тааруухан багц"
msgstr[1] "Тааруухан багц"
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
#, c-format
msgid "Summary"
msgstr "Дүгнэлт"
@@ -964,7 +923,7 @@ msgstr "Дүгнэлт"
msgid "Configure"
msgstr "Тохируулах"
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
#, c-format
msgid "not configured"
msgstr ""
@@ -974,14 +933,14 @@ msgstr ""
msgid "Media Selection"
msgstr "Пакет Групп"
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
#, c-format
msgid ""
"The following installation media have been found.\n"
"If you want to skip some of them, you can unselect them now."
msgstr ""
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
#, c-format
msgid ""
"You have the option to copy the contents of the CDs onto the hard drive "
@@ -990,7 +949,7 @@ msgid ""
"available once the system is fully installed."
msgstr ""
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
#, c-format
msgid "Copy whole CDs"
msgstr ""
@@ -1010,59 +969,49 @@ msgstr "Та гарын байрлалаа сонгоно уу"
msgid "Here is the full list of available keyboards:"
msgstr "бол бүрэн жигсаалт аас"
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
#, c-format
msgid "Install/Upgrade"
msgstr ""
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
#, c-format
msgid "Is this an install or an upgrade?"
msgstr ""
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
#, fuzzy, c-format
msgid ""
"_: This is a noun:\n"
"Install"
msgstr "Суулга"
-#: steps_interactive.pm:147
-#, c-format
-msgid "Upgrade %s"
-msgstr ""
-
#: steps_interactive.pm:151
#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
+msgid "Upgrade %s"
msgstr ""
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
#, c-format
msgid "Encryption key for %s"
msgstr ""
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
#, c-format
msgid "Cancel installation, reboot system"
msgstr ""
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
#, fuzzy, c-format
msgid "New Installation"
msgstr "Суулгалт"
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
#, c-format
msgid "Upgrade previous installation (not recommended)"
msgstr ""
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
#, c-format
msgid ""
"Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1074,24 +1023,24 @@ msgid ""
"Installation\"."
msgstr ""
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "IDE"
msgstr ""
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "Configuring IDE"
msgstr "IDE-г тохируулах"
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
#, fuzzy, c-format
msgid ""
"No free space for 1MB bootstrap! Install will continue, but to boot your "
"system, you'll need to create the bootstrap partition in DiskDrake"
msgstr "Үгүй вы ямх"
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
#, fuzzy, c-format
msgid ""
"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1099,7 +1048,7 @@ msgid ""
"DiskDrake"
msgstr "Үгүй вы ямх"
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
#, c-format
msgid ""
"Change your Cd-Rom!\n"
@@ -1108,153 +1057,153 @@ msgid ""
"If you do not have it, press Cancel to avoid installation from this Cd-Rom."
msgstr ""
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
#, c-format
msgid "Looking for available packages..."
msgstr ""
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
#, c-format
msgid ""
"Your system does not have enough space left for installation or upgrade (%"
"dMB > %dMB)"
msgstr ""
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
#, fuzzy, c-format
msgid ""
"Please choose load or save package selection.\n"
"The format is the same as auto_install generated files."
msgstr "ачаалах бол."
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Load"
msgstr "Процессор ачаалж байна"
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Save"
msgstr "Хадгалах"
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
#, fuzzy, c-format
msgid "Bad file"
msgstr "Файлыг ачаалах"
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
#, c-format
msgid "KDE"
msgstr "KDE"
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
#, c-format
msgid "GNOME"
msgstr "Гном"
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
#, fuzzy, c-format
msgid "Desktop Selection"
msgstr "Пакет Групп"
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
#, c-format
msgid "You can choose your workstation desktop profile."
msgstr ""
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
#, c-format
msgid "Selected size is larger than available space"
msgstr "Сонгогдсон хэмжээ нь боломжтой зайнаас их байна"
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
#, fuzzy, c-format
msgid "Type of install"
msgstr "Төрөл аас"
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
#, fuzzy, c-format
msgid ""
"You have not selected any group of packages.\n"
"Please choose the minimal installation you want:"
msgstr "Та бүлэг аас вы:"
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
#, c-format
msgid "With X"
msgstr ""
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
#, c-format
msgid "With basic documentation (recommended!)"
msgstr ""
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
#, fuzzy, c-format
msgid "Truly minimal install (especially no urpmi)"
msgstr "үгүй"
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
#, c-format
msgid "Preparing installation"
msgstr "Суулгалтын бэлтгэл"
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
#, c-format
msgid "Installing package %s"
msgstr ""
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "There was an error ordering packages:"
msgstr ""
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, fuzzy, c-format
msgid "Go on anyway?"
msgstr "Очих?"
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
#, c-format
msgid "Retry"
msgstr ""
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
#, c-format
msgid "Skip this package"
msgstr ""
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
#, c-format
msgid "Skip all packages from medium \"%s\""
msgstr ""
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
#, fuzzy, c-format
msgid "Go back to media and packages selection"
msgstr "Хадгалах"
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
#, fuzzy, c-format
msgid "There was an error installing package %s."
msgstr "Багцуудыг суулгахад алдаа гарлаа:"
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
#, c-format
msgid "Post-install configuration"
msgstr "Суулгалтын тохируулгыг батал"
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
#, c-format
msgid "Please ensure the Update Modules media is in drive %s"
msgstr ""
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
#, fuzzy, c-format
msgid "Updates"
msgstr "Шинэчлэх"
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
#, fuzzy, c-format
msgid ""
"You now have the opportunity to download updated packages. These packages\n"
@@ -1267,95 +1216,95 @@ msgid ""
"Do you want to install the updates?"
msgstr "Та г вы Интернэт г вы?"
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
#, c-format
msgid "%s on %s"
msgstr "%s -д %s"
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
#, c-format
msgid "Hardware"
msgstr "Техник хангамж"
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
#, c-format
msgid "Sound card"
msgstr "Дууны карт"
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
#, c-format
msgid "Do you have an ISA sound card?"
msgstr "Та ISA дууны карттай юу?"
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
#, fuzzy, c-format
msgid ""
"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
"card"
msgstr "Ажиллуулах"
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
#, fuzzy, c-format
msgid "No sound card detected. Try \"harddrake\" after installation"
msgstr "Үгүй Reyna"
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
#, c-format
msgid "Graphical interface"
msgstr ""
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
#, fuzzy, c-format
msgid "Network & Internet"
msgstr "Сүлжээ"
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
#, fuzzy, c-format
msgid "Proxies"
msgstr "Польш"
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
#, fuzzy, c-format
msgid "configured"
msgstr "Тохируулах"
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
#, c-format
msgid "Security Level"
msgstr "Хамгаалалтын төвшин"
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
#, c-format
msgid "Firewall"
msgstr ""
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "activated"
msgstr ""
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "disabled"
msgstr "хаалттай"
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
#, c-format
msgid "You have not configured X. Are you sure you really want this?"
msgstr "Та Х-г тохируулаагүй байна. Та үүнийг хийхдээ итгэлтэй байна уу?"
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
#, c-format
msgid "Preparing bootloader..."
msgstr ""
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
#, c-format
msgid "Be patient, this may take a while..."
msgstr ""
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
#, c-format
msgid ""
"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1364,24 +1313,24 @@ msgid ""
"root fs is: root=%s"
msgstr ""
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
#, c-format
msgid ""
"In this security level, access to the files in the Windows partition is "
"restricted to the administrator."
msgstr ""
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
#, fuzzy, c-format
msgid "Insert a blank floppy in drive %s"
msgstr "Оруулах ямх"
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
#, fuzzy, c-format
msgid "Creating auto install floppy..."
msgstr "Үүсгэж байна."
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
#, fuzzy, c-format
msgid ""
"Some steps are not completed.\n"
@@ -1389,7 +1338,7 @@ msgid ""
"Do you really want to quit now?"
msgstr "г вы?"
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
#, fuzzy, c-format
msgid "Congratulations"
msgstr "Баяр хүргэе!"
@@ -1534,6 +1483,10 @@ msgid ""
msgstr "Гарах"
#, fuzzy
+#~ msgid "Downloading file %s..."
+#~ msgstr "Файлууд илгээж байна..."
+
+#, fuzzy
#~ msgid "IceWm Desktop"
#~ msgstr "Ширээний компьютер"
diff --git a/perl-install/install/share/po/ms.po b/perl-install/install/share/po/ms.po
index e6b1d5a1a..c5e3481bb 100644
--- a/perl-install/install/share/po/ms.po
+++ b/perl-install/install/share/po/ms.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: DrakX\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
"PO-Revision-Date: 2008-05-01 14:16+0800\n"
"Last-Translator: Sharuzzaman Ahmat Raslan <sharuzzaman@myrealbox.com>\n"
"Language-Team: Malay <translation-team-ms@lists.sourceforge.net>\n"
@@ -14,31 +14,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr ""
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr ""
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr ""
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr ""
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr ""
-
#: any.pm:109
#, fuzzy, c-format
msgid "Do you have further supplementary media?"
@@ -74,92 +49,92 @@ msgstr "Pelayan FTP"
msgid "Network (NFS)"
msgstr "Pelayan Rangkaian"
-#: any.pm:163
+#: any.pm:165
#, fuzzy, c-format
msgid "URL of the mirror?"
msgstr "URL untuk IG"
-#: any.pm:169
+#: any.pm:171
#, c-format
msgid "URL must start with ftp:// or http://"
msgstr ""
-#: any.pm:180
+#: any.pm:182
#, c-format
msgid ""
"Contacting Mandriva Linux web site to get the list of available mirrors..."
msgstr ""
-#: any.pm:185
+#: any.pm:187
#, c-format
msgid ""
"Failed contacting Mandriva Linux web site to get the list of available "
"mirrors"
msgstr ""
-#: any.pm:195
+#: any.pm:197
#, c-format
msgid "Choose a mirror from which to get the packages"
msgstr ""
-#: any.pm:225
+#: any.pm:227
#, fuzzy, c-format
msgid "NFS setup"
msgstr "Tetapan Halaman"
-#: any.pm:226
+#: any.pm:228
#, c-format
msgid "Please enter the hostname and directory of your NFS media"
msgstr ""
-#: any.pm:230
+#: any.pm:232
#, fuzzy, c-format
msgid "Hostname missing"
msgstr "Pakej Hilang"
-#: any.pm:231
+#: any.pm:233
#, fuzzy, c-format
msgid "Directory must begin with \"/\""
msgstr "Nama Direktori mesti dimulakan dengan slash"
-#: any.pm:235
+#: any.pm:237
#, fuzzy, c-format
msgid "Hostname of the NFS mount ?"
msgstr "Perkongsian NFS Terlekap"
-#: any.pm:236
+#: any.pm:238
#, c-format
msgid "Directory"
msgstr "Direktori"
-#: any.pm:258
+#: any.pm:260
#, c-format
msgid "Supplementary"
msgstr ""
-#: any.pm:293
+#: any.pm:295
#, fuzzy, c-format
msgid ""
"Can't find a package list file on this mirror. Make sure the location is "
"correct."
msgstr "Ralat pada baris %d: %s"
-#: any.pm:328
+#: any.pm:334
#, c-format
msgid "Looking at packages already installed..."
msgstr ""
-#: any.pm:362
+#: any.pm:368
#, fuzzy, c-format
msgid "Finding packages to upgrade..."
msgstr "Mencari pakej untuk dinaiktaraf..."
-#: any.pm:381
+#: any.pm:387
#, fuzzy, c-format
msgid "Removing packages prior to upgrade..."
msgstr "Ralat berlaku bila mencari pakej untuk dinaiktaraf."
-#: any.pm:402
+#: any.pm:408
#, c-format
msgid ""
"You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -171,18 +146,18 @@ msgid ""
"please reboot your system and upgrade using the Mandriva update applet."
msgstr ""
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
#, c-format
msgid "Reboot"
msgstr "Boot semula"
-#: any.pm:407
+#: any.pm:413
#, c-format
msgid "Proceed"
msgstr ""
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -191,72 +166,72 @@ msgid ""
"Do you really want to remove these packages?\n"
msgstr ""
-#: any.pm:815
+#: any.pm:821
#, fuzzy, c-format
msgid "Error reading file %s"
msgstr "Ralat mengimport fail %s"
-#: any.pm:1022
+#: any.pm:1028
#, fuzzy, c-format
msgid "The following disk(s) were renamed:"
msgstr "Peranti audio berikut telah dikesan."
-#: any.pm:1024
+#: any.pm:1030
#, fuzzy, c-format
msgid "%s (previously named as %s)"
msgstr "&Simpan Imej Sebagai"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "HTTP"
msgstr "HTTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "FTP"
msgstr "FTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "NFS"
msgstr "NFS"
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
#, c-format
msgid "Network"
msgstr "Rangkaian"
-#: any.pm:1104
+#: any.pm:1110
#, fuzzy, c-format
msgid "Please choose a media"
msgstr "Utiliti Media Mudah Alih"
-#: any.pm:1120
+#: any.pm:1126
#, fuzzy, c-format
msgid "File already exists. Overwrite it?"
msgstr "Fail Khas peranti telah wujud dalam gugusan"
-#: any.pm:1124
+#: any.pm:1130
#, c-format
msgid "Permission denied"
msgstr "Izin ditolak"
-#: any.pm:1172
+#: any.pm:1178
#, fuzzy, c-format
msgid "Bad NFS name"
msgstr "Tetap Nama Imej"
-#: any.pm:1193
+#: any.pm:1199
#, fuzzy, c-format
msgid "Bad media %s"
msgstr "Media Storan"
-#: any.pm:1236
+#: any.pm:1242
#, c-format
msgid "Can not make screenshots before partitioning"
msgstr ""
-#: any.pm:1244
+#: any.pm:1250
#, fuzzy, c-format
msgid "Screenshots will be available after install in %s"
msgstr "dalam"
@@ -267,11 +242,15 @@ msgid "Installation"
msgstr "Pemasangan sekecil mungkin"
#: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
#, c-format
msgid "Configuration"
msgstr "Konfigurasikan"
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
#: install2.pm:168
#, fuzzy, c-format
msgid "You must also format %s"
@@ -294,22 +273,22 @@ msgstr "Pelayan Rangkaian Lama"
msgid "Bringing down the network"
msgstr "Pelayan Rangkaian Lama"
-#: media.pm:402
+#: media.pm:399
#, c-format
msgid "Please wait, retrieving file"
msgstr ""
-#: media.pm:734
-#, fuzzy, c-format
-msgid "Downloading file %s..."
-msgstr "Extension &fail:"
+#: media.pm:718
+#, c-format
+msgid "unable to add medium"
+msgstr ""
-#: media.pm:822
+#: media.pm:758
#, c-format
msgid "Copying some packages on disks for future use"
msgstr ""
-#: media.pm:875
+#: media.pm:811
#, fuzzy, c-format
msgid "Copying in progress"
msgstr "&Dalam pelayar web"
@@ -353,296 +332,278 @@ msgstr ""
msgid "An error occurred:"
msgstr "Ralat telah berlaku"
-#: pkgs.pm:776
+#: pkgs.pm:780
#, fuzzy, c-format
msgid "%d installation transactions failed"
msgstr "Pelaksanaan gpg gagal (%d)\n"
-#: pkgs.pm:777
+#: pkgs.pm:781
#, fuzzy, c-format
msgid "Installation of packages failed:"
msgstr "Memasang pakej %s"
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
#, c-format
msgid "Workstation"
msgstr "StesyenKerja"
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
#, fuzzy, c-format
msgid "Office Workstation"
msgstr "Pejabat/Produktiviti"
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
#, c-format
msgid ""
"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
msgstr ""
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
#, c-format
msgid ""
"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
"gnumeric), pdf viewers, etc"
msgstr ""
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
#, fuzzy, c-format
msgid "Game station"
msgstr "Permainan memori"
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
#, c-format
msgid "Amusement programs: arcade, boards, strategy, etc"
msgstr ""
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
#, fuzzy, c-format
msgid "Multimedia station"
msgstr "Kekunci Multimedia"
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
#, fuzzy, c-format
msgid "Sound and video playing/editing programs"
msgstr "Bunyi dan"
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
#, fuzzy, c-format
msgid "Internet station"
msgstr "Internet Bergrafik"
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
#, fuzzy, c-format
msgid ""
"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
"Web"
msgstr "dan dan dan"
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
#, fuzzy, c-format
msgid "Network Computer (client)"
msgstr "Klien Pelayan Terminal"
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
#, fuzzy, c-format
msgid "Clients for different protocols including ssh"
msgstr "protokol"
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
#, fuzzy, c-format
msgid "Tools to ease the configuration of your computer"
msgstr "Ujian"
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
#, fuzzy, c-format
msgid "Console Tools"
msgstr "Alatan Pentadbiran"
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
#, fuzzy, c-format
msgid "Editors, shells, file tools, terminals"
msgstr "Penyunting fail"
#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
#, c-format
msgid "Development"
msgstr "Pembangunan"
#: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
#, fuzzy, c-format
msgid "C and C++ development libraries, programs and include files"
msgstr "Pustaka dan fail selitan untuk Oaf."
#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
#, c-format
msgid "Documentation"
msgstr "Dokumentasi"
#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
#, fuzzy, c-format
msgid "Books and Howto's on Linux and Free Software"
msgstr "dan on dan Bebas"
#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
#, c-format
msgid "LSB"
msgstr "LSB"
#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
#, fuzzy, c-format
msgid "Linux Standard Base. Third party applications support"
msgstr "Asas"
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
#, c-format
msgid "Web Server"
msgstr "Pelayan Web"
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
#, c-format
msgid "Apache"
msgstr "Apache"
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
#, c-format
msgid "Groupware"
msgstr "Groupware"
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
#, c-format
msgid "Kolab Server"
msgstr "Pelayan Kolab"
#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
#, fuzzy, c-format
msgid "Firewall/Router"
msgstr "_Konfigurasikan Firewall"
#: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
#, fuzzy, c-format
msgid "Internet gateway"
msgstr "Internet Bergrafik"
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
#, fuzzy, c-format
msgid "Mail/News"
msgstr "Pelayan Berita"
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
#, fuzzy, c-format
msgid "Postfix mail server, Inn news server"
msgstr "Sistem InterNetNews (INN), pelayan berita Usenet."
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
#, c-format
msgid "Directory Server"
msgstr "Pelayan Direktori"
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
#, c-format
msgid "FTP Server"
msgstr "Pelayan FTP"
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
#, c-format
msgid "ProFTPd"
msgstr "ProFTPd"
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
#, c-format
msgid "DNS/NIS"
msgstr "DNS/NIS"
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
#, fuzzy, c-format
msgid "Domain Name and Network Information Server"
msgstr "Name=Pelayan Fail Awam"
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
#, fuzzy, c-format
msgid "File and Printer Sharing Server"
msgstr "(%ld)PELAYAN >>> %s"
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
#, fuzzy, c-format
msgid "NFS Server, Samba server"
msgstr "Monitor status Samba"
#: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
#, c-format
msgid "Database"
msgstr "Pangkalan Data"
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
#, c-format
msgid "PostgreSQL and MySQL Database Server"
msgstr ""
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
#, c-format
msgid "Web/FTP"
msgstr "Web/FTP"
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
#, c-format
msgid "Apache, Pro-ftpd"
msgstr "Apache, Pro-ftpd"
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
#, c-format
msgid "Mail"
msgstr "Mel"
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
#, fuzzy, c-format
msgid "Postfix mail server"
msgstr "Pelayan Nama DNS"
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
#, c-format
msgid "PostgreSQL or MySQL database server"
msgstr ""
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
#, fuzzy, c-format
msgid "Network Computer server"
msgstr "Pelayan Rangkaian Lama"
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
#, c-format
msgid "NFS server, SMB server, Proxy server, ssh server"
msgstr ""
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
#, fuzzy, c-format
msgid "Graphical Environment"
msgstr "Internet Bergrafik"
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
#, fuzzy, c-format
msgid "KDE Workstation"
msgstr "Menu KDE"
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
#, fuzzy, c-format
msgid ""
"The K Desktop Environment, the basic graphical environment with a collection "
"of accompanying tools"
msgstr "Desktop Persekitaran asas"
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
#, fuzzy, c-format
msgid "GNOME Workstation"
msgstr "Gnome-Breakout"
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
#, fuzzy, c-format
msgid ""
"A graphical environment with user-friendly set of applications and desktop "
"tools"
msgstr "A pengguna dan"
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
#, fuzzy, c-format
msgid "LXDE Desktop"
msgstr "Persekitaran Desktop"
@@ -654,54 +615,52 @@ msgid ""
"applications and desktop tools"
msgstr "A pengguna dan"
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
#, fuzzy, c-format
msgid "Other Graphical Desktops"
msgstr "Pada Semua Desktop"
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
#, c-format
msgid "Window Maker, Enlightenment, Fvwm, etc"
msgstr ""
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
#, c-format
msgid "Utilities"
msgstr "Utiliti"
#: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
#, fuzzy, c-format
msgid "SSH Server"
msgstr "Pelayan FTP"
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
#, c-format
msgid "Webmin"
msgstr "Webmin"
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
#, fuzzy, c-format
msgid "Webmin Remote Configuration Server"
msgstr "Alatan tetapan pelayan dan klien fax"
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
#, fuzzy, c-format
msgid "Network Utilities/Monitoring"
msgstr "Aplet pengawas rangkaian"
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
#, c-format
msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
msgstr ""
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
#, fuzzy, c-format
msgid "Mandriva Wizards"
msgstr "Mandriva Galaxy"
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
#, fuzzy, c-format
msgid "Wizards to configure server"
msgstr "Sila tetapkan pelayan PXE"
@@ -794,17 +753,17 @@ msgstr ""
msgid "Click on images in order to see a bigger preview"
msgstr ""
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
#, fuzzy, c-format
msgid "Package Group Selection"
msgstr "Barisatas pilihan (toggle)"
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
#, fuzzy, c-format
msgid "Individual package selection"
msgstr "Barisatas pilihan (toggle)"
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
#, fuzzy, c-format
msgid "Total size: %d / %d MB"
msgstr "Saiz lajur automatik"
@@ -925,12 +884,12 @@ msgstr "Pasang plugin baru"
msgid "Software Management"
msgstr "Pengurusan Perisian"
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
#, fuzzy, c-format
msgid "Choose the packages you want to install"
msgstr "Pilih alatan yang anda hendak guna"
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
#, c-format
msgid "Installing"
msgstr "Memasang"
@@ -957,7 +916,7 @@ msgid_plural "%d packages"
msgstr[0] "Pelihat Pakej"
msgstr[1] " Pakej"
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
#, c-format
msgid "Summary"
msgstr "Ringkasan"
@@ -967,7 +926,7 @@ msgstr "Ringkasan"
msgid "Configure"
msgstr "Buat konfigurasi"
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
#, fuzzy, c-format
msgid "not configured"
msgstr "Tiada"
@@ -977,14 +936,14 @@ msgstr "Tiada"
msgid "Media Selection"
msgstr "Barisatas pilihan (toggle)"
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
#, c-format
msgid ""
"The following installation media have been found.\n"
"If you want to skip some of them, you can unselect them now."
msgstr ""
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
#, c-format
msgid ""
"You have the option to copy the contents of the CDs onto the hard drive "
@@ -993,7 +952,7 @@ msgid ""
"available once the system is fully installed."
msgstr ""
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
#, fuzzy, c-format
msgid "Copy whole CDs"
msgstr "Main CD audio"
@@ -1013,59 +972,49 @@ msgstr "Sila pilih jenis logmasuk anda:"
msgid "Here is the full list of available keyboards:"
msgstr "penuh"
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
#, fuzzy, c-format
msgid "Install/Upgrade"
msgstr "Pasang plugin baru"
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
#, c-format
msgid "Is this an install or an upgrade?"
msgstr ""
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
#, fuzzy, c-format
msgid ""
"_: This is a noun:\n"
"Install"
msgstr "Katalaluan diperlukan, ini adalah dokumen yang dienkrip"
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
#, fuzzy, c-format
msgid "Upgrade %s"
msgstr "Naiktaraf"
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
#, fuzzy, c-format
msgid "Encryption key for %s"
msgstr "&Cari Bantuan"
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
#, c-format
msgid "Cancel installation, reboot system"
msgstr ""
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
#, fuzzy, c-format
msgid "New Installation"
msgstr "Pemasangan sekecil mungkin"
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
#, c-format
msgid "Upgrade previous installation (not recommended)"
msgstr ""
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
#, c-format
msgid ""
"Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1077,24 +1026,24 @@ msgid ""
"Installation\"."
msgstr ""
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "IDE"
msgstr "IDE"
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, fuzzy, c-format
msgid "Configuring IDE"
msgstr "IDE Anjuta"
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
#, fuzzy, c-format
msgid ""
"No free space for 1MB bootstrap! Install will continue, but to boot your "
"system, you'll need to create the bootstrap partition in DiskDrake"
msgstr "Tidak Install dalam"
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
#, fuzzy, c-format
msgid ""
"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1102,7 +1051,7 @@ msgid ""
"DiskDrake"
msgstr "Tidak Install dalam"
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
#, c-format
msgid ""
"Change your Cd-Rom!\n"
@@ -1111,155 +1060,155 @@ msgid ""
"If you do not have it, press Cancel to avoid installation from this Cd-Rom."
msgstr ""
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
#, fuzzy, c-format
msgid "Looking for available packages..."
msgstr ""
"Tiada penerangan didapati untuk %s.\n"
"\n"
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
#, c-format
msgid ""
"Your system does not have enough space left for installation or upgrade (%"
"dMB > %dMB)"
msgstr ""
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
#, fuzzy, c-format
msgid ""
"Please choose load or save package selection.\n"
"The format is the same as auto_install generated files."
msgstr "on."
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Load"
msgstr "Muatan"
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Save"
msgstr "Simpan"
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
#, fuzzy, c-format
msgid "Bad file"
msgstr "Extension &fail:"
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
#, fuzzy, c-format
msgid "KDE"
msgstr "IDE"
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
#, c-format
msgid "GNOME"
msgstr "GNOME"
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
#, fuzzy, c-format
msgid "Desktop Selection"
msgstr "Barisatas pilihan (toggle)"
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
#, c-format
msgid "You can choose your workstation desktop profile."
msgstr ""
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
#, c-format
msgid "Selected size is larger than available space"
msgstr ""
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
#, fuzzy, c-format
msgid "Type of install"
msgstr "Jenis per&nomboran:"
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
#, c-format
msgid ""
"You have not selected any group of packages.\n"
"Please choose the minimal installation you want:"
msgstr ""
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
#, fuzzy, c-format
msgid "With X"
msgstr "Dengan penghujung:"
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
#, fuzzy, c-format
msgid "With basic documentation (recommended!)"
msgstr "asas"
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
#, fuzzy, c-format
msgid "Truly minimal install (especially no urpmi)"
msgstr "tidak"
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
#, fuzzy, c-format
msgid "Preparing installation"
msgstr "Pemasangan sekecil mungkin"
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
#, c-format
msgid "Installing package %s"
msgstr "Memasang pakej %s"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "There was an error ordering packages:"
msgstr "Tedapat ralat menyusun pakej:"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "Go on anyway?"
msgstr "Teruskan juga?"
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
#, c-format
msgid "Retry"
msgstr "Ulangcuba"
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
#, c-format
msgid "Skip this package"
msgstr "Langkau pakej ini"
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
#, c-format
msgid "Skip all packages from medium \"%s\""
msgstr "Langkau semua pakej dari media \"%s\""
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
#, c-format
msgid "Go back to media and packages selection"
msgstr "Kembali ke pemilihan pakej dan media"
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
#, c-format
msgid "There was an error installing package %s."
msgstr "Tedapat ralat memasang pakej %s."
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
#, c-format
msgid "Post-install configuration"
msgstr "Tetapan pasca pemasangan"
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
#, c-format
msgid "Please ensure the Update Modules media is in drive %s"
msgstr ""
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
#, c-format
msgid "Updates"
msgstr "Kemaskini"
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
#, c-format
msgid ""
"You now have the opportunity to download updated packages. These packages\n"
@@ -1281,95 +1230,95 @@ msgstr ""
"\n"
"Adakah anda mahu memasang kemaskini tersebut?"
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
#, c-format
msgid "%s on %s"
msgstr "%s pada %s"
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
#, c-format
msgid "Hardware"
msgstr "Perkakasan"
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
#, c-format
msgid "Sound card"
msgstr "Kad bunyi"
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
#, c-format
msgid "Do you have an ISA sound card?"
msgstr ""
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
#, c-format
msgid ""
"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
"card"
msgstr ""
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
#, c-format
msgid "No sound card detected. Try \"harddrake\" after installation"
msgstr "Tiada kad bunyi dikesan. Cuba \"harddrake\" selepas pemasangan."
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
#, c-format
msgid "Graphical interface"
msgstr "Antaramuka Bergrafik"
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
#, c-format
msgid "Network & Internet"
msgstr "Rangkaian & Internet"
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
#, c-format
msgid "Proxies"
msgstr "Proksi"
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
#, c-format
msgid "configured"
msgstr "ditetapkan"
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
#, c-format
msgid "Security Level"
msgstr "Tahap Keselamatan"
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
#, c-format
msgid "Firewall"
msgstr "Firewall"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "activated"
msgstr ""
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "disabled"
msgstr "dimatikan"
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
#, c-format
msgid "You have not configured X. Are you sure you really want this?"
msgstr ""
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
#, c-format
msgid "Preparing bootloader..."
msgstr "Menyediakan pemuatboot..."
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
#, c-format
msgid "Be patient, this may take a while..."
msgstr ""
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
#, c-format
msgid ""
"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1382,24 +1331,24 @@ msgstr ""
"anda perlu menggunakan BootX atau sebarang cara lain untuk memboot mesin "
"anda. Hujah kernel untuk sistemfail root adalah: root=%s"
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
#, c-format
msgid ""
"In this security level, access to the files in the Windows partition is "
"restricted to the administrator."
msgstr ""
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr "Masukkan cakera liut kosong dalam pemacu %s"
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
#, c-format
msgid "Creating auto install floppy..."
msgstr "Mencipta cakera liut auto pasang..."
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
#, c-format
msgid ""
"Some steps are not completed.\n"
@@ -1407,7 +1356,7 @@ msgid ""
"Do you really want to quit now?"
msgstr ""
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
#, c-format
msgid "Congratulations"
msgstr "Tahniah"
@@ -1552,6 +1501,10 @@ msgid ""
msgstr "Keluar"
#, fuzzy
+#~ msgid "Downloading file %s..."
+#~ msgstr "Extension &fail:"
+
+#, fuzzy
#~ msgid ""
#~ "You have selected the following server(s): %s\n"
#~ "\n"
diff --git a/perl-install/install/share/po/mt.po b/perl-install/install/share/po/mt.po
index 9e80300cf..8a953622a 100644
--- a/perl-install/install/share/po/mt.po
+++ b/perl-install/install/share/po/mt.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: mt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
"PO-Revision-Date: 2004-10-04 18:45+0200\n"
"Last-Translator: Ramon Casha <ramon.casha@linux.org.mt>\n"
"Language-Team: Maltese <mt@li.org>\n"
@@ -17,31 +17,6 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.3.1\n"
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr ""
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr ""
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr ""
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr ""
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr ""
-
#: any.pm:109
#, c-format
msgid "Do you have further supplementary media?"
@@ -77,17 +52,17 @@ msgstr "Network (FTP)"
msgid "Network (NFS)"
msgstr ""
-#: any.pm:163
+#: any.pm:165
#, c-format
msgid "URL of the mirror?"
msgstr "URL tal-mera?"
-#: any.pm:169
+#: any.pm:171
#, c-format
msgid "URL must start with ftp:// or http://"
msgstr ""
-#: any.pm:180
+#: any.pm:182
#, c-format
msgid ""
"Contacting Mandriva Linux web site to get the list of available mirrors..."
@@ -95,7 +70,7 @@ msgstr ""
"Qed nikkuntattja l-website ta' Mandriva Linux biex nikseb lista tal-mirja "
"disponibbli"
-#: any.pm:185
+#: any.pm:187
#, fuzzy, c-format
msgid ""
"Failed contacting Mandriva Linux web site to get the list of available "
@@ -104,69 +79,69 @@ msgstr ""
"Qed nikkuntattja l-website ta' Mandriva Linux biex nikseb lista tal-mirja "
"disponibbli"
-#: any.pm:195
+#: any.pm:197
#, c-format
msgid "Choose a mirror from which to get the packages"
msgstr "Agħżel mera minn fejn trid iġġib il-pakketti"
-#: any.pm:225
+#: any.pm:227
#, c-format
msgid "NFS setup"
msgstr ""
-#: any.pm:226
+#: any.pm:228
#, c-format
msgid "Please enter the hostname and directory of your NFS media"
msgstr ""
-#: any.pm:230
+#: any.pm:232
#, c-format
msgid "Hostname missing"
msgstr ""
-#: any.pm:231
+#: any.pm:233
#, c-format
msgid "Directory must begin with \"/\""
msgstr ""
-#: any.pm:235
+#: any.pm:237
#, c-format
msgid "Hostname of the NFS mount ?"
msgstr ""
-#: any.pm:236
+#: any.pm:238
#, c-format
msgid "Directory"
msgstr "Direttorju"
-#: any.pm:258
+#: any.pm:260
#, c-format
msgid "Supplementary"
msgstr ""
-#: any.pm:293
+#: any.pm:295
#, c-format
msgid ""
"Can't find a package list file on this mirror. Make sure the location is "
"correct."
msgstr "Ma nistax insib fajl hdlist fuq din il-mera"
-#: any.pm:328
+#: any.pm:334
#, c-format
msgid "Looking at packages already installed..."
msgstr "Qed naqra l-pakketti diġà nstallati..."
-#: any.pm:362
+#: any.pm:368
#, c-format
msgid "Finding packages to upgrade..."
msgstr "Qed insib pakketti x'naġġorna"
-#: any.pm:381
+#: any.pm:387
#, c-format
msgid "Removing packages prior to upgrade..."
msgstr ""
-#: any.pm:402
+#: any.pm:408
#, c-format
msgid ""
"You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -178,18 +153,18 @@ msgid ""
"please reboot your system and upgrade using the Mandriva update applet."
msgstr ""
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
#, c-format
msgid "Reboot"
msgstr "Irributja"
-#: any.pm:407
+#: any.pm:413
#, c-format
msgid "Proceed"
msgstr ""
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -202,72 +177,72 @@ msgstr ""
"\n"
"Żgur li trid tneħħi dawn il-pakketti?\n"
-#: any.pm:815
+#: any.pm:821
#, c-format
msgid "Error reading file %s"
msgstr "Problema fil-qari tal-fajl %s"
-#: any.pm:1022
+#: any.pm:1028
#, fuzzy, c-format
msgid "The following disk(s) were renamed:"
msgstr "- %s tneħħa\n"
-#: any.pm:1024
+#: any.pm:1030
#, c-format
msgid "%s (previously named as %s)"
msgstr ""
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "HTTP"
msgstr ""
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "FTP"
msgstr "FTP"
-#: any.pm:1081
+#: any.pm:1087
#, fuzzy, c-format
msgid "NFS"
msgstr "PFS"
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
#, c-format
msgid "Network"
msgstr "Network"
-#: any.pm:1104
+#: any.pm:1110
#, fuzzy, c-format
msgid "Please choose a media"
msgstr "Jekk jogħġbok agħżel wieħed"
-#: any.pm:1120
+#: any.pm:1126
#, fuzzy, c-format
msgid "File already exists. Overwrite it?"
msgstr "Fajl diġà jeżisti. Tuża lilu?"
-#: any.pm:1124
+#: any.pm:1130
#, c-format
msgid "Permission denied"
msgstr "Permess miċħud"
-#: any.pm:1172
+#: any.pm:1178
#, c-format
msgid "Bad NFS name"
msgstr ""
-#: any.pm:1193
+#: any.pm:1199
#, fuzzy, c-format
msgid "Bad media %s"
msgstr "ġie miżjud is-sors %s"
-#: any.pm:1236
+#: any.pm:1242
#, c-format
msgid "Can not make screenshots before partitioning"
msgstr "Ma nistax nieħu ritratti tal-iskrin qabel toħloq il-partizzjonijiet"
-#: any.pm:1244
+#: any.pm:1250
#, c-format
msgid "Screenshots will be available after install in %s"
msgstr "Ir-ritratti jkunu disponibbli wara l-installazzjoni f' %s"
@@ -278,11 +253,15 @@ msgid "Installation"
msgstr "Qed ninstalla"
#: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
#, c-format
msgid "Configuration"
msgstr "Konfigurazzjoni"
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
#: install2.pm:168
#, c-format
msgid "You must also format %s"
@@ -307,22 +286,22 @@ msgstr "Qed intella' n-network"
msgid "Bringing down the network"
msgstr "Qed inniżżel in-network"
-#: media.pm:402
+#: media.pm:399
#, c-format
msgid "Please wait, retrieving file"
msgstr ""
-#: media.pm:734
-#, fuzzy, c-format
-msgid "Downloading file %s..."
-msgstr "Qed nibgħat fajls..."
+#: media.pm:718
+#, c-format
+msgid "unable to add medium"
+msgstr ""
-#: media.pm:822
+#: media.pm:758
#, c-format
msgid "Copying some packages on disks for future use"
msgstr ""
-#: media.pm:875
+#: media.pm:811
#, fuzzy, c-format
msgid "Copying in progress"
msgstr "Għaddej l-għarfien"
@@ -364,27 +343,27 @@ msgstr ""
msgid "An error occurred:"
msgstr "Inqalgħet problema"
-#: pkgs.pm:776
+#: pkgs.pm:780
#, c-format
msgid "%d installation transactions failed"
msgstr "%d tranżazzjonijiet ta' installazzjoni fallew"
-#: pkgs.pm:777
+#: pkgs.pm:781
#, fuzzy, c-format
msgid "Installation of packages failed:"
msgstr "Qed jinstalla il-pakkett %s"
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
#, c-format
msgid "Workstation"
msgstr "Workstation"
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
#, c-format
msgid "Office Workstation"
msgstr "Kompjuter tal-Uffiċċju"
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
#, c-format
msgid ""
"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -393,7 +372,7 @@ msgstr ""
"Programmi tal-uffiċċju: wordprocessors (OpenOffice.org Writer, Kword), "
"spreadsheet (OpenOffice.org Calc, Kspread) eċċ"
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
#, c-format
msgid ""
"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -402,32 +381,32 @@ msgstr ""
"Programmi tal-uffiċċju: wordprocessors (kword, abiword), spreadsheet "
"(kspread, gnumeric) eċċ"
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
#, c-format
msgid "Game station"
msgstr "Logħob"
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
#, c-format
msgid "Amusement programs: arcade, boards, strategy, etc"
msgstr "Programmi ta' divertiment: logħob tal-arcaDES, karti, strateġija eċċ"
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
#, c-format
msgid "Multimedia station"
msgstr "Multimedja"
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
#, c-format
msgid "Sound and video playing/editing programs"
msgstr "Programmi għad-daqq u editjar ta' awdjo u video"
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
#, c-format
msgid "Internet station"
msgstr "Internet"
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
#, c-format
msgid ""
"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -435,211 +414,193 @@ msgid ""
msgstr ""
"Sett għodda biex taqra u tibgħat imejl u \"news\", u biex tibbrawżja l-web"
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
#, c-format
msgid "Network Computer (client)"
msgstr "Kompjuter fuq network (klijent)"
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
#, c-format
msgid "Clients for different protocols including ssh"
msgstr "Klijenti għal protokolli differenti, eż. SSH"
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
#, c-format
msgid "Tools to ease the configuration of your computer"
msgstr "Għodda biex tiffaċilita l-konfigurazzjoni tal-kompjuter"
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
#, c-format
msgid "Console Tools"
msgstr "Għodda tal-konsol"
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
#, c-format
msgid "Editors, shells, file tools, terminals"
msgstr "Edituri, shells, għodda tal-fajls, terminals"
#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
#, c-format
msgid "Development"
msgstr "Żviluppar"
#: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
#, c-format
msgid "C and C++ development libraries, programs and include files"
msgstr "Libreriji, programmi u fajls għal żviluppar C u C++"
#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
#, c-format
msgid "Documentation"
msgstr "Dokumentazzjoni"
#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
#, c-format
msgid "Books and Howto's on Linux and Free Software"
msgstr "Kotba u \"HOWTO\" dwar il-Linux u Softwer Ħieles"
#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
#, c-format
msgid "LSB"
msgstr "LSB"
#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
#, c-format
msgid "Linux Standard Base. Third party applications support"
msgstr "Linux Standard Base. Sapport ta' programmi ta' terzi partiti"
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
#, c-format
msgid "Web Server"
msgstr "Server tal-web"
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
#, c-format
msgid "Apache"
msgstr "Apache"
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
#, fuzzy, c-format
msgid "Groupware"
msgstr "Grupp"
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
#, c-format
msgid "Kolab Server"
msgstr "Server Kolab"
#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
#, c-format
msgid "Firewall/Router"
msgstr "Firewall/Router"
#: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
#, c-format
msgid "Internet gateway"
msgstr "Gateway tal-internet"
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
#, fuzzy, c-format
msgid "Mail/News"
msgstr "/File/_Ġdid"
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
#, fuzzy, c-format
msgid "Postfix mail server, Inn news server"
msgstr "Server tal-imejl Postfix"
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
#, fuzzy, c-format
msgid "Directory Server"
msgstr "Direttorju minn fejn trid tirrestawra"
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
#, c-format
msgid "FTP Server"
msgstr "Server FTP"
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
#, c-format
msgid "ProFTPd"
msgstr ""
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
#, fuzzy, c-format
msgid "DNS/NIS"
msgstr "DNS"
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
#, fuzzy, c-format
msgid "Domain Name and Network Information Server"
msgstr "Server tal-ismijiet tad-dominji"
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
#, fuzzy, c-format
msgid "File and Printer Sharing Server"
msgstr "Server tal-printer"
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
#, fuzzy, c-format
msgid "NFS Server, Samba server"
msgstr "Server Samba"
#: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
#, c-format
msgid "Database"
msgstr "Database"
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
#, fuzzy, c-format
msgid "PostgreSQL and MySQL Database Server"
msgstr "Server tad-database PostgreSQL jew MySQL"
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
#, c-format
msgid "Web/FTP"
msgstr "Web/FTP"
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
#, c-format
msgid "Apache, Pro-ftpd"
msgstr "Apache, Pro-ftpd"
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
#, c-format
msgid "Mail"
msgstr "Imejl"
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
#, c-format
msgid "Postfix mail server"
msgstr "Server tal-imejl Postfix"
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
#, c-format
msgid "PostgreSQL or MySQL database server"
msgstr "Server tad-database PostgreSQL jew MySQL"
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
#, c-format
msgid "Network Computer server"
msgstr "Kompjuter Server tan-Network"
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
#, c-format
msgid "NFS server, SMB server, Proxy server, ssh server"
msgstr "Servers NFS, SMB, Proxy, ssh"
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
#, c-format
msgid "Graphical Environment"
msgstr "Ambjent Grafiku"
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
#, c-format
msgid "KDE Workstation"
msgstr "Stazzjon KDE"
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
#, c-format
msgid ""
"The K Desktop Environment, the basic graphical environment with a collection "
@@ -648,19 +609,19 @@ msgstr ""
"K Desktop Environment, l-interfaċċja grafika bażi, b'għażla ta' għodda "
"jakkumpanjawha"
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
#, c-format
msgid "GNOME Workstation"
msgstr "Stazzjon GNOME"
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
#, c-format
msgid ""
"A graphical environment with user-friendly set of applications and desktop "
"tools"
msgstr "Ambjent grafiku b' għażla ta' programmi u għodda faċli"
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
#, fuzzy, c-format
msgid "LXDE Desktop"
msgstr "Desktop"
@@ -672,54 +633,52 @@ msgid ""
"applications and desktop tools"
msgstr "Ambjent grafiku b' għażla ta' programmi u għodda faċli"
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
#, c-format
msgid "Other Graphical Desktops"
msgstr "Desktops Grafiċi Oħrajn"
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
#, fuzzy, c-format
msgid "Window Maker, Enlightenment, Fvwm, etc"
msgstr "Icewm, Window Maker, Enlightenment, Fvwm, eċċ"
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
#, fuzzy, c-format
msgid "Utilities"
msgstr "Filippini"
#: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
#, c-format
msgid "SSH Server"
msgstr "Server SSH"
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
#, fuzzy, c-format
msgid "Webmin"
msgstr "Webcam"
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
#, fuzzy, c-format
msgid "Webmin Remote Configuration Server"
msgstr "Konfigurazzjoni tat-Terminal Server"
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
#, fuzzy, c-format
msgid "Network Utilities/Monitoring"
msgstr "Monitoraġġ tan-network"
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
#, c-format
msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
msgstr ""
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
#, fuzzy, c-format
msgid "Mandriva Wizards"
msgstr "<b>Prodotti Mandriva</b>"
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
#, fuzzy, c-format
msgid "Wizards to configure server"
msgstr "Ma stajtx nikkonfigura l-printer \"%s\"!"
@@ -819,17 +778,17 @@ msgstr ""
msgid "Click on images in order to see a bigger preview"
msgstr ""
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
#, c-format
msgid "Package Group Selection"
msgstr "Għażla ta' gruppi ta' pakketti"
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
#, c-format
msgid "Individual package selection"
msgstr "Agħżel pakketti individwalment"
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
#, c-format
msgid "Total size: %d / %d MB"
msgstr "Daqs totali: %d / %d MB"
@@ -947,12 +906,12 @@ msgstr "Installazzjoni minima"
msgid "Software Management"
msgstr "Maniġġjar ta' softwer"
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
#, c-format
msgid "Choose the packages you want to install"
msgstr "Agħżel il-pakketti li trid tinstalla"
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
#, c-format
msgid "Installing"
msgstr "Qed ninstalla"
@@ -979,7 +938,7 @@ msgid_plural "%d packages"
msgstr[0] "%d pakketti"
msgstr[1] "%d pakketti"
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
#, c-format
msgid "Summary"
msgstr "Sommarju"
@@ -989,7 +948,7 @@ msgstr "Sommarju"
msgid "Configure"
msgstr "Ikkonfigura"
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
#, c-format
msgid "not configured"
msgstr "mhux konfigurat"
@@ -999,7 +958,7 @@ msgstr "mhux konfigurat"
msgid "Media Selection"
msgstr "Għażla ta' gruppi ta' pakketti"
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
#, c-format
msgid ""
"The following installation media have been found.\n"
@@ -1008,7 +967,7 @@ msgstr ""
"Dawn is-sorsi ta' installazzjoni instabu.\n"
"Jekk trid taqbeż uħud minnhom, tista' tneħħi l-marka issa."
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
#, c-format
msgid ""
"You have the option to copy the contents of the CDs onto the hard drive "
@@ -1017,7 +976,7 @@ msgid ""
"available once the system is fully installed."
msgstr ""
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
#, c-format
msgid "Copy whole CDs"
msgstr ""
@@ -1037,59 +996,49 @@ msgstr "Jekk jogħġbok agħżel tqassim tat-tastiera"
msgid "Here is the full list of available keyboards:"
msgstr "Din hi lista sħiħa tat-tastieri disponibbli"
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
#, c-format
msgid "Install/Upgrade"
msgstr "Installa/Aġġorna"
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
#, c-format
msgid "Is this an install or an upgrade?"
msgstr "Din hija installazzjoni ġdida jew aġġornament?"
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
#, fuzzy, c-format
msgid ""
"_: This is a noun:\n"
"Install"
msgstr "Installa"
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
#, c-format
msgid "Upgrade %s"
msgstr "Aġġorna %s"
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
#, c-format
msgid "Encryption key for %s"
msgstr "Ċifrarju għal %s"
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
#, c-format
msgid "Cancel installation, reboot system"
msgstr ""
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
#, fuzzy, c-format
msgid "New Installation"
msgstr "Qed ninstalla"
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
#, c-format
msgid "Upgrade previous installation (not recommended)"
msgstr ""
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
#, c-format
msgid ""
"Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1101,17 +1050,17 @@ msgid ""
"Installation\"."
msgstr ""
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "IDE"
msgstr "IDE"
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "Configuring IDE"
msgstr "Qed nikkonfigura IDE"
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
#, c-format
msgid ""
"No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1120,7 +1069,7 @@ msgstr ""
"M'hemmx spazju għal bootstrap ta' 1MB. L-installazzjoni se tkompli, imma "
"biex tħaddem is-sistema trid toħloq partizzjoni bootstrap f' Diskdrake."
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
#, fuzzy, c-format
msgid ""
"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1130,7 +1079,7 @@ msgstr ""
"M'hemmx spazju għal bootstrap ta' 1MB. L-installazzjoni se tkompli, imma "
"biex tħaddem is-sistema trid toħloq partizzjoni bootstrap f' Diskdrake."
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
#, c-format
msgid ""
"Change your Cd-Rom!\n"
@@ -1145,19 +1094,19 @@ msgstr ""
"Jekk m'għandekx din id-diska, agħfas \"Ikkanċella\" biex taqbeż il-pakketti "
"li qegħdin fuqha."
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
#, c-format
msgid "Looking for available packages..."
msgstr "Qed insib pakketti disponibbli"
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
#, c-format
msgid ""
"Your system does not have enough space left for installation or upgrade (%"
"dMB > %dMB)"
msgstr ""
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
#, fuzzy, c-format
msgid ""
"Please choose load or save package selection.\n"
@@ -1166,52 +1115,52 @@ msgstr ""
"Jekk jogħġbok agħżel \"ikteb\" jew \"aqra\" l-għażla tal-pakketti fuq\n"
"flopi. Il-format huwa l-istess bħal diski flopi ġenerati bl-auto_install."
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, fuzzy, c-format
msgid "Load"
msgstr "XLoad"
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Save"
msgstr "Ikteb"
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
#, fuzzy, c-format
msgid "Bad file"
msgstr "fajl veru"
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
#, fuzzy, c-format
msgid "KDE"
msgstr "IDE"
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
#, c-format
msgid "GNOME"
msgstr "GNOME"
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
#, fuzzy, c-format
msgid "Desktop Selection"
msgstr "Għażla ta' gruppi ta' pakketti"
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
#, c-format
msgid "You can choose your workstation desktop profile."
msgstr ""
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
#, c-format
msgid "Selected size is larger than available space"
msgstr "Id-daqs tal-għażla huwa ikbar mill-ispazju disponibbli"
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
#, c-format
msgid "Type of install"
msgstr "Tip ta' installazzjoni"
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
#, c-format
msgid ""
"You have not selected any group of packages.\n"
@@ -1220,82 +1169,82 @@ msgstr ""
"Għadek m'għażilt ebda grupp ta' pakketti\n"
"Jekk jogħġbok agħżel installazzjoni minima li trid:"
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
#, c-format
msgid "With X"
msgstr "Bl-XWindows"
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
#, c-format
msgid "With basic documentation (recommended!)"
msgstr "B' dokumentazzjoni bażika (rakkomandat)"
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
#, c-format
msgid "Truly minimal install (especially no urpmi)"
msgstr "Installazzjoni verament minima (mingħajr urpmi)"
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
#, c-format
msgid "Preparing installation"
msgstr "Qed nipprepara l-installazzjoni"
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
#, c-format
msgid "Installing package %s"
msgstr "Qed jinstalla il-pakkett %s"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "There was an error ordering packages:"
msgstr "Kien hemm problema fl-ordni tal-pakketti:"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "Go on anyway?"
msgstr "Trid tkompli xorta?"
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
#, c-format
msgid "Retry"
msgstr ""
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
#, c-format
msgid "Skip this package"
msgstr ""
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
#, c-format
msgid "Skip all packages from medium \"%s\""
msgstr ""
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
#, fuzzy, c-format
msgid "Go back to media and packages selection"
msgstr "Ikteb l-għażla ta' pakketti"
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
#, fuzzy, c-format
msgid "There was an error installing package %s."
msgstr "Kien hemm problema fl-installazzjoni tal-pakketti:"
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
#, c-format
msgid "Post-install configuration"
msgstr "Konfigurazzjoni ta' wara l-installazzjoni"
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
#, c-format
msgid "Please ensure the Update Modules media is in drive %s"
msgstr ""
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
#, c-format
msgid "Updates"
msgstr "Aġġornamenti"
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
#, c-format
msgid ""
"You now have the opportunity to download updated packages. These packages\n"
@@ -1318,28 +1267,28 @@ msgstr ""
"\n"
"Trid tinstalla dawn l-aġġornamenti?"
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
#, c-format
msgid "%s on %s"
msgstr "%s fuq %s"
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
#, c-format
msgid "Hardware"
msgstr "Ħardwer"
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
#, c-format
msgid "Sound card"
msgstr "Kard awdjo"
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
#, c-format
msgid "Do you have an ISA sound card?"
msgstr "Għandek kard tal-awdjo ISA?"
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
#, c-format
msgid ""
"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1348,69 +1297,69 @@ msgstr ""
"Ħaddem \"alsaconf\" jew \"sndconfig\" wara l-installazzjoni biex "
"tikkonfigura l-kard awdjo."
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
#, c-format
msgid "No sound card detected. Try \"harddrake\" after installation"
msgstr ""
"Ebda kard tal-awdjo ma nstabet. Ipprova ħaddem \"harddrake\" wara l-"
"installazzjoni"
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
#, c-format
msgid "Graphical interface"
msgstr "Interfaċċja grafika"
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
#, c-format
msgid "Network & Internet"
msgstr "Network u internet"
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
#, c-format
msgid "Proxies"
msgstr "Proxies"
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
#, c-format
msgid "configured"
msgstr "konfigurat"
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
#, c-format
msgid "Security Level"
msgstr "Livell ta' sigurtà"
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
#, c-format
msgid "Firewall"
msgstr "Firewallr"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "activated"
msgstr "attivat"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "disabled"
msgstr "mitfi"
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
#, c-format
msgid "You have not configured X. Are you sure you really want this?"
msgstr "Għadek ma kkonfigurajtx X. Żgur trid hekk?"
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
#, c-format
msgid "Preparing bootloader..."
msgstr "Qed nipprepara l-bootloader"
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
#, c-format
msgid "Be patient, this may take a while..."
msgstr ""
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
#, fuzzy, c-format
msgid ""
"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1423,7 +1372,7 @@ msgstr ""
"L-installazzjoni se tkompli, imma trid tuża BootX biex \n"
"ittella' l-Linux."
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
#, c-format
msgid ""
"In this security level, access to the files in the Windows partition is "
@@ -1432,17 +1381,17 @@ msgstr ""
"F'dan il-livell ta' sigurtà, l-aċċess għall-fajls fuq il-partizzjoni tal-"
"Windows huwa ristrett għall-amministratur."
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr "Daħħal flopi vojta fid-drajv %s"
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
#, c-format
msgid "Creating auto install floppy..."
msgstr "Qed jinħoloq flopi awto-installazzjoni"
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
#, c-format
msgid ""
"Some steps are not completed.\n"
@@ -1453,7 +1402,7 @@ msgstr ""
"\n"
"Trid toħroġ issa?"
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
#, c-format
msgid "Congratulations"
msgstr "Prosit"
@@ -1597,6 +1546,10 @@ msgid ""
"Exit"
msgstr "Oħroġ"
+#, fuzzy
+#~ msgid "Downloading file %s..."
+#~ msgstr "Qed nibgħat fajls..."
+
#~ msgid ""
#~ "You have selected the following server(s): %s\n"
#~ "\n"
diff --git a/perl-install/install/share/po/nb.po b/perl-install/install/share/po/nb.po
index 3783c6b81..4d94aaa6a 100644
--- a/perl-install/install/share/po/nb.po
+++ b/perl-install/install/share/po/nb.po
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: nb\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
"PO-Revision-Date: 2009-04-07 19:11+0200\n"
"Last-Translator: Olav Dahlum <odahlum@gmail.com>\n"
"Language-Team: Norwegian Bokmål <cooker-i18n@mandrivalinux.org>\n"
@@ -30,31 +30,6 @@ msgstr ""
"X-Generator: Lokalize 0.3\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr "Ditt skrivebord på en USB-penn"
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr "Den hundre prosent åpen kildekode-distribusjonen, Mandriva Linux"
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr "Utforsk lett Linux med Mandriva One"
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr "Et komplett Mandriva Linux-skrivebord"
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr "Mandriva: distribusjonen for alles behov"
-
#: any.pm:109
#, c-format
msgid "Do you have further supplementary media?"
@@ -94,24 +69,25 @@ msgstr "Nettverk (FTP)"
msgid "Network (NFS)"
msgstr "Nettverk (NFS)"
-#: any.pm:163
+#: any.pm:165
#, c-format
msgid "URL of the mirror?"
msgstr "Nettadresse til speilet?"
-#: any.pm:169
+#: any.pm:171
#, c-format
msgid "URL must start with ftp:// or http://"
msgstr "URL må starte med ftp:// eller http://"
-#: any.pm:180
+#: any.pm:182
#, c-format
-msgid "Contacting Mandriva Linux web site to get the list of available mirrors..."
+msgid ""
+"Contacting Mandriva Linux web site to get the list of available mirrors..."
msgstr ""
"Kontakter nettstedet til Mandriva Linux for å få listen over tilgjengelige "
"speil..."
-#: any.pm:185
+#: any.pm:187
#, c-format
msgid ""
"Failed contacting Mandriva Linux web site to get the list of available "
@@ -120,47 +96,47 @@ msgstr ""
"Klarte ikke å kontakte nettstedet til Mandriva Linux for å få listen over "
"tilgjengelige speil"
-#: any.pm:195
+#: any.pm:197
#, c-format
msgid "Choose a mirror from which to get the packages"
msgstr "Velg et speil som pakkene kan hentes fra"
-#: any.pm:225
+#: any.pm:227
#, c-format
msgid "NFS setup"
msgstr "NFS-oppsett"
-#: any.pm:226
+#: any.pm:228
#, c-format
msgid "Please enter the hostname and directory of your NFS media"
msgstr "Tast inn vertsnavnet og mappen til ditt NFS-medie"
-#: any.pm:230
+#: any.pm:232
#, c-format
msgid "Hostname missing"
msgstr "Vertsnavn mangler"
-#: any.pm:231
+#: any.pm:233
#, c-format
msgid "Directory must begin with \"/\""
msgstr "Mappenavnet må starte med \"/\""
-#: any.pm:235
+#: any.pm:237
#, c-format
msgid "Hostname of the NFS mount ?"
msgstr "Vertsnavn til NFS-monteringen ?"
-#: any.pm:236
+#: any.pm:238
#, c-format
msgid "Directory"
msgstr "Katalog"
-#: any.pm:258
+#: any.pm:260
#, c-format
msgid "Supplementary"
msgstr "Ekstra"
-#: any.pm:293
+#: any.pm:295
#, c-format
msgid ""
"Can't find a package list file on this mirror. Make sure the location is "
@@ -169,22 +145,22 @@ msgstr ""
"Kan ikke finne pakkelistefil på dette speilet. Kontrollér at adressen er "
"riktig."
-#: any.pm:328
+#: any.pm:334
#, c-format
msgid "Looking at packages already installed..."
msgstr "Ser på pakker som allerede er installert..."
-#: any.pm:362
+#: any.pm:368
#, c-format
msgid "Finding packages to upgrade..."
msgstr "Finner pakker som skal oppgraderes..."
-#: any.pm:381
+#: any.pm:387
#, c-format
msgid "Removing packages prior to upgrade..."
msgstr "Fjerner pakker før oppgradering..."
-#: any.pm:402
+#: any.pm:408
#, c-format
msgid ""
"You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -195,27 +171,32 @@ msgid ""
"To upgrade with KDE 3.5 and your personal settings preserved, \n"
"please reboot your system and upgrade using the Mandriva update applet."
msgstr ""
-"Du har bestemt deg for å oppgradere systemet ditt til %s. KDE 3.5 ble oppdaget <br> på systemet ditt. Dette installasjonsprogrammet kan ikke ta vare på KDE 3.5 i en oppgradering. Hvis du velger å fortsette vil KDE 3 byttes ut med KDE 4 og du vil miste alle dine personlige KDE-innstillinger . <br> Vær vennlig å starte systemet på nytt for å oppgradere med Mandrivas panelverktøy for oppgradering hvis du vil beholde KDE 3.5 og dine personlige innstillinger."
"Du har bestemt deg for å oppgradere systemet ditt til %s. KDE 3.5 ble "
"oppdaget <br> på systemet ditt. Dette installasjonsprogrammet kan ikke ta "
"vare på KDE 3.5 i en oppgradering. Hvis du velger å fortsette vil KDE 3 "
"byttes ut med KDE 4 og du vil miste alle dine personlige KDE-innstillinger . "
"<br> Vær vennlig å starte systemet på nytt for å oppgradere med Mandrivas "
"panelverktøy for oppgradering hvis du vil beholde KDE 3.5 og dine personlige "
-"innstillinger."
+"innstillinger.Du har bestemt deg for å oppgradere systemet ditt til %s. KDE "
+"3.5 ble oppdaget <br> på systemet ditt. Dette installasjonsprogrammet kan "
+"ikke ta vare på KDE 3.5 i en oppgradering. Hvis du velger å fortsette vil "
+"KDE 3 byttes ut med KDE 4 og du vil miste alle dine personlige KDE-"
+"innstillinger . <br> Vær vennlig å starte systemet på nytt for å oppgradere "
+"med Mandrivas panelverktøy for oppgradering hvis du vil beholde KDE 3.5 og "
+"dine personlige innstillinger."
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
#, c-format
msgid "Reboot"
msgstr "Restart"
-#: any.pm:407
+#: any.pm:413
#, c-format
msgid "Proceed"
msgstr "Fortsett"
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -229,72 +210,72 @@ msgstr ""
" \n"
"Ønsker du å fjerne disse pakkene?\n"
-#: any.pm:815
+#: any.pm:821
#, c-format
msgid "Error reading file %s"
msgstr "Feil ved lesing av fil %s"
-#: any.pm:1022
+#: any.pm:1028
#, c-format
msgid "The following disk(s) were renamed:"
msgstr "De(n) følgende disken(e) fikk nytt navn:"
-#: any.pm:1024
+#: any.pm:1030
#, c-format
msgid "%s (previously named as %s)"
msgstr "%s (tidligere kalt %s)"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "HTTP"
msgstr "HTTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "FTP"
msgstr "FTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "NFS"
msgstr "NFS"
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
#, c-format
msgid "Network"
msgstr "Nettverk"
-#: any.pm:1104
+#: any.pm:1110
#, c-format
msgid "Please choose a media"
msgstr "Velg et medie"
-#: any.pm:1120
+#: any.pm:1126
#, c-format
msgid "File already exists. Overwrite it?"
msgstr "Filen eksisterer allerede. Overskriv?"
-#: any.pm:1124
+#: any.pm:1130
#, c-format
msgid "Permission denied"
msgstr "Adgang nektet"
-#: any.pm:1172
+#: any.pm:1178
#, c-format
msgid "Bad NFS name"
msgstr "Ugyldig NFS-navn"
-#: any.pm:1193
+#: any.pm:1199
#, c-format
msgid "Bad media %s"
msgstr "Feil på media %s"
-#: any.pm:1236
+#: any.pm:1242
#, c-format
msgid "Can not make screenshots before partitioning"
msgstr "Jeg kan ikke ta skjembilder før partisjonering."
-#: any.pm:1244
+#: any.pm:1250
#, c-format
msgid "Screenshots will be available after install in %s"
msgstr "Skjermbilder vil være tilgjengelig etter installasjon i %s"
@@ -305,11 +286,15 @@ msgid "Installation"
msgstr "Installasjon"
#: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
#, c-format
msgid "Configuration"
msgstr "Oppsett"
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
#: install2.pm:168
#, c-format
msgid "You must also format %s"
@@ -334,22 +319,22 @@ msgstr "Henter opp nettverket"
msgid "Bringing down the network"
msgstr "Tar ned nettverket"
-#: media.pm:402
+#: media.pm:399
#, c-format
msgid "Please wait, retrieving file"
msgstr "Vennligst vent, henter fil"
-#: media.pm:734
+#: media.pm:718
#, c-format
-msgid "Downloading file %s..."
-msgstr "Laster ned fil %s..."
+msgid "unable to add medium"
+msgstr ""
-#: media.pm:822
+#: media.pm:758
#, c-format
msgid "Copying some packages on disks for future use"
msgstr "Kopiér noen pakker på disken for framtidig bruk"
-#: media.pm:875
+#: media.pm:811
#, c-format
msgid "Copying in progress"
msgstr "Kopiering pågår"
@@ -393,27 +378,27 @@ msgstr ""
msgid "An error occurred:"
msgstr "En feil oppstod:"
-#: pkgs.pm:776
+#: pkgs.pm:780
#, c-format
msgid "%d installation transactions failed"
msgstr "%d mislykket installasjonstransaksjon"
-#: pkgs.pm:777
+#: pkgs.pm:781
#, c-format
msgid "Installation of packages failed:"
msgstr "Installasjon av pakker feilet:"
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
#, c-format
msgid "Workstation"
msgstr "Arbeidsstasjon"
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
#, c-format
msgid "Office Workstation"
msgstr "Kontorarbeidsstasjon"
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
#, c-format
msgid ""
"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -422,7 +407,7 @@ msgstr ""
"Kontorstøtteprogrammer: tekstbehandlere (OpenOffice.org Writer, Kword), "
"regneark (OpenOffice.org Calc, Kspread), PDF-framvisere, etc"
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
#, c-format
msgid ""
"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -431,32 +416,32 @@ msgstr ""
"Kontorstøtteprogrammer: tekstbehandlere (kword, abiword), regneark (kspread, "
"gnumeric), pdf-framvisere etc"
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
#, c-format
msgid "Game station"
msgstr "Spillstasjon"
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
#, c-format
msgid "Amusement programs: arcade, boards, strategy, etc"
msgstr "Underholdningsprogrammer: arkade, brettspill, strategi, etc"
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
#, c-format
msgid "Multimedia station"
msgstr "Multimediastasjon"
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
#, c-format
msgid "Sound and video playing/editing programs"
msgstr "Lyd- og videoavspilling/redigeringsprogrammer"
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
#, c-format
msgid "Internet station"
msgstr "Internettstasjon"
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
#, c-format
msgid ""
"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -465,211 +450,193 @@ msgstr ""
"Sett med verktøy for å lese og sende e-post og njus (mutt, tin..) og til å "
"surfe på nettet"
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
#, c-format
msgid "Network Computer (client)"
msgstr "Nettverksmaskin (klient)"
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
#, c-format
msgid "Clients for different protocols including ssh"
msgstr "Klienter for forskjellige protokoller inkludert ssh"
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
#, c-format
msgid "Tools to ease the configuration of your computer"
msgstr "Verktøy for å forenkle oppsettet av maskinen din"
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
#, c-format
msgid "Console Tools"
msgstr "Konsollverktøy"
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
#, c-format
msgid "Editors, shells, file tools, terminals"
msgstr "Tekstprogrammer, skall, filverktøy, terminaler"
#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
#, c-format
msgid "Development"
msgstr "Utvikling"
#: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
#, c-format
msgid "C and C++ development libraries, programs and include files"
msgstr "C- og C++-utviklingsbibliotek, -programmer og include-filer"
#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
#, c-format
msgid "Documentation"
msgstr "Dokumentasjon"
#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
#, c-format
msgid "Books and Howto's on Linux and Free Software"
msgstr "Bøker og Howto's om Linux og fri programvare"
#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
#, c-format
msgid "LSB"
msgstr "LSB"
#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
#, c-format
msgid "Linux Standard Base. Third party applications support"
msgstr "Linux Standard Base. Støtte for tredjeparts programvare"
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
#, c-format
msgid "Web Server"
msgstr "Webtjener"
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
#, c-format
msgid "Apache"
msgstr "Apache"
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
#, c-format
msgid "Groupware"
msgstr "Gruppevare"
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
#, c-format
msgid "Kolab Server"
msgstr "Kolab-tjener"
#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
#, c-format
msgid "Firewall/Router"
msgstr "Brannmur/ruter"
#: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
#, c-format
msgid "Internet gateway"
msgstr "Internett-gateway"
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
#, c-format
msgid "Mail/News"
msgstr "E-post/Njus"
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
#, c-format
msgid "Postfix mail server, Inn news server"
msgstr "Postfix e-posttjener, Inn njustjener"
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
#, c-format
msgid "Directory Server"
msgstr "Katalogtjener"
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
#, c-format
msgid "FTP Server"
msgstr "FTP-tjener"
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
#, c-format
msgid "ProFTPd"
msgstr "ProFTPd"
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
#, c-format
msgid "DNS/NIS"
msgstr "DNS/NIS"
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
#, c-format
msgid "Domain Name and Network Information Server"
msgstr "Domenenavn- og nettverksinformasjons-tjener"
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
#, c-format
msgid "File and Printer Sharing Server"
msgstr "Fil- og Skriverdelingstjener"
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
#, c-format
msgid "NFS Server, Samba server"
msgstr "NFS-Tjener, Samba-tjener"
#: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
#, c-format
msgid "Database"
msgstr "Database"
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
#, c-format
msgid "PostgreSQL and MySQL Database Server"
msgstr "PostgreSQL- og MySQL-databasetjener"
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
#, c-format
msgid "Web/FTP"
msgstr "Web/FTP"
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
#, c-format
msgid "Apache, Pro-ftpd"
msgstr "Apache, Pro-ftpd"
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
#, c-format
msgid "Mail"
msgstr "E-post"
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
#, c-format
msgid "Postfix mail server"
msgstr "Postfix e-posttjener"
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
#, c-format
msgid "PostgreSQL or MySQL database server"
msgstr "PostgreSQL eller MySQL-databasetjener"
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
#, c-format
msgid "Network Computer server"
msgstr "Nettverksmaskintjener"
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
#, c-format
msgid "NFS server, SMB server, Proxy server, ssh server"
msgstr "NFS-tjener, SMB-tjener, Proxy-tjener, SSH-tjener"
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
#, c-format
msgid "Graphical Environment"
msgstr "Grafisk miljø"
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
#, c-format
msgid "KDE Workstation"
msgstr "KDE-arbeidsstasjon"
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
#, c-format
msgid ""
"The K Desktop Environment, the basic graphical environment with a collection "
@@ -678,12 +645,12 @@ msgstr ""
"K Desktop Environment, grunnleggende grafisk miljø med en samling av "
"passende verktøy"
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
#, c-format
msgid "GNOME Workstation"
msgstr "GNOME-arbeidsstasjon"
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
#, c-format
msgid ""
"A graphical environment with user-friendly set of applications and desktop "
@@ -692,7 +659,7 @@ msgstr ""
"Et grafisk miljø med et brukervennlig sett av programmer og "
"skrivebordsverktøy"
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
#, c-format
msgid "LXDE Desktop"
msgstr "LXDE-skrivebord"
@@ -702,56 +669,56 @@ msgstr "LXDE-skrivebord"
msgid ""
"A lightweight & fast graphical environment with user-friendly set of "
"applications and desktop tools"
-msgstr "Et lettvekts og raskt grafisk miljø med et brukervennlig sett av programmer og skrivebordsverktøy"
+msgstr ""
+"Et lettvekts og raskt grafisk miljø med et brukervennlig sett av programmer "
+"og skrivebordsverktøy"
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
#, c-format
msgid "Other Graphical Desktops"
msgstr "Andre grafiske skrivebord"
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
#, c-format
msgid "Window Maker, Enlightenment, Fvwm, etc"
msgstr "Window Maker, Enlightenment, Fvwm etc"
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
#, c-format
msgid "Utilities"
msgstr "Verktøy"
#: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
#, c-format
msgid "SSH Server"
msgstr "SSH-tjener"
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
#, c-format
msgid "Webmin"
msgstr "Webmin"
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
#, c-format
msgid "Webmin Remote Configuration Server"
msgstr "Webmin Fjernadministrasjonstjener"
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
#, c-format
msgid "Network Utilities/Monitoring"
msgstr "Nettverks-verktøy/overvåkning"
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
#, c-format
msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
msgstr "Overvårkningsverktøy, prosessbokføring, tcpdump, nmap, ..."
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
#, c-format
msgid "Mandriva Wizards"
msgstr "Mandriva-veivisere"
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
#, c-format
msgid "Wizards to configure server"
msgstr "Veivisere til å sette opp tjener"
@@ -851,17 +818,17 @@ msgstr "Her er et forhåndsbilde av '%s'-skrivebordet."
msgid "Click on images in order to see a bigger preview"
msgstr "Klikk på bildene for å se et større forhåndsbilde"
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
#, c-format
msgid "Package Group Selection"
msgstr "Valg pakkegruppe"
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
#, c-format
msgid "Individual package selection"
msgstr "Individuelt pakkevalg"
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
#, c-format
msgid "Total size: %d / %d MB"
msgstr "Total størrelse: %d / %d MB"
@@ -980,12 +947,12 @@ msgstr "Minimal installasjon"
msgid "Software Management"
msgstr "Programvarehåndtering"
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
#, c-format
msgid "Choose the packages you want to install"
msgstr "Velg pakkene du ønsker å installere"
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
#, c-format
msgid "Installing"
msgstr "Installerer"
@@ -1012,7 +979,7 @@ msgid_plural "%d packages"
msgstr[0] "%d pakke"
msgstr[1] "%d pakker"
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
#, c-format
msgid "Summary"
msgstr "Oppsummering"
@@ -1022,7 +989,7 @@ msgstr "Oppsummering"
msgid "Configure"
msgstr "Sett opp"
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
#, c-format
msgid "not configured"
msgstr "ikke satt opp"
@@ -1032,7 +999,7 @@ msgstr "ikke satt opp"
msgid "Media Selection"
msgstr "Velg media"
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
#, c-format
msgid ""
"The following installation media have been found.\n"
@@ -1041,7 +1008,7 @@ msgstr ""
"Følgende installasjonsmedia har blitt funnet.\n"
"Hvis du vill hoppe over noen av de kan du velge de vekk nå."
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
#, c-format
msgid ""
"You have the option to copy the contents of the CDs onto the hard drive "
@@ -1054,7 +1021,7 @@ msgstr ""
"Den vil da fortsette fra harddisken og pakkene vil forbli tilgjengelige når "
"systemet er fullstendig installert."
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
#, c-format
msgid "Copy whole CDs"
msgstr "Kopiér hele CDer"
@@ -1074,59 +1041,49 @@ msgstr "Velg ditt tastaturoppsett"
msgid "Here is the full list of available keyboards:"
msgstr "Her er den komplette listen over tilgjengelige tastatur"
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
#, c-format
msgid "Install/Upgrade"
msgstr "Installer/Oppgrader"
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
#, c-format
msgid "Is this an install or an upgrade?"
msgstr "Er dette en installasjon eller en oppgradering?"
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
#, c-format
msgid ""
"_: This is a noun:\n"
"Install"
msgstr "Installér"
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
#, c-format
msgid "Upgrade %s"
msgstr "Oppgrader %s"
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr "Oppgradering fra en 32-bit til en 64-bit distribusjon er ikke støttet"
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr "Oppgradering fra en 64-bit til en 32-bit distribusjon er ikke støttet"
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
#, c-format
msgid "Encryption key for %s"
msgstr "Krypteringsnøkkel for %s"
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
#, c-format
msgid "Cancel installation, reboot system"
msgstr "Avbryt installasjonen, start systemet på nytt"
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
#, c-format
msgid "New Installation"
msgstr "Ny installasjon"
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
#, c-format
msgid "Upgrade previous installation (not recommended)"
msgstr "Oppgrader forrige versjon (ikke anbefalt)"
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
#, c-format
msgid ""
"Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1137,23 +1094,26 @@ msgid ""
"Warning : you should backup all your personal data before choosing \"New\n"
"Installation\"."
msgstr ""
-"Installasjonsprogrammet har oppdaget at du har et Mandriva Linux-system som ikke kan oppgraderes til %s.<br> <br> En ny installasjon som fjerner den forrige er anbefalt.<br> <br> Advarsel: du bør sikkerhetskopiere alle dine personlige data før du velger \"Ny installasjon\"."
"Installasjonsprogrammet har oppdaget at du har et Mandriva Linux-system som "
"ikke kan oppgraderes til %s.<br> <br> En ny installasjon som fjerner den "
"forrige er anbefalt.<br> <br> Advarsel: du bør sikkerhetskopiere alle dine "
-"personlige data før du velger \"Ny installasjon\"."
+"personlige data før du velger \"Ny installasjon\".Installasjonsprogrammet "
+"har oppdaget at du har et Mandriva Linux-system som ikke kan oppgraderes til "
+"%s.<br> <br> En ny installasjon som fjerner den forrige er anbefalt.<br> "
+"<br> Advarsel: du bør sikkerhetskopiere alle dine personlige data før du "
+"velger \"Ny installasjon\"."
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "IDE"
msgstr "IDE"
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "Configuring IDE"
msgstr "Setter opp IDE"
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
#, c-format
msgid ""
"No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1162,7 +1122,7 @@ msgstr ""
"Det er ikke plass for 1 MB bootstrap! Installasjonen vil fortsette, men for "
"å boote systemet ditt, må du lage en bootstrap-partisjon i DiskDrake"
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
#, c-format
msgid ""
"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1173,7 +1133,7 @@ msgstr ""
"å kunne starte systemet ditt vil du måtte opprette en bootstrap-partisjon i "
"DiskDrake"
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
#, c-format
msgid ""
"Change your Cd-Rom!\n"
@@ -1186,12 +1146,12 @@ msgstr ""
"Sett inn CDen merket «%s» i stasjonen og trykk Ok når du er ferdig.\n"
"Hvis du ikke har den, trykk Avbryt for å unngå installasjon fra denne CDen."
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
#, c-format
msgid "Looking for available packages..."
msgstr "Søker etter tilgjengelige pakker"
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
#, c-format
msgid ""
"Your system does not have enough space left for installation or upgrade (%"
@@ -1200,7 +1160,7 @@ msgstr ""
"Systemet har ikke nok gjenværende diskplass for installasjon eller "
"oppgradering (%dMB > %dMB)"
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
#, c-format
msgid ""
"Please choose load or save package selection.\n"
@@ -1209,54 +1169,54 @@ msgstr ""
"Velg lagre eller hent pakkevalg.\n"
"Formatet er det samme som for auto_install-genererte filer."
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Load"
msgstr "Last inn"
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Save"
msgstr "Lagre"
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
#, c-format
msgid "Bad file"
msgstr "Ødelagt fil"
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
#, c-format
msgid "KDE"
msgstr "KDE"
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
#, c-format
msgid "GNOME"
msgstr "GNOME"
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
#, c-format
msgid "Desktop Selection"
msgstr "Skrivebordsvalg"
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
#, c-format
msgid "You can choose your workstation desktop profile."
msgstr ""
"Her kan du velge skrivebordsprofilen for systemet: KDE, GNOME eller "
"skreddersydd"
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
#, c-format
msgid "Selected size is larger than available space"
msgstr "Valgt størrelse er større enn tilgjengelig plass"
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
#, c-format
msgid "Type of install"
msgstr "Type installasjon"
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
#, c-format
msgid ""
"You have not selected any group of packages.\n"
@@ -1265,82 +1225,82 @@ msgstr ""
"Du har ikke valgt noen pakkegrupper.\n"
"Velg den minimale installasjonen du ønsker:"
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
#, c-format
msgid "With X"
msgstr "Med X"
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
#, c-format
msgid "With basic documentation (recommended!)"
msgstr "Med grunnleggende dokumentasjon (anbefalt!)"
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
#, c-format
msgid "Truly minimal install (especially no urpmi)"
msgstr "Virkelig minimal installasjon (uten urpmi)"
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
#, c-format
msgid "Preparing installation"
msgstr "Forbereder installasjon"
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
#, c-format
msgid "Installing package %s"
msgstr "Installerer pakke %s"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "There was an error ordering packages:"
msgstr "Det var en feil ved endring av pakkenes rekkefølge:"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "Go on anyway?"
msgstr "Fortsett uansett?"
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
#, c-format
msgid "Retry"
msgstr "Prøv igjen"
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
#, c-format
msgid "Skip this package"
msgstr "Hopp over denne pakken"
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
#, c-format
msgid "Skip all packages from medium \"%s\""
msgstr "Hopp over alle pakker fra media \"%s\""
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
#, c-format
msgid "Go back to media and packages selection"
msgstr "Gå tilbake til valg av media og pakker"
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
#, c-format
msgid "There was an error installing package %s."
msgstr "Feil under installering av pakke %s"
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
#, c-format
msgid "Post-install configuration"
msgstr "Oppsett etter installering"
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
#, c-format
msgid "Please ensure the Update Modules media is in drive %s"
msgstr "Vennligst forsikre deg om at medie med oppdaterte moduler er i %s"
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
#, c-format
msgid "Updates"
msgstr "Oppdateringer"
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
#, c-format
msgid ""
"You now have the opportunity to download updated packages. These packages\n"
@@ -1352,34 +1312,35 @@ msgid ""
"\n"
"Do you want to install the updates?"
msgstr ""
-"Du har nå muligheten til å laste ned oppdaterte pakker. Dette er pakker som har blitt sluppet etter at distribusjonen ble lansert. Dette kan være enten sikkerhetsoppdateringer eller feilrettelser."
-"\n"
+"Du har nå muligheten til å laste ned oppdaterte pakker. Dette er pakker som "
+"har blitt sluppet etter at distribusjonen ble lansert. Dette kan være enten "
+"sikkerhetsoppdateringer eller feilrettelser.\n"
"For å laste ned disse pakkene må du ha en fungerende Internettoppkobling.\n"
"\n"
"Ønsker du å installere oppdateringene?"
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
#, c-format
msgid "%s on %s"
msgstr "%s på %s"
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
#, c-format
msgid "Hardware"
msgstr "Maskinvare"
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
#, c-format
msgid "Sound card"
msgstr "Lydkort"
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
#, c-format
msgid "Do you have an ISA sound card?"
msgstr "Har du et ISA-lydkort?"
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
#, c-format
msgid ""
"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1388,69 +1349,69 @@ msgstr ""
"Kjør «alsaconf» eller «sndconfig» etter installasjonen for å sette opp "
"lydkortet ditt"
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
#, c-format
msgid "No sound card detected. Try \"harddrake\" after installation"
msgstr "Lydkort ikke oppdaget. Prøv \"harddrake\" etter installasjonen"
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
#, c-format
msgid "Graphical interface"
msgstr "Grafisk grensesnitt"
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
#, c-format
msgid "Network & Internet"
msgstr "Nettverk & internett"
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
#, c-format
msgid "Proxies"
msgstr "Mellomtjenere"
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
#, c-format
msgid "configured"
msgstr "satt opp"
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
#, c-format
msgid "Security Level"
msgstr "Sikkerhetsnivå"
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
#, c-format
msgid "Firewall"
msgstr "Brannmur"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "activated"
msgstr "aktivert"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "disabled"
msgstr "deaktiver"
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
#, c-format
msgid "You have not configured X. Are you sure you really want this?"
msgstr ""
"Du har ikke satt opp det grafiske grensesnittet Xorg. Er du sikker på at du "
"ikke vil gjøre dette?"
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
#, c-format
msgid "Preparing bootloader..."
msgstr "Klargjør oppstartslaster..."
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
#, c-format
msgid "Be patient, this may take a while..."
msgstr "Vennligst vær tålmodig, dette kan ta en stund..."
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
#, c-format
msgid ""
"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1463,7 +1424,7 @@ msgstr ""
"du må bruke BootX eller andre måter for å starte din maskin. "
"Kjerneargumentet for root-filsystemet er: root=%s"
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
#, c-format
msgid ""
"In this security level, access to the files in the Windows partition is "
@@ -1472,17 +1433,17 @@ msgstr ""
"I dette sikkerhetsnivået er tilgang til Windows-partisjonen forbeholdt "
"administratoren."
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr "Sett inn en tom diskett i stasjon %s"
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
#, c-format
msgid "Creating auto install floppy..."
msgstr "Oppretter diskett for autoinstallasjon..."
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
#, c-format
msgid ""
"Some steps are not completed.\n"
@@ -1493,7 +1454,7 @@ msgstr ""
"\n"
"Ønsker du virkelig å avslutte nå?"
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
#, c-format
msgid "Congratulations"
msgstr "Gratulerer"
@@ -1637,4 +1598,28 @@ msgid ""
"Exit"
msgstr "Avslutt"
+#~ msgid "Your desktop on a USB key"
+#~ msgstr "Ditt skrivebord på en USB-penn"
+
+#~ msgid "The 100%% open source Mandriva Linux distribution"
+#~ msgstr "Den hundre prosent åpen kildekode-distribusjonen, Mandriva Linux"
+
+#~ msgid "Explore Linux easily with Mandriva One"
+#~ msgstr "Utforsk lett Linux med Mandriva One"
+
+#~ msgid "A full Mandriva Linux desktop, with support"
+#~ msgstr "Et komplett Mandriva Linux-skrivebord"
+
+#~ msgid "Mandriva: distributions for everybody's needs"
+#~ msgstr "Mandriva: distribusjonen for alles behov"
+
+#~ msgid "Downloading file %s..."
+#~ msgstr "Laster ned fil %s..."
+
+#~ msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
+#~ msgstr ""
+#~ "Oppgradering fra en 32-bit til en 64-bit distribusjon er ikke støttet"
+#~ msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
+#~ msgstr ""
+#~ "Oppgradering fra en 64-bit til en 32-bit distribusjon er ikke støttet"
diff --git a/perl-install/install/share/po/nl.po b/perl-install/install/share/po/nl.po
index 1c721c3f3..6eff0892e 100644
--- a/perl-install/install/share/po/nl.po
+++ b/perl-install/install/share/po/nl.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: DrakX\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
"PO-Revision-Date: 2009-04-05 20:05+0200\n"
"Last-Translator: Reinout van Schouwen <reinout@gmail.com>\n"
"Language-Team: Nederlands\n"
@@ -21,31 +21,6 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr "Uw bureaublad op een USB-stick"
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr "De 100%% opensource Mandriva Linux-distributie"
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr "Gemakkelijk Linux verkennen met Mandriva One"
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr "Een volledig Mandriva Linux-bureaublad, met ondersteuning"
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr "Mandriva-distributies: voor elk wat wils"
-
#: any.pm:109
#, c-format
msgid "Do you have further supplementary media?"
@@ -86,17 +61,17 @@ msgstr "Netwerk (FTP)"
msgid "Network (NFS)"
msgstr "Netwerk (NFS)"
-#: any.pm:163
+#: any.pm:165
#, c-format
msgid "URL of the mirror?"
msgstr "URL van de mirror?"
-#: any.pm:169
+#: any.pm:171
#, c-format
msgid "URL must start with ftp:// or http://"
msgstr "URL dient te starten met ftp:// of http://"
-#: any.pm:180
+#: any.pm:182
#, c-format
msgid ""
"Contacting Mandriva Linux web site to get the list of available mirrors..."
@@ -104,7 +79,7 @@ msgstr ""
"Bezig te verbinden met de Mandriva Linux-website om de lijst met beschikbare "
"mirrors op te halen…"
-#: any.pm:185
+#: any.pm:187
#, c-format
msgid ""
"Failed contacting Mandriva Linux web site to get the list of available "
@@ -113,47 +88,47 @@ msgstr ""
"Het verbinden met de Mandriva Linux-website om de lijst met beschikbare "
"mirrors op te halen is mislukt"
-#: any.pm:195
+#: any.pm:197
#, c-format
msgid "Choose a mirror from which to get the packages"
msgstr "Kies een mirror om de pakketten van af te halen"
-#: any.pm:225
+#: any.pm:227
#, c-format
msgid "NFS setup"
msgstr "NFS-configuratie"
-#: any.pm:226
+#: any.pm:228
#, c-format
msgid "Please enter the hostname and directory of your NFS media"
msgstr "Vul de hostnaam en map van uw NFS media in"
-#: any.pm:230
+#: any.pm:232
#, c-format
msgid "Hostname missing"
msgstr "Hostnaam ontbreekt"
-#: any.pm:231
+#: any.pm:233
#, c-format
msgid "Directory must begin with \"/\""
msgstr "Map dient te beginnen met \"/\""
-#: any.pm:235
+#: any.pm:237
#, c-format
msgid "Hostname of the NFS mount ?"
msgstr "Hostnaam van het NFS-koppelpunt?"
-#: any.pm:236
+#: any.pm:238
#, c-format
msgid "Directory"
msgstr "Map"
-#: any.pm:258
+#: any.pm:260
#, c-format
msgid "Supplementary"
msgstr "Aanvullend"
-#: any.pm:293
+#: any.pm:295
#, c-format
msgid ""
"Can't find a package list file on this mirror. Make sure the location is "
@@ -162,22 +137,22 @@ msgstr ""
"Kan hdlist-bestand op deze mirror niet vinden. Controleer of de locatie "
"klopt."
-#: any.pm:328
+#: any.pm:334
#, c-format
msgid "Looking at packages already installed..."
msgstr "Inventarisatie van reeds geïnstalleerde pakketten…"
-#: any.pm:362
+#: any.pm:368
#, c-format
msgid "Finding packages to upgrade..."
msgstr "Zoeken naar pakketten om op te waarderen…"
-#: any.pm:381
+#: any.pm:387
#, c-format
msgid "Removing packages prior to upgrade..."
msgstr "Verwijderen van pakketten vóór opwaardering..."
-#: any.pm:402
+#: any.pm:408
#, c-format
msgid ""
"You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -198,18 +173,18 @@ msgstr ""
"gelieve uw systeem te herstarten en op te waarderen met behulp van het "
"Mandriva-herzieningenapplet."
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
#, c-format
msgid "Reboot"
msgstr "Herstarten"
-#: any.pm:407
+#: any.pm:413
#, c-format
msgid "Proceed"
msgstr "Doorgaan"
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -223,72 +198,72 @@ msgstr ""
"\n"
"Weet u zeker dat u deze pakketten wilt verwijderen?\n"
-#: any.pm:815
+#: any.pm:821
#, c-format
msgid "Error reading file %s"
msgstr "Fout bij het lezen van bestand %s"
-#: any.pm:1022
+#: any.pm:1028
#, c-format
msgid "The following disk(s) were renamed:"
msgstr "De volgende schijf/schijven zijn hernoemd:"
-#: any.pm:1024
+#: any.pm:1030
#, c-format
msgid "%s (previously named as %s)"
msgstr "%s (heette voorheen %s)"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "HTTP"
msgstr "HTTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "FTP"
msgstr "FTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "NFS"
msgstr "NFS"
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
#, c-format
msgid "Network"
msgstr "Netwerk"
-#: any.pm:1104
+#: any.pm:1110
#, c-format
msgid "Please choose a media"
msgstr "Kies een medium"
-#: any.pm:1120
+#: any.pm:1126
#, c-format
msgid "File already exists. Overwrite it?"
msgstr "Bestand bestaat reeds. Overschrijven?"
-#: any.pm:1124
+#: any.pm:1130
#, c-format
msgid "Permission denied"
msgstr "Toegang geweigerd"
-#: any.pm:1172
+#: any.pm:1178
#, c-format
msgid "Bad NFS name"
msgstr "Slechte NFS naam"
-#: any.pm:1193
+#: any.pm:1199
#, c-format
msgid "Bad media %s"
msgstr "Ongeldig medium %s"
-#: any.pm:1236
+#: any.pm:1242
#, c-format
msgid "Can not make screenshots before partitioning"
msgstr "Kan geen schermafdruk maken voor het partitioneren"
-#: any.pm:1244
+#: any.pm:1250
#, c-format
msgid "Screenshots will be available after install in %s"
msgstr "Schermafdrukken zullen beschikbaar zijn na installatie in %s"
@@ -299,11 +274,15 @@ msgid "Installation"
msgstr "Installatie"
#: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
#, c-format
msgid "Configuration"
msgstr "Configuratie"
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
#: install2.pm:168
#, c-format
msgid "You must also format %s"
@@ -328,22 +307,22 @@ msgstr "Bezig met opstarten van het netwerk"
msgid "Bringing down the network"
msgstr "Bezig met stoppen van het netwerk"
-#: media.pm:402
+#: media.pm:399
#, c-format
msgid "Please wait, retrieving file"
msgstr "Even geduld, bestand wordt opgehaald"
-#: media.pm:734
+#: media.pm:718
#, c-format
-msgid "Downloading file %s..."
-msgstr "Bestand %s wordt gedownload…"
+msgid "unable to add medium"
+msgstr ""
-#: media.pm:822
+#: media.pm:758
#, c-format
msgid "Copying some packages on disks for future use"
msgstr "Kopiëren van enkele pakketten op diskettes voor toekomstig gebruik"
-#: media.pm:875
+#: media.pm:811
#, c-format
msgid "Copying in progress"
msgstr "Bezig met kopiëren"
@@ -387,27 +366,27 @@ msgstr ""
msgid "An error occurred:"
msgstr "Er is een fout opgetreden:"
-#: pkgs.pm:776
+#: pkgs.pm:780
#, c-format
msgid "%d installation transactions failed"
msgstr "%d installatie-transacties mislukt"
-#: pkgs.pm:777
+#: pkgs.pm:781
#, c-format
msgid "Installation of packages failed:"
msgstr "Installatie van pakketten mislukt:"
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
#, c-format
msgid "Workstation"
msgstr "Werkstation"
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
#, c-format
msgid "Office Workstation"
msgstr "Kantooromgeving"
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
#, c-format
msgid ""
"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -416,7 +395,7 @@ msgstr ""
"Kantoorprogramma's: tekstverwerkers (OpenOffice.org Writer, Kword), "
"rekenbladen (OpenOffice.org Calc, Kspread), PDF-lezers, etc"
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
#, c-format
msgid ""
"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -425,32 +404,32 @@ msgstr ""
"Kantoorprogramma's: tekstverwerkers (kword, abiword), rekenbladen (kspread, "
"gnumeric), PDF-lezers, etc"
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
#, c-format
msgid "Game station"
msgstr "Game-station"
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
#, c-format
msgid "Amusement programs: arcade, boards, strategy, etc"
msgstr "Amusementsprogramma's: arcade, bordspellen, strategie etc"
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
#, c-format
msgid "Multimedia station"
msgstr "Multimedia-station"
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
#, c-format
msgid "Sound and video playing/editing programs"
msgstr "Geluids- en video-afspeel- en bewerkingsprogramma's"
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
#, c-format
msgid "Internet station"
msgstr "Internet-station"
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
#, c-format
msgid ""
"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -459,211 +438,193 @@ msgstr ""
"Verzameling programma's om e-mail en usenet nieuws mee te lezen en te "
"schrijven, en om het Web mee door te bladeren"
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
#, c-format
msgid "Network Computer (client)"
msgstr "Netwerk-computer (client)"
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
#, c-format
msgid "Clients for different protocols including ssh"
msgstr "Clients voor verschillende protcollen waaronder ssh"
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
#, c-format
msgid "Tools to ease the configuration of your computer"
msgstr "Programma's om de configuratie van uw computer te vergemakkelijken"
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
#, c-format
msgid "Console Tools"
msgstr "Hulpprogramma's voor de opdrachtregel"
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
#, c-format
msgid "Editors, shells, file tools, terminals"
msgstr "Editors, shells, bestandsbeheer, terminals"
#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
#, c-format
msgid "Development"
msgstr "Ontwikkeling"
#: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
#, c-format
msgid "C and C++ development libraries, programs and include files"
msgstr "C and C++ ontwikkelingsbibliotheken, programma's en include-bestanden"
#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
#, c-format
msgid "Documentation"
msgstr "Documentatie"
#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
#, c-format
msgid "Books and Howto's on Linux and Free Software"
msgstr "Boeken en Howto's over Linux en Vrije Software"
#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
#, c-format
msgid "LSB"
msgstr "LSB"
#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
#, c-format
msgid "Linux Standard Base. Third party applications support"
msgstr "Linux Standaard-Basis. Ondersteuning voor toepassingen van derden."
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
#, c-format
msgid "Web Server"
msgstr "Webserver"
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
#, c-format
msgid "Apache"
msgstr "Apache"
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
#, c-format
msgid "Groupware"
msgstr "Groupware"
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
#, c-format
msgid "Kolab Server"
msgstr "Kolab-server"
#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
#, c-format
msgid "Firewall/Router"
msgstr "Firewall/Router"
#: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
#, c-format
msgid "Internet gateway"
msgstr "Internet gateway"
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
#, c-format
msgid "Mail/News"
msgstr "E-mail/nieuws"
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
#, c-format
msgid "Postfix mail server, Inn news server"
msgstr "Postfix e-mailserver, Inn newsserver"
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
#, c-format
msgid "Directory Server"
msgstr "Gidsserver"
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
#, c-format
msgid "FTP Server"
msgstr "FTP-server"
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
#, c-format
msgid "ProFTPd"
msgstr "ProFTPd"
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
#, c-format
msgid "DNS/NIS"
msgstr "DNS/NIS"
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
#, c-format
msgid "Domain Name and Network Information Server"
msgstr "Domeinnaam- en Network Information Server"
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
#, c-format
msgid "File and Printer Sharing Server"
msgstr "Gedeelde bestands- en printerserver"
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
#, c-format
msgid "NFS Server, Samba server"
msgstr "NFS-server, Samba-server"
#: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
#, c-format
msgid "Database"
msgstr "Database"
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
#, c-format
msgid "PostgreSQL and MySQL Database Server"
msgstr "PostgreSQL en MySQL database-server"
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
#, c-format
msgid "Web/FTP"
msgstr "Web/FTP"
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
#, c-format
msgid "Apache, Pro-ftpd"
msgstr "Apache, Pro-ftpd"
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
#, c-format
msgid "Mail"
msgstr "E-mail"
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
#, c-format
msgid "Postfix mail server"
msgstr "Postfix e-mailserver"
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
#, c-format
msgid "PostgreSQL or MySQL database server"
msgstr "PostgreSQL of MySQL database-server"
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
#, c-format
msgid "Network Computer server"
msgstr "Netwerk-computer server"
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
#, c-format
msgid "NFS server, SMB server, Proxy server, ssh server"
msgstr "NFS server, SMB server, Proxy server, ssh server"
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
#, c-format
msgid "Graphical Environment"
msgstr "Grafische omgeving"
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
#, c-format
msgid "KDE Workstation"
msgstr "KDE-werkomgeving"
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
#, c-format
msgid ""
"The K Desktop Environment, the basic graphical environment with a collection "
@@ -672,12 +633,12 @@ msgstr ""
"Het K Desktop Environment, de basis-grafische omgeving met een verzameling "
"van bijbehorende programma's"
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
#, c-format
msgid "GNOME Workstation"
msgstr "GNOME-werkomgeving"
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
#, c-format
msgid ""
"A graphical environment with user-friendly set of applications and desktop "
@@ -686,7 +647,7 @@ msgstr ""
"Een grafische omgeving met gebruikersvriendelijke verzameling toepassingen "
"en bureaublad-programma's"
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
#, c-format
msgid "LXDE Desktop"
msgstr "LXDE-werkomgeving"
@@ -697,57 +658,55 @@ msgid ""
"A lightweight & fast graphical environment with user-friendly set of "
"applications and desktop tools"
msgstr ""
-"Een lichtgewicht- en snelle grafische omgeving met gebruiksvriendelijke set toepassingen "
-"en bureaublad-programma's"
+"Een lichtgewicht- en snelle grafische omgeving met gebruiksvriendelijke set "
+"toepassingen en bureaublad-programma's"
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
#, c-format
msgid "Other Graphical Desktops"
msgstr "Andere grafische omgevingen"
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
#, c-format
msgid "Window Maker, Enlightenment, Fvwm, etc"
msgstr "Window Maker, Enlightenment, Fvwm, etc"
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
#, c-format
msgid "Utilities"
msgstr "Hulpprogramma's"
#: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
#, c-format
msgid "SSH Server"
msgstr "SSH-server"
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
#, c-format
msgid "Webmin"
msgstr "Webmin"
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
#, c-format
msgid "Webmin Remote Configuration Server"
msgstr "Webmin-server voor configuratie op afstand"
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
#, c-format
msgid "Network Utilities/Monitoring"
msgstr "Netwerk-hulpprogramma's/observatie"
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
#, c-format
msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
msgstr "Observatieprogramma's, bijhouden van processen, tcpdump, nmap, ..."
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
#, c-format
msgid "Mandriva Wizards"
msgstr "Mandriva-wizards"
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
#, c-format
msgid "Wizards to configure server"
msgstr "Wizards om server te configureren"
@@ -847,17 +806,17 @@ msgstr "Hier is een voorproefje van de '%s'-werkomgeving."
msgid "Click on images in order to see a bigger preview"
msgstr "Klik op het beeld voor een grotere versie"
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
#, c-format
msgid "Package Group Selection"
msgstr "Pakketgroepselectie"
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
#, c-format
msgid "Individual package selection"
msgstr "Individuele pakketselectie"
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
#, c-format
msgid "Total size: %d / %d MB"
msgstr "Totale grootte: %d / %d MB"
@@ -977,12 +936,12 @@ msgstr "Minimale installatie"
msgid "Software Management"
msgstr "Softwarebeheer"
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
#, c-format
msgid "Choose the packages you want to install"
msgstr "Kies de pakketten die u wenst te installeren"
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
#, c-format
msgid "Installing"
msgstr "Installeren"
@@ -1009,7 +968,7 @@ msgid_plural "%d packages"
msgstr[0] "%d pakket"
msgstr[1] "%d pakketten"
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
#, c-format
msgid "Summary"
msgstr "Overzicht"
@@ -1019,7 +978,7 @@ msgstr "Overzicht"
msgid "Configure"
msgstr "Configureren"
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
#, c-format
msgid "not configured"
msgstr "niet geconfigureerd"
@@ -1029,7 +988,7 @@ msgstr "niet geconfigureerd"
msgid "Media Selection"
msgstr "Mediaselectie"
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
#, c-format
msgid ""
"The following installation media have been found.\n"
@@ -1038,7 +997,7 @@ msgstr ""
"De volgende installatiemedia zijn gevonden.\n"
"Indien u sommige wilt overslaan, kunt u ze nu deselecteren."
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
#, c-format
msgid ""
"You have the option to copy the contents of the CDs onto the hard drive "
@@ -1051,7 +1010,7 @@ msgstr ""
"De installatie gaat dan door vanaf de harde schijf en de pakketten blijven "
"beschikbaar zodra het systeem volledig geïnstalleerd is."
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
#, c-format
msgid "Copy whole CDs"
msgstr "Hele cd's kopiëren"
@@ -1071,61 +1030,49 @@ msgstr "Kies uw toetsenbord-indeling"
msgid "Here is the full list of available keyboards:"
msgstr "Dit is de volledige lijst van beschikbare toetsenborden:"
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
#, c-format
msgid "Install/Upgrade"
msgstr "Installatie/Opwaardering"
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
#, c-format
msgid "Is this an install or an upgrade?"
msgstr "Wilt u opwaarderen of een nieuwe installatie uitvoeren?"
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
#, c-format
msgid ""
"_: This is a noun:\n"
"Install"
msgstr "Installatie"
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
#, c-format
msgid "Upgrade %s"
msgstr "%s opwaarderen"
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr ""
-"Opwaarderen van een 32-bit naar een 64-bit-distributie wordt niet ondersteund"
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr ""
-"Opwaarderen van een 64-bit naar een 32-bit-distributie wordt niet ondersteund"
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
#, c-format
msgid "Encryption key for %s"
msgstr "Vercijferingssleutel voor %s"
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
#, c-format
msgid "Cancel installation, reboot system"
msgstr "Installatie afbreken, systeem herstarten"
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
#, c-format
msgid "New Installation"
msgstr "Nieuwe installatie"
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
#, c-format
msgid "Upgrade previous installation (not recommended)"
msgstr "Bestaande installatie opwaarderen (niet aanbevolen)"
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
#, c-format
msgid ""
"Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1146,17 +1093,17 @@ msgstr ""
"alvorens\n"
"\"Nieuwe installatie\" te kiezen."
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "IDE"
msgstr "IDE"
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "Configuring IDE"
msgstr "IDE-Configuratie"
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
#, c-format
msgid ""
"No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1166,7 +1113,7 @@ msgstr ""
"doorgaan, maar om uw systeem op te starten zult u de bootstrap partitie in "
"DiskDrake moeten creëren."
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
#, c-format
msgid ""
"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1177,7 +1124,7 @@ msgstr ""
"gaan, maar om uw systeem op te starten zult u de bootstrappartitie in "
"DiskDrake moeten creëren."
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
#, c-format
msgid ""
"Change your Cd-Rom!\n"
@@ -1192,12 +1139,12 @@ msgstr ""
"Als u deze CD niet heeft, klik dan Annuleren om verdere installatie vanaf "
"deze CD te vermijden."
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
#, c-format
msgid "Looking for available packages..."
msgstr "Bezig met zoeken naar beschikbare pakketten"
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
#, c-format
msgid ""
"Your system does not have enough space left for installation or upgrade (%"
@@ -1206,7 +1153,7 @@ msgstr ""
"Uw systeem heeft niet genoeg ruimte over voor installatie of opwaardering (%"
"dMB > %dMB)"
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
#, c-format
msgid ""
"Please choose load or save package selection.\n"
@@ -1215,52 +1162,52 @@ msgstr ""
"U kunt kiezen of u de pakketselectie wilt laden of opslaan.\n"
"Het formaat is dezelfde als de met auto_install gegenereerde bestanden."
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Load"
msgstr "Laden"
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Save"
msgstr "Opslaan"
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
#, c-format
msgid "Bad file"
msgstr "Ongeldig bestand"
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
#, c-format
msgid "KDE"
msgstr "KDE"
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
#, c-format
msgid "GNOME"
msgstr "Gnome"
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
#, c-format
msgid "Desktop Selection"
msgstr "Werkomgevingselectie"
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
#, c-format
msgid "You can choose your workstation desktop profile."
msgstr "U kunt de grafische omgeving voor uw werkstation kiezen."
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
#, c-format
msgid "Selected size is larger than available space"
msgstr "De geselecteerde grootte is meer dan de beschikbare ruimte"
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
#, c-format
msgid "Type of install"
msgstr "Type installatie"
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
#, c-format
msgid ""
"You have not selected any group of packages.\n"
@@ -1269,82 +1216,82 @@ msgstr ""
"U heeft geen enkele pakketgroep geselecteerd\n"
"Gelieve de minimale installatie die u wenst te kiezen."
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
#, c-format
msgid "With X"
msgstr "Met X"
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
#, c-format
msgid "With basic documentation (recommended!)"
msgstr "Met basis-documentatie (aanbevolen!)"
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
#, c-format
msgid "Truly minimal install (especially no urpmi)"
msgstr "Werkelijk minimale installatie (in het bijzonder geen urpmi)"
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
#, c-format
msgid "Preparing installation"
msgstr "Bezig met voorbereiden van installatie"
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
#, c-format
msgid "Installing package %s"
msgstr "Bezig met installeren van pakket %s"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "There was an error ordering packages:"
msgstr "Er is een fout opgetreden bij het sorteren van de pakketten:"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "Go on anyway?"
msgstr "Toch verdergaan?"
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
#, c-format
msgid "Retry"
msgstr "Opnieuw proberen"
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
#, c-format
msgid "Skip this package"
msgstr "Dit pakket overslaan"
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
#, c-format
msgid "Skip all packages from medium \"%s\""
msgstr "Alle pakketten van medium ‘%s’ overslaan"
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
#, c-format
msgid "Go back to media and packages selection"
msgstr "Terug naar media- en pakketselectie"
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
#, c-format
msgid "There was an error installing package %s."
msgstr "Er is een fout opgetreden bij het installeren van pakket %s."
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
#, c-format
msgid "Post-install configuration"
msgstr "Configuratie na installatiestap"
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
#, c-format
msgid "Please ensure the Update Modules media is in drive %s"
msgstr "Zorg ervoor dat de Update Modules-media zich in station %s bevindt"
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
#, c-format
msgid "Updates"
msgstr "Updates"
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
#, c-format
msgid ""
"You now have the opportunity to download updated packages. These packages\n"
@@ -1364,28 +1311,28 @@ msgstr ""
"\n"
"Wenst u de bijgewerkte pakketten te installeren?"
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
#, c-format
msgid "%s on %s"
msgstr "%s op %s"
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
#, c-format
msgid "Hardware"
msgstr "Apparatuur"
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
#, c-format
msgid "Sound card"
msgstr "Geluidskaart"
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
#, c-format
msgid "Do you have an ISA sound card?"
msgstr "Heeft u een ISA geluidskaart?"
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
#, c-format
msgid ""
"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1394,67 +1341,67 @@ msgstr ""
"Voer \"alsaconf\" of \"sndconfig\" na de installatie uit om uw geluidskaart "
"te configureren"
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
#, c-format
msgid "No sound card detected. Try \"harddrake\" after installation"
msgstr "Geen geluidskaart bespeurd. Probeer \"harddrake\" na de installatie"
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
#, c-format
msgid "Graphical interface"
msgstr "Grafische interface"
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
#, c-format
msgid "Network & Internet"
msgstr "Netwerk & internet"
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
#, c-format
msgid "Proxies"
msgstr "Proxy's"
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
#, c-format
msgid "configured"
msgstr "geconfigureerd"
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
#, c-format
msgid "Security Level"
msgstr "Beveiligingsniveau"
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
#, c-format
msgid "Firewall"
msgstr "Firewall"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "activated"
msgstr "geactiveerd"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "disabled"
msgstr "uitgeschakeld"
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
#, c-format
msgid "You have not configured X. Are you sure you really want this?"
msgstr "U heeft X niet geconfigureerd. Weet u zeker dat u dit wilt?"
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
#, c-format
msgid "Preparing bootloader..."
msgstr "Klaarmaken van opstartlader…"
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
#, c-format
msgid "Be patient, this may take a while..."
msgstr "Een moment geduld, dit kan even duren…"
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
#, c-format
msgid ""
"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1468,7 +1415,7 @@ msgstr ""
"starten. Het argument om aan de kernel mee te geven voor het root-"
"bestandssysteem is: root=%s"
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
#, c-format
msgid ""
"In this security level, access to the files in the Windows partition is "
@@ -1477,17 +1424,17 @@ msgstr ""
"In dit beveiligingsniveau wordt toegang tot de bestanden op de Windows-"
"partitie voorbehouden aan de systeembeheerder."
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr "Plaats een lege diskette in station %s"
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
#, c-format
msgid "Creating auto install floppy..."
msgstr "Aanmaken van auto-installatiediskette…"
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
#, c-format
msgid ""
"Some steps are not completed.\n"
@@ -1498,7 +1445,7 @@ msgstr ""
"\n"
"Weet u zeker dat u op dit moment wilt afsluiten?"
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
#, c-format
msgid "Congratulations"
msgstr "Gefeliciteerd"
@@ -1642,6 +1589,34 @@ msgid ""
"Exit"
msgstr "Afsluiten"
+#~ msgid "Your desktop on a USB key"
+#~ msgstr "Uw bureaublad op een USB-stick"
+
+#~ msgid "The 100%% open source Mandriva Linux distribution"
+#~ msgstr "De 100%% opensource Mandriva Linux-distributie"
+
+#~ msgid "Explore Linux easily with Mandriva One"
+#~ msgstr "Gemakkelijk Linux verkennen met Mandriva One"
+
+#~ msgid "A full Mandriva Linux desktop, with support"
+#~ msgstr "Een volledig Mandriva Linux-bureaublad, met ondersteuning"
+
+#~ msgid "Mandriva: distributions for everybody's needs"
+#~ msgstr "Mandriva-distributies: voor elk wat wils"
+
+#~ msgid "Downloading file %s..."
+#~ msgstr "Bestand %s wordt gedownload…"
+
+#~ msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
+#~ msgstr ""
+#~ "Opwaarderen van een 32-bit naar een 64-bit-distributie wordt niet "
+#~ "ondersteund"
+
+#~ msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
+#~ msgstr ""
+#~ "Opwaarderen van een 64-bit naar een 32-bit-distributie wordt niet "
+#~ "ondersteund"
+
#~ msgid ""
#~ "You have selected the following server(s): %s\n"
#~ "\n"
diff --git a/perl-install/install/share/po/nn.po b/perl-install/install/share/po/nn.po
index ec5256d7a..5d00d575c 100644
--- a/perl-install/install/share/po/nn.po
+++ b/perl-install/install/share/po/nn.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: DrakX\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
"PO-Revision-Date: 2009-04-05 23:37+0200\n"
"Last-Translator: Karl Ove Hufthammer <karl@huftis.org>\n"
"Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -17,31 +17,6 @@ msgstr ""
"X-Generator: Lokalize 0.3\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr "Skrivebordet på ein minnepinne"
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr "Mandriva Linux-distribusjonen med 100 %% open kjeldekode"
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr "Utforsk Linux med Mandriva One"
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr "Eit fullt Mandriva Linux-skrivebord – med brukarstøtte"
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr "Mandriva: Distribusjonar for alle behov"
-
#: any.pm:109
#, c-format
msgid "Do you have further supplementary media?"
@@ -81,23 +56,23 @@ msgstr "Nettverk (FTP)"
msgid "Network (NFS)"
msgstr "Nettverk (NFS)"
-#: any.pm:163
+#: any.pm:165
#, c-format
msgid "URL of the mirror?"
msgstr "Adresse til spegelen?"
-#: any.pm:169
+#: any.pm:171
#, c-format
msgid "URL must start with ftp:// or http://"
msgstr "Adresser må starta med «ftp://» eller «http://»."
-#: any.pm:180
+#: any.pm:182
#, c-format
msgid ""
"Contacting Mandriva Linux web site to get the list of available mirrors..."
msgstr "Kontaktar Mandriva Linux-nettstaden for oversikt over speglar …"
-#: any.pm:185
+#: any.pm:187
#, c-format
msgid ""
"Failed contacting Mandriva Linux web site to get the list of available "
@@ -106,47 +81,47 @@ msgstr ""
"Klarte ikkje få kontakt med Mandriva Linux-nettstaden for å henta oversikt "
"over tilgjengelege speglar."
-#: any.pm:195
+#: any.pm:197
#, c-format
msgid "Choose a mirror from which to get the packages"
msgstr "Vel spegelen du vil installera pakkar frå"
-#: any.pm:225
+#: any.pm:227
#, c-format
msgid "NFS setup"
msgstr "NFS-oppsett"
-#: any.pm:226
+#: any.pm:228
#, c-format
msgid "Please enter the hostname and directory of your NFS media"
msgstr "Skriv inn vertsnamn og mappe til NFD-media"
-#: any.pm:230
+#: any.pm:232
#, c-format
msgid "Hostname missing"
msgstr "Manglar vertsnam"
-#: any.pm:231
+#: any.pm:233
#, c-format
msgid "Directory must begin with \"/\""
msgstr "Mappa må begynna med «/»"
-#: any.pm:235
+#: any.pm:237
#, c-format
msgid "Hostname of the NFS mount ?"
msgstr "Vertsnamn til NFS-montering:"
-#: any.pm:236
+#: any.pm:238
#, c-format
msgid "Directory"
msgstr "Katalog"
-#: any.pm:258
+#: any.pm:260
#, c-format
msgid "Supplementary"
msgstr "Tillegg"
-#: any.pm:293
+#: any.pm:295
#, c-format
msgid ""
"Can't find a package list file on this mirror. Make sure the location is "
@@ -154,22 +129,22 @@ msgid ""
msgstr ""
"Finn ikkje pakkelistfila på denne spegelen. Sjå til at adressa er rett."
-#: any.pm:328
+#: any.pm:334
#, c-format
msgid "Looking at packages already installed..."
msgstr "Ser på allereie installerte pakkar …"
-#: any.pm:362
+#: any.pm:368
#, c-format
msgid "Finding packages to upgrade..."
msgstr "Ser etter pakkar å oppgradera …"
-#: any.pm:381
+#: any.pm:387
#, c-format
msgid "Removing packages prior to upgrade..."
msgstr "Fjernar pakkar for oppgradering …"
-#: any.pm:402
+#: any.pm:408
#, c-format
msgid ""
"You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -188,18 +163,18 @@ msgstr ""
"må du starta maskina på nytt, og så oppgradera med Mandriva-"
"oppdateringsprogrammet som du finn i systemtrauet."
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
#, c-format
msgid "Reboot"
msgstr "Start på nytt"
-#: any.pm:407
+#: any.pm:413
#, c-format
msgid "Proceed"
msgstr "Hald fram"
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -212,72 +187,72 @@ msgstr ""
"\n"
"Er du sikker på at du vil fjerna pakkane?\n"
-#: any.pm:815
+#: any.pm:821
#, c-format
msgid "Error reading file %s"
msgstr "Klarte ikkje lesa fila «%s»"
-#: any.pm:1022
+#: any.pm:1028
#, c-format
msgid "The following disk(s) were renamed:"
msgstr "Desse diskane fekk nye namn:"
-#: any.pm:1024
+#: any.pm:1030
#, c-format
msgid "%s (previously named as %s)"
msgstr "«%s» (tidlegare namn: «%s»)"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "HTTP"
msgstr "HTTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "FTP"
msgstr "FTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "NFS"
msgstr "NFS"
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
#, c-format
msgid "Network"
msgstr "Nettverk"
-#: any.pm:1104
+#: any.pm:1110
#, c-format
msgid "Please choose a media"
msgstr "Vel medium"
-#: any.pm:1120
+#: any.pm:1126
#, c-format
msgid "File already exists. Overwrite it?"
msgstr "Fila finst allereie. Vil du skriva over ho?"
-#: any.pm:1124
+#: any.pm:1130
#, c-format
msgid "Permission denied"
msgstr "Nekta løyve"
-#: any.pm:1172
+#: any.pm:1178
#, c-format
msgid "Bad NFS name"
msgstr "Ugyldig NFS-namn"
-#: any.pm:1193
+#: any.pm:1199
#, c-format
msgid "Bad media %s"
msgstr "Ugyldig medium: %s"
-#: any.pm:1236
+#: any.pm:1242
#, c-format
msgid "Can not make screenshots before partitioning"
msgstr "Kan ikkje ta skjermbilete før partisjonering"
-#: any.pm:1244
+#: any.pm:1250
#, c-format
msgid "Screenshots will be available after install in %s"
msgstr "Skjermbilete vert tilgjengelege i «%s» etter installeringa er ferdig"
@@ -288,11 +263,15 @@ msgid "Installation"
msgstr "Installering"
#: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
#, c-format
msgid "Configuration"
msgstr "Oppsett"
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
#: install2.pm:168
#, c-format
msgid "You must also format %s"
@@ -317,22 +296,22 @@ msgstr "Koplar til nettverket"
msgid "Bringing down the network"
msgstr "Koplar frå nettverket"
-#: media.pm:402
+#: media.pm:399
#, c-format
msgid "Please wait, retrieving file"
msgstr "Hentar fil. Vent litt …"
-#: media.pm:734
+#: media.pm:718
#, c-format
-msgid "Downloading file %s..."
-msgstr "Lastar ned «%s» …"
+msgid "unable to add medium"
+msgstr ""
-#: media.pm:822
+#: media.pm:758
#, c-format
msgid "Copying some packages on disks for future use"
msgstr "Kopierer nokre pakkar til harddisken for seinare bruk"
-#: media.pm:875
+#: media.pm:811
#, c-format
msgid "Copying in progress"
msgstr "Kopierer filer"
@@ -376,27 +355,27 @@ msgstr ""
msgid "An error occurred:"
msgstr "Det oppstod ein feil:"
-#: pkgs.pm:776
+#: pkgs.pm:780
#, c-format
msgid "%d installation transactions failed"
msgstr "feil med %d installasjonstransaksjonar"
-#: pkgs.pm:777
+#: pkgs.pm:781
#, c-format
msgid "Installation of packages failed:"
msgstr "Feil ved installering av pakkar:"
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
#, c-format
msgid "Workstation"
msgstr "Arbeidstasjon"
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
#, c-format
msgid "Office Workstation"
msgstr "Kontormaskin"
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
#, c-format
msgid ""
"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -405,7 +384,7 @@ msgstr ""
"Kontorprogramvare: Teksthandsamarar (OpenOffice.org Writer, Kword), rekneark "
"(OpenOffice.org Calc, Kspread), PDF-viseprogram, med meir"
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
#, c-format
msgid ""
"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -414,32 +393,32 @@ msgstr ""
"Kontorprogramvare: Teksthandsamarar (KWord, AbiWord), rekneark (KSpread, "
"gnumeric), PDF-viseprogram, med meir"
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
#, c-format
msgid "Game station"
msgstr "Spelmaskin"
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
#, c-format
msgid "Amusement programs: arcade, boards, strategy, etc"
msgstr "Moroprogram: Arkadespel, brettspel, strategispel, med meir"
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
#, c-format
msgid "Multimedia station"
msgstr "Multimediemaskin"
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
#, c-format
msgid "Sound and video playing/editing programs"
msgstr "Program for vising og redigering av film"
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
#, c-format
msgid "Internet station"
msgstr "Internett-maskin"
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
#, c-format
msgid ""
"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -448,223 +427,205 @@ msgstr ""
"Program for lesing og sending av e-post, deltaking i temagrupper og surfing "
"på Internett"
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
#, c-format
msgid "Network Computer (client)"
msgstr "Nettverksmaskin (klient)"
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
#, c-format
msgid "Clients for different protocols including ssh"
msgstr "Klientprogramvare for fleire protokollar, som ssh"
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
#, c-format
msgid "Tools to ease the configuration of your computer"
msgstr "Verktøy for enkelt oppsett av datamaskina"
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
#, c-format
msgid "Console Tools"
msgstr "Konsollverktøy"
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
#, c-format
msgid "Editors, shells, file tools, terminals"
msgstr "Skriveprogram, skal, filverktøy og terminalprogram."
#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
#, c-format
msgid "Development"
msgstr "Utvikling"
#: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
#, c-format
msgid "C and C++ development libraries, programs and include files"
msgstr "C og C++-utviklingsbibliotek, program og inkluderingsfiler"
#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
#, c-format
msgid "Documentation"
msgstr "Hjelpetekst"
#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
#, c-format
msgid "Books and Howto's on Linux and Free Software"
msgstr "Bøker og hjelpeoppskrifter for Linux og fri programvare"
#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
#, c-format
msgid "LSB"
msgstr "LSB"
#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
#, c-format
msgid "Linux Standard Base. Third party applications support"
msgstr "Linux Standard Base – støtte for tredjepartsprogram"
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
#, c-format
msgid "Web Server"
msgstr "Vevtenar"
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
#, c-format
msgid "Apache"
msgstr "Apache"
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
#, c-format
msgid "Groupware"
msgstr "Gruppevare"
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
#, c-format
msgid "Kolab Server"
msgstr "Kolab-tenar"
#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
#, c-format
msgid "Firewall/Router"
msgstr "Brannmur/rutar"
#: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
#, c-format
msgid "Internet gateway"
msgstr "Internett-portnar"
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
#, c-format
msgid "Mail/News"
msgstr "E-post og temagrupper"
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
#, c-format
msgid "Postfix mail server, Inn news server"
msgstr "Postfix e-posttenar og Inn temagruppetenar"
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
#, c-format
msgid "Directory Server"
msgstr "Katalogtenar"
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
#, c-format
msgid "FTP Server"
msgstr "FTP-tenar"
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
#, c-format
msgid "ProFTPd"
msgstr "ProFTPd"
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
#, c-format
msgid "DNS/NIS"
msgstr "DNS/NIS"
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
#, c-format
msgid "Domain Name and Network Information Server"
msgstr "Domenenamn og nettverksinformasjonstenar."
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
#, c-format
msgid "File and Printer Sharing Server"
msgstr "Fil- og skrivardeling-tenar"
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
#, c-format
msgid "NFS Server, Samba server"
msgstr "NFS-tenar, Samba-tenar"
#: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
#, c-format
msgid "Database"
msgstr "Database"
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
#, c-format
msgid "PostgreSQL and MySQL Database Server"
msgstr "PostgreSQL- og MySQL-databasetenar"
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
#, c-format
msgid "Web/FTP"
msgstr "Vev/FTP"
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
#, c-format
msgid "Apache, Pro-ftpd"
msgstr "Apache, Pro-ftpd"
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
#, c-format
msgid "Mail"
msgstr "E-post"
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
#, c-format
msgid "Postfix mail server"
msgstr "Postfix-e-posttenar"
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
#, c-format
msgid "PostgreSQL or MySQL database server"
msgstr "PostgreSQL- eller MySQL-databasetenar"
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
#, c-format
msgid "Network Computer server"
msgstr "Nettverkstenar"
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
#, c-format
msgid "NFS server, SMB server, Proxy server, ssh server"
msgstr "NFS-tenar, SMB-tenar, mellomtenar, ssh-tenar"
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
#, c-format
msgid "Graphical Environment"
msgstr "Grafisk miljø"
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
#, c-format
msgid "KDE Workstation"
msgstr "KDE-arbeidsstasjon"
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
#, c-format
msgid ""
"The K Desktop Environment, the basic graphical environment with a collection "
"of accompanying tools"
msgstr "Skrivebordsmiljøet KDE, med ei samling tilhøyrande verktøy"
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
#, c-format
msgid "GNOME Workstation"
msgstr "GNOME-arbeidsstasjon"
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
#, c-format
msgid ""
"A graphical environment with user-friendly set of applications and desktop "
@@ -672,7 +633,7 @@ msgid ""
msgstr ""
"Eit grafisk skrivebordsmiljø med brukarvenlege program og skrivebordsverktøy"
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
#, c-format
msgid "LXDE Desktop"
msgstr "LXDE-skrivebord"
@@ -686,54 +647,52 @@ msgstr ""
"Eit kjapt og lite ressurskrevande grafisk skrivebordsmiljø med brukarvenlege "
"program og skrivebordsverktøy"
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
#, c-format
msgid "Other Graphical Desktops"
msgstr "Andre grafiske skrivebord"
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
#, c-format
msgid "Window Maker, Enlightenment, Fvwm, etc"
msgstr "Window Maker, Enlightenment, Fvwm, med fleire"
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
#, c-format
msgid "Utilities"
msgstr "Verktøy"
#: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
#, c-format
msgid "SSH Server"
msgstr "SSH-tenar"
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
#, c-format
msgid "Webmin"
msgstr "Webmin"
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
#, c-format
msgid "Webmin Remote Configuration Server"
msgstr "Webmin-fjernoppsettenar"
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
#, c-format
msgid "Network Utilities/Monitoring"
msgstr "Nettverksverktøy og -overvaking"
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
#, c-format
msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
msgstr "Overvakingsverktøy, prosesshandsaming, tcpdump, nmap, med meir"
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
#, c-format
msgid "Mandriva Wizards"
msgstr "Mandriva-vegvisarar"
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
#, c-format
msgid "Wizards to configure server"
msgstr "Vegvisarar for tenaroppsett"
@@ -831,17 +790,17 @@ msgstr "Slik ser skrivebordsmiljøet %s ut."
msgid "Click on images in order to see a bigger preview"
msgstr "Trykk på bileta for å forstørra dei"
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
#, c-format
msgid "Package Group Selection"
msgstr "Pakkegruppeval"
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
#, c-format
msgid "Individual package selection"
msgstr "Direkte pakkeval"
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
#, c-format
msgid "Total size: %d / %d MB"
msgstr "Totalstorleik: %d / %d MiB"
@@ -960,12 +919,12 @@ msgstr "Minimal installering"
msgid "Software Management"
msgstr "Programvarehandsaming"
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
#, c-format
msgid "Choose the packages you want to install"
msgstr "Vel pakkane du ønskjer å installera"
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
#, c-format
msgid "Installing"
msgstr "Installerer"
@@ -992,7 +951,7 @@ msgid_plural "%d packages"
msgstr[0] "%d pakke"
msgstr[1] "%d pakkar"
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
#, c-format
msgid "Summary"
msgstr "Samandrag"
@@ -1002,7 +961,7 @@ msgstr "Samandrag"
msgid "Configure"
msgstr "Set opp"
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
#, c-format
msgid "not configured"
msgstr "ikkje sett opp"
@@ -1012,7 +971,7 @@ msgstr "ikkje sett opp"
msgid "Media Selection"
msgstr "Medieval"
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
#, c-format
msgid ""
"The following installation media have been found.\n"
@@ -1021,7 +980,7 @@ msgstr ""
"Fann desse installasjonsmedia.\n"
"Om du ikkje ønskjer å bruka alle, kan du velja vekk dei du ikkje treng no."
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
#, c-format
msgid ""
"You have the option to copy the contents of the CDs onto the hard drive "
@@ -1034,7 +993,7 @@ msgstr ""
"Installasjonen vil då helda fram frå harddisken, og pakkane vil vera lett "
"tilgjengeleg òg etter at systemet er installert og sett opp."
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
#, c-format
msgid "Copy whole CDs"
msgstr "Kopier CD-ane"
@@ -1054,59 +1013,49 @@ msgstr "Vel tastaturoppsett"
msgid "Here is the full list of available keyboards:"
msgstr "Her er heile lista over tastaturoppsett:"
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
#, c-format
msgid "Install/Upgrade"
msgstr "Installer/oppgrader"
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
#, c-format
msgid "Is this an install or an upgrade?"
msgstr "Vil du installera eller oppgradera?"
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
#, c-format
msgid ""
"_: This is a noun:\n"
"Install"
msgstr "Installer"
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
#, c-format
msgid "Upgrade %s"
msgstr "Oppgrader «%s»"
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr "Oppgradering frå 32 bits til 64 bits er ikkje støtta"
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr "Oppgradering frå 64 bits til 32 bits er ikkje støtta"
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
#, c-format
msgid "Encryption key for %s"
msgstr "Krypteringsnøkkel for «%s»"
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
#, c-format
msgid "Cancel installation, reboot system"
msgstr "Avbryt installering og start systemet på nytt"
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
#, c-format
msgid "New Installation"
msgstr "Nyinstallering"
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
#, c-format
msgid "Upgrade previous installation (not recommended)"
msgstr "Oppgrader førre installasjon (ikkje tilrådd)"
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
#, c-format
msgid ""
"Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1125,17 +1074,17 @@ msgstr ""
"Åtvaring: Du bør ta reservekopi av alle personlege data før du vel "
"«Nyinstallering»."
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "IDE"
msgstr "IDE"
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "Configuring IDE"
msgstr "Set opp IDE"
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
#, c-format
msgid ""
"No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1144,7 +1093,7 @@ msgstr ""
"Ikkje nok ledig plass for oppstartslastar på 1 MiB. Installasjonen held "
"fram, men du må sjølv laga ein oppstartslastarpartisjon i DiskDrake."
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
#, c-format
msgid ""
"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1155,7 +1104,7 @@ msgstr ""
"viss du vil starta systemet, må du først laga bootstrap-partisjonen i "
"DiskDrake."
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
#, c-format
msgid ""
"Change your Cd-Rom!\n"
@@ -1168,12 +1117,12 @@ msgstr ""
"Set inn plata merkt «%s» og trykk «OK».\n"
"Trykk eventuelt «Avbryt» om du ikkje har denne plata."
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
#, c-format
msgid "Looking for available packages..."
msgstr "Ser etter tilgjengelege pakkar …"
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
#, c-format
msgid ""
"Your system does not have enough space left for installation or upgrade (%"
@@ -1182,7 +1131,7 @@ msgstr ""
"Maskina di har ikkje nok ledig plass for installering eller oppgradering (%d "
"MB > %d MB)"
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
#, c-format
msgid ""
"Please choose load or save package selection.\n"
@@ -1191,52 +1140,52 @@ msgstr ""
"Vel å lagra eller henta pakkeval.\n"
"Formatet er likt det laga av «auto_install»."
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Load"
msgstr "Last"
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Save"
msgstr "Lagra"
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
#, c-format
msgid "Bad file"
msgstr "Ugyldig fil"
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
#, c-format
msgid "KDE"
msgstr "KDE"
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
#, c-format
msgid "GNOME"
msgstr "GNOME"
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
#, c-format
msgid "Desktop Selection"
msgstr "Skrivebordsval"
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
#, c-format
msgid "You can choose your workstation desktop profile."
msgstr "Du kan velja skrivebordsmiljø."
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
#, c-format
msgid "Selected size is larger than available space"
msgstr "Valt storleik er større enn tilgjengeleg plass"
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
#, c-format
msgid "Type of install"
msgstr "Installasjonstype"
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
#, c-format
msgid ""
"You have not selected any group of packages.\n"
@@ -1245,82 +1194,82 @@ msgstr ""
"Du har ikkje valt noko pakkegruppe.\n"
"Vel kva type minimal installasjon du vil ha:"
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
#, c-format
msgid "With X"
msgstr "Med X"
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
#, c-format
msgid "With basic documentation (recommended!)"
msgstr "Med grunnleggjande hjelpetekstar (tilrådd)"
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
#, c-format
msgid "Truly minimal install (especially no urpmi)"
msgstr "Heilt minimal (òg utan urpmi)"
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
#, c-format
msgid "Preparing installation"
msgstr "Førebur installasjon"
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
#, c-format
msgid "Installing package %s"
msgstr "Installerer pakken «%s»"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "There was an error ordering packages:"
msgstr "Det oppstod ein feil ved sortering av pakkar:"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "Go on anyway?"
msgstr "Vil du helda fram likevel?"
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
#, c-format
msgid "Retry"
msgstr "Prøv på nytt"
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
#, c-format
msgid "Skip this package"
msgstr "Hopp over denne pakken"
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
#, c-format
msgid "Skip all packages from medium \"%s\""
msgstr "Hopp over alle pakkar frå mediet «%s»"
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
#, c-format
msgid "Go back to media and packages selection"
msgstr "Gå tilbake til medie- og pakkevalskjermen"
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
#, c-format
msgid "There was an error installing package %s."
msgstr "Det oppstod ein feil ved installering av pakken «%s»."
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
#, c-format
msgid "Post-install configuration"
msgstr "Oppsett etter installering"
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
#, c-format
msgid "Please ensure the Update Modules media is in drive %s"
msgstr "Sjå til at oppdateringsmediet er i stasjon %s"
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
#, c-format
msgid "Updates"
msgstr "Oppdateringar"
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
#, c-format
msgid ""
"You now have the opportunity to download updated packages. These packages\n"
@@ -1343,28 +1292,28 @@ msgstr ""
"\n"
"Ønskjer du å installera oppdateringane?"
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
#, c-format
msgid "%s on %s"
msgstr "%s på %s"
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
#, c-format
msgid "Hardware"
msgstr "Maskinvare"
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
#, c-format
msgid "Sound card"
msgstr "Lydkort"
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
#, c-format
msgid "Do you have an ISA sound card?"
msgstr "Har du eit ISA-lydkort?"
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
#, c-format
msgid ""
"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1372,69 +1321,69 @@ msgid ""
msgstr ""
"Køyr «sndconfig» etter installasjonen er ferdig for å setja opp lydkortet."
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
#, c-format
msgid "No sound card detected. Try \"harddrake\" after installation"
msgstr "Fann ingen lydkort. Køyr «harddrake» etter installasjonen er ferdig."
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
#, c-format
msgid "Graphical interface"
msgstr "Grafisk grensesnitt"
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
#, c-format
msgid "Network & Internet"
msgstr "Nettverk og Internett"
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
#, c-format
msgid "Proxies"
msgstr "Mellomtenarar"
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
#, c-format
msgid "configured"
msgstr "oppsett"
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
#, c-format
msgid "Security Level"
msgstr "Tryggleiksnivå"
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
#, c-format
msgid "Firewall"
msgstr "Brannmur"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "activated"
msgstr "påslått"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "disabled"
msgstr "avslått"
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
#, c-format
msgid "You have not configured X. Are you sure you really want this?"
msgstr ""
"Du har ikkje sett opp det grafiske grensesnittet. Er du sikker på at du "
"ikkje vil ha det?"
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
#, c-format
msgid "Preparing bootloader..."
msgstr "Førebur oppstartslastar …"
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
#, c-format
msgid "Be patient, this may take a while..."
msgstr "Ver tålmodig. Dette kan ta ei stund …"
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
#, c-format
msgid ""
"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1447,7 +1396,7 @@ msgstr ""
"annan måte å starta maskina di på. Kjerneargumentet for rotfilsystemet er: "
"root=%s"
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
#, c-format
msgid ""
"In this security level, access to the files in the Windows partition is "
@@ -1456,17 +1405,17 @@ msgstr ""
"Med dette tryggleiksnivået er det berre administratoren som får tilgang til "
"filer på Windows-partisjonen."
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr "Set inn ein tom diskett i stasjon «%s»"
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
#, c-format
msgid "Creating auto install floppy..."
msgstr "Lagar diskett for automatisk installasjon …"
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
#, c-format
msgid ""
"Some steps are not completed.\n"
@@ -1477,7 +1426,7 @@ msgstr ""
"\n"
"Er du sikker på at du vil avslutta?"
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
#, c-format
msgid "Congratulations"
msgstr "Gratulerer"
@@ -1621,6 +1570,30 @@ msgid ""
"Exit"
msgstr "Avslutt"
+#~ msgid "Your desktop on a USB key"
+#~ msgstr "Skrivebordet på ein minnepinne"
+
+#~ msgid "The 100%% open source Mandriva Linux distribution"
+#~ msgstr "Mandriva Linux-distribusjonen med 100 %% open kjeldekode"
+
+#~ msgid "Explore Linux easily with Mandriva One"
+#~ msgstr "Utforsk Linux med Mandriva One"
+
+#~ msgid "A full Mandriva Linux desktop, with support"
+#~ msgstr "Eit fullt Mandriva Linux-skrivebord – med brukarstøtte"
+
+#~ msgid "Mandriva: distributions for everybody's needs"
+#~ msgstr "Mandriva: Distribusjonar for alle behov"
+
+#~ msgid "Downloading file %s..."
+#~ msgstr "Lastar ned «%s» …"
+
+#~ msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
+#~ msgstr "Oppgradering frå 32 bits til 64 bits er ikkje støtta"
+
+#~ msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
+#~ msgstr "Oppgradering frå 64 bits til 32 bits er ikkje støtta"
+
#~ msgid ""
#~ "You have selected the following server(s): %s\n"
#~ "\n"
diff --git a/perl-install/install/share/po/pa_IN.po b/perl-install/install/share/po/pa_IN.po
index ab49e38a5..d9cb984a3 100644
--- a/perl-install/install/share/po/pa_IN.po
+++ b/perl-install/install/share/po/pa_IN.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: DrakX\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
"PO-Revision-Date: 2005-03-27 17:55+0530\n"
"Last-Translator: Jaswinder Singh Phulewala <jaswinderphulewala@yahoo.com>\n"
"Language-Team: Punjabi <punlinux-i18n@lists.soruceforge.net>\n"
@@ -18,31 +18,6 @@ msgstr ""
"X-Generator: KBabel 1.9.1\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr ""
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr ""
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr ""
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr ""
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr ""
-
#: any.pm:109
#, c-format
msgid "Do you have further supplementary media?"
@@ -78,92 +53,92 @@ msgstr "ਨੈੱਟਵਰਕ (FTP)"
msgid "Network (NFS)"
msgstr ""
-#: any.pm:163
+#: any.pm:165
#, c-format
msgid "URL of the mirror?"
msgstr "ਪ੍ਰਤਿਬਿੰਬ ਦਾ URL?"
-#: any.pm:169
+#: any.pm:171
#, c-format
msgid "URL must start with ftp:// or http://"
msgstr ""
-#: any.pm:180
+#: any.pm:182
#, c-format
msgid ""
"Contacting Mandriva Linux web site to get the list of available mirrors..."
msgstr "ਉਪਲੱਬਧ ਪ੍ਰਤੀਬਿੰਬਾਂ ਦੀ ਸੂਚੀ ਵੇਖਣ ਲਈ ਮੈਂਡਰਿਵ-ਲੀਨਕਸ ਵੈਬ ਸਾਈਟ ਨਾਲ ਸੰਪਰਕ ਜਾਰੀ ਹੈ..."
-#: any.pm:185
+#: any.pm:187
#, fuzzy, c-format
msgid ""
"Failed contacting Mandriva Linux web site to get the list of available "
"mirrors"
msgstr "ਉਪਲੱਬਧ ਪ੍ਰਤੀਬਿੰਬਾਂ ਦੀ ਸੂਚੀ ਵੇਖਣ ਲਈ ਮੈਂਡਰਿਵ-ਲੀਨਕਸ ਵੈਬ ਸਾਈਟ ਨਾਲ ਸੰਪਰਕ ਜਾਰੀ ਹੈ..."
-#: any.pm:195
+#: any.pm:197
#, c-format
msgid "Choose a mirror from which to get the packages"
msgstr "ਪੈਕੇਜ ਪ੍ਰਾਪਤ ਕਰਨ ਲਈ ਪ੍ਰਤੀਬਿੰਬ ਚੁਣੋ"
-#: any.pm:225
+#: any.pm:227
#, c-format
msgid "NFS setup"
msgstr ""
-#: any.pm:226
+#: any.pm:228
#, c-format
msgid "Please enter the hostname and directory of your NFS media"
msgstr ""
-#: any.pm:230
+#: any.pm:232
#, c-format
msgid "Hostname missing"
msgstr ""
-#: any.pm:231
+#: any.pm:233
#, c-format
msgid "Directory must begin with \"/\""
msgstr ""
-#: any.pm:235
+#: any.pm:237
#, c-format
msgid "Hostname of the NFS mount ?"
msgstr ""
-#: any.pm:236
+#: any.pm:238
#, c-format
msgid "Directory"
msgstr "ਡਾਇਰੈਕਟਰੀ"
-#: any.pm:258
+#: any.pm:260
#, c-format
msgid "Supplementary"
msgstr ""
-#: any.pm:293
+#: any.pm:295
#, c-format
msgid ""
"Can't find a package list file on this mirror. Make sure the location is "
"correct."
msgstr "ਇਸ ਪ੍ਰਤੀਬਿੰਬ ਤੇ ਪੈਕੇਜ ਸੂਚੀ ਫਾਇਲ ਨਹੀਂ ਲੱਭ ਸਕੀ। ਜਾਂਚ ਕਰੋ ਕਿ ਸਥਿਤੀ ਠੀਕ ਹੈ।"
-#: any.pm:328
+#: any.pm:334
#, c-format
msgid "Looking at packages already installed..."
msgstr "ਪਹਿਲਾਂ ਇੰਸਟਾਲ ਕੀਤੇ ਪੈਕੇਜਾਂ ਸੀ ਜਾਂਚ ਕਰ ਰਿਹਾ ਹੈ..."
-#: any.pm:362
+#: any.pm:368
#, c-format
msgid "Finding packages to upgrade..."
msgstr "ਨਵੀਨੀਕਰਨ ਲਈ ਪੈਕੇਜਾਂ ਦੀ ਖੋਜ..."
-#: any.pm:381
+#: any.pm:387
#, c-format
msgid "Removing packages prior to upgrade..."
msgstr ""
-#: any.pm:402
+#: any.pm:408
#, c-format
msgid ""
"You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -175,18 +150,18 @@ msgid ""
"please reboot your system and upgrade using the Mandriva update applet."
msgstr ""
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
#, c-format
msgid "Reboot"
msgstr "ਮੁੜ-ਚਾਲੂ"
-#: any.pm:407
+#: any.pm:413
#, c-format
msgid "Proceed"
msgstr ""
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -199,72 +174,72 @@ msgstr ""
"\n"
"ਕੀ ਤੁਸੀਂ ਯਕੀਨਨ ਇਹ ਪੈਕੇਜ ਹਟਾਉਣੇ ਚਾਹੁੰਦੇ ਹੋ?\n"
-#: any.pm:815
+#: any.pm:821
#, c-format
msgid "Error reading file %s"
msgstr "ਫਾਇਲ %s ਪੜਨ ਵਿੱਚ ਗਲਤੀ"
-#: any.pm:1022
+#: any.pm:1028
#, c-format
msgid "The following disk(s) were renamed:"
msgstr "ਹੇਠਲੀਆਂ ਡਿਸਕਾਂ ਦੇ ਨਾਂ ਤਬਦੀਲ ਕੀਤੇ ਹਨ:"
-#: any.pm:1024
+#: any.pm:1030
#, c-format
msgid "%s (previously named as %s)"
msgstr "%s (ਪਹਿਲਾਂ %s ਨਾਂ ਸੀ)"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "HTTP"
msgstr ""
-#: any.pm:1081
+#: any.pm:1087
#, fuzzy, c-format
msgid "FTP"
msgstr "ਵੈਬ/FTP"
-#: any.pm:1081
+#: any.pm:1087
#, fuzzy, c-format
msgid "NFS"
msgstr "PFS"
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
#, c-format
msgid "Network"
msgstr "ਨੈੱਟਵਰਕ"
-#: any.pm:1104
+#: any.pm:1110
#, fuzzy, c-format
msgid "Please choose a media"
msgstr "ਕਿਰਪਾ ਕਰਕੇ ਬੈਕਅੱਪ ਲਈ ਮਾਧਿਅਮ ਚੁਣੋ।"
-#: any.pm:1120
+#: any.pm:1126
#, fuzzy, c-format
msgid "File already exists. Overwrite it?"
msgstr "ਫਾਇਲ ਪਹਿਲਾਂ ਮੌਜੂਦ ਹੈ, ਇਹ ਵਰਤੋ?"
-#: any.pm:1124
+#: any.pm:1130
#, fuzzy, c-format
msgid "Permission denied"
msgstr "ਅਧਿਕਾਰ"
-#: any.pm:1172
+#: any.pm:1178
#, c-format
msgid "Bad NFS name"
msgstr ""
-#: any.pm:1193
+#: any.pm:1199
#, c-format
msgid "Bad media %s"
msgstr ""
-#: any.pm:1236
+#: any.pm:1242
#, c-format
msgid "Can not make screenshots before partitioning"
msgstr "ਵਿਭਾਗੀਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਪਰਦਾ-ਤਸਵੀਰ ਨਹੀਂ ਬਣਾ ਸਕਦਾ"
-#: any.pm:1244
+#: any.pm:1250
#, c-format
msgid "Screenshots will be available after install in %s"
msgstr "ਪਰਦਾ-ਤਸਵੀਰਾਂ %s ਵਿੱਚ ਇੰਸਟਾਲੇਸ਼ਨ ਤੋਂ ਬਾਅਦ ਉਪਲੱਬਧ ਹੋਣਗੀਆਂ"
@@ -275,11 +250,15 @@ msgid "Installation"
msgstr "ਇੰਸਟਾਲ ਹੋ ਰਹੇ ਹਨ"
#: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
#, c-format
msgid "Configuration"
msgstr "ਸੰਰਚਨਾ"
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
#: install2.pm:168
#, c-format
msgid "You must also format %s"
@@ -304,22 +283,22 @@ msgstr "ਨੈੱਟਵਰਕ ਚਲਾਇਆ ਜਾ ਰਿਹਾ ਹੈ"
msgid "Bringing down the network"
msgstr "ਨੈੱਟਵਰਕ ਬੰਦ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
-#: media.pm:402
+#: media.pm:399
#, c-format
msgid "Please wait, retrieving file"
msgstr ""
-#: media.pm:734
-#, fuzzy, c-format
-msgid "Downloading file %s..."
-msgstr "ਫਾਇਲਾਂ ਭੇਜ ਰਿਹਾ ਹੈ..."
+#: media.pm:718
+#, c-format
+msgid "unable to add medium"
+msgstr ""
-#: media.pm:822
+#: media.pm:758
#, c-format
msgid "Copying some packages on disks for future use"
msgstr ""
-#: media.pm:875
+#: media.pm:811
#, c-format
msgid "Copying in progress"
msgstr "ਨਕਲ ਜਾਰੀ ਹੈ"
@@ -361,27 +340,27 @@ msgstr ""
msgid "An error occurred:"
msgstr "ਇੱਕ ਗਲਤੀ ਆਈ ਹੈ"
-#: pkgs.pm:776
+#: pkgs.pm:780
#, c-format
msgid "%d installation transactions failed"
msgstr "%d ਇੰਸਟਾਲੇਸ਼ਨ ਸੰਚਾਰ ਅਸਫਲ"
-#: pkgs.pm:777
+#: pkgs.pm:781
#, fuzzy, c-format
msgid "Installation of packages failed:"
msgstr "%s ਪੈਕੇਜ ਇੰਸਟਾਲ ਹੋ ਰਹੀ ਹੈ"
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
#, c-format
msgid "Workstation"
msgstr "ਵਰਕਸਟੇਸ਼ਨ"
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
#, c-format
msgid "Office Workstation"
msgstr "ਦਫਤਰ ਵਰਕਸਟੇਸ਼ਨ"
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
#, c-format
msgid ""
"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -390,7 +369,7 @@ msgstr ""
"ਦਫਤਰੀ ਪ੍ਰੋਗਰਾਮ: ਅੱਖਰਕਾਰ (OpenOffice.org Writer, Kword), ਸਾਰਣੀਕਾਰ (OpenOffice."
"org Calc, Kspread), PDF ਦਰਸ਼ਕ, ਆਦਿ"
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
#, c-format
msgid ""
"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -399,262 +378,244 @@ msgstr ""
"ਦਫਤਰੀ ਪ੍ਰੋਗਰਾਮ: ਅੱਖਰਕਾਰ (kword, abiword), ਸਾਰਣੀਕਾਰ (kspread, gnumeric), pdf "
"ਦਰਸ਼ਕ, ਆਦਿ"
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
#, c-format
msgid "Game station"
msgstr "ਖੇਡ ਸਟੇਸ਼ਨ"
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
#, c-format
msgid "Amusement programs: arcade, boards, strategy, etc"
msgstr "ਮਨੋਰੰਜਨ ਪ੍ਰੋਗਰਾਮ: ਆਰਕੇਡ, ਬੋਰਡ, ਨੀਤੀ, ਆਦਿ"
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
#, c-format
msgid "Multimedia station"
msgstr "ਮਲਟੀਮੀਡੀਆ ਸਟੇਸ਼ਨ"
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
#, c-format
msgid "Sound and video playing/editing programs"
msgstr "ਸਾਊਂਡ ਅਤੇ ਵੀਡੀਓ ਚਲਾਉਣ/ਸੋਧਣ ਵਾਲੇ ਪ੍ਰੋਗਰਾਮ"
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
#, c-format
msgid "Internet station"
msgstr "ਇੰਟਰਨੈੱਟ ਸਟੇਸ਼ਨ"
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
#, c-format
msgid ""
"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
"Web"
msgstr "ਪੱਤਰ ਅਤੇ ਖਬਰਾਂ ਪੜਨ ਅਤੇ ਭੇਜਣ ਲਈ (mutt, tin..) ਅਤੇ ਵੈਬ ਝਾਤੀ ਲਈ ਸੰਦਾਂ ਦਾ ਸਮੂਹ"
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
#, c-format
msgid "Network Computer (client)"
msgstr "ਨੈੱਟਵਰਕ ਕੰਪਿਊਟਰ (ਕਲਾਂਈਟ)"
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
#, c-format
msgid "Clients for different protocols including ssh"
msgstr "ssh ਸਮੇਤ ਵੱਖ-ਵੱਖ ਪਰੋਟੋਕਾਲਾਂ ਲਈ ਕਲਾਂਈਟ"
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
#, c-format
msgid "Tools to ease the configuration of your computer"
msgstr "ਤੁਹਾਡੇ ਕੰਪਿਊਟਰ ਦੀ ਸੰਰਚਨਾ ਸਾਫ ਕਰਨ ਲਈ ਸੰਦ"
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
#, c-format
msgid "Console Tools"
msgstr "ਕੰਸੋਲ ਸੰਦ"
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
#, c-format
msgid "Editors, shells, file tools, terminals"
msgstr "ਸੰਪਾਦਕ, ਸ਼ੈੱਲ, ਫਾਇਲ ਸੰਦ, ਟਰਮੀਨਲ"
#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
#, c-format
msgid "Development"
msgstr "ਵਿਕਾਸ"
#: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
#, c-format
msgid "C and C++ development libraries, programs and include files"
msgstr "C ਅਤੇ C++ ਵਿਕਾਸ ਲਾਇਬ੍ਰੇਰੀਆਂ, ਪ੍ਰੋਗਰਾਮ ਅਤੇ ਸ਼ਾਮਿਲ ਫਾਇਲਾਂ"
#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
#, c-format
msgid "Documentation"
msgstr "ਦਸਤਾਵੇਜ਼"
#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
#, c-format
msgid "Books and Howto's on Linux and Free Software"
msgstr "ਲੀਨਕਸ ਅਤੇ ਮੁਕਤ ਸਾਫਟਵੇਅਰ ਉੱਪਰ ਕਿਤਾਬਾਂ ਅਤੇ Howto's"
#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
#, c-format
msgid "LSB"
msgstr "LSB"
#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
#, c-format
msgid "Linux Standard Base. Third party applications support"
msgstr "ਲੀਨਕਸ ਮਿਆਰੀ ਮੁੱਢ। ਤੀਜੀ ਪਾਰਟੀ ਕਾਰਜ ਸਹਿਯੋਗ"
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
#, c-format
msgid "Web Server"
msgstr "ਵੈਬ ਸਰਵਰ"
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
#, c-format
msgid "Apache"
msgstr "Apache"
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
#, c-format
msgid "Groupware"
msgstr "ਗਰੁੱਪਵੇਅਰ"
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
#, c-format
msgid "Kolab Server"
msgstr "Kolab ਸਰਵਰ"
#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
#, c-format
msgid "Firewall/Router"
msgstr "ਫਾਇਲਵਾਲ/ਰਾਊਟਰ"
#: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
#, c-format
msgid "Internet gateway"
msgstr "ਇੰਟਰਨੈੱਟ ਗੇਟਵੇ"
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
#, c-format
msgid "Mail/News"
msgstr "ਪੱਤਰ/ਖਬਰ"
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
#, c-format
msgid "Postfix mail server, Inn news server"
msgstr "Postfix ਪੱਤਰ ਸਰਵਰ, Inn ਖਬਰ ਸਰਵਰ"
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
#, c-format
msgid "Directory Server"
msgstr "ਡਾਇਰੈਕਟਰੀ ਸਰਵਰ"
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
#, c-format
msgid "FTP Server"
msgstr "FTP ਸਰਵਰ"
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
#, c-format
msgid "ProFTPd"
msgstr "ProFTPd"
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
#, c-format
msgid "DNS/NIS"
msgstr "DNS/NIS"
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
#, c-format
msgid "Domain Name and Network Information Server"
msgstr "ਡੋਮੇਨ ਨਾਂ ਅਤੇ ਨੈੱਟਵਰਕ ਜਾਣਕਾਰੀ ਸਰਵਰ"
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
#, c-format
msgid "File and Printer Sharing Server"
msgstr "ਫਾਇਲ ਅਤੇ ਪ੍ਰਿੰਟਰ ਸ਼ੇਅਰਿੰਗ ਸਰਵਰ"
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
#, c-format
msgid "NFS Server, Samba server"
msgstr "NFS ਸਰਵਰ, ਸਾਂਬਾ ਸਰਵਰ"
#: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
#, c-format
msgid "Database"
msgstr "ਡਾਟਾਬੇਸ "
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
#, c-format
msgid "PostgreSQL and MySQL Database Server"
msgstr "PostgreSQL ਅਤੇ MySQL ਡਾਟਾਬੇਸ ਸਰਵਰ"
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
#, c-format
msgid "Web/FTP"
msgstr "ਵੈਬ/FTP"
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
#, c-format
msgid "Apache, Pro-ftpd"
msgstr "Apache, Pro-ftpd"
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
#, c-format
msgid "Mail"
msgstr "ਪੱਤਰ"
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
#, c-format
msgid "Postfix mail server"
msgstr "Postfix ਪੱਤਰ ਸਰਵਰ"
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
#, c-format
msgid "PostgreSQL or MySQL database server"
msgstr "PostgreSQL ਜਾਂ MySQL ਡਾਟਾਬੇਸ ਸਰਵਰ"
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
#, c-format
msgid "Network Computer server"
msgstr "ਨੈੱਟਵਰਕ ਕੰਪਿਊਟਰ ਸਰਵਰ"
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
#, c-format
msgid "NFS server, SMB server, Proxy server, ssh server"
msgstr "NFS ਸਰਵਰ, SMB ਸਰਵਰ, ਪਰਾਕਸੀ ਸਰਵਰ, ssh ਸਰਵਰ"
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
#, c-format
msgid "Graphical Environment"
msgstr "ਗਰਾਫੀਕਲ ਵਾਤਾਵਰਨ"
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
#, c-format
msgid "KDE Workstation"
msgstr "ਕੇ ਡੀ ਈ ਵਰਕਸਟੇਸ਼ਨ"
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
#, c-format
msgid ""
"The K Desktop Environment, the basic graphical environment with a collection "
"of accompanying tools"
msgstr "ਕੇ ਵਿਹੜਾ ਵਾਤਾਵਰਨ, ਸਾਥੀ ਸੰਦਾਂ ਦੇ ਭੰਡਾਰ ਨਾਲ ਮੁੱਢਲਾ ਗਰਾਫਿਕਲ ਵਾਤਾਵਰਨ"
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
#, c-format
msgid "GNOME Workstation"
msgstr "ਗਨੋਮ ਵਰਕਸਟੇਸ਼ਨ"
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
#, c-format
msgid ""
"A graphical environment with user-friendly set of applications and desktop "
"tools"
msgstr "ਉਪਭੋਗੀ-ਅਨੁਕੂਲ ਕਾਰਜ ਸਮੂਹ ਅਤੇ ਵਿਹੜਾ ਸੰਦਾਂ ਨਾਲ ਇੱਕ ਗਰਾਫੀਕਲ ਵਾਤਾਵਰਨ"
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
#, fuzzy, c-format
msgid "LXDE Desktop"
msgstr "ਵਿਹੜਾ"
@@ -666,54 +627,52 @@ msgid ""
"applications and desktop tools"
msgstr "ਉਪਭੋਗੀ-ਅਨੁਕੂਲ ਕਾਰਜ ਸਮੂਹ ਅਤੇ ਵਿਹੜਾ ਸੰਦਾਂ ਨਾਲ ਇੱਕ ਗਰਾਫੀਕਲ ਵਾਤਾਵਰਨ"
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
#, c-format
msgid "Other Graphical Desktops"
msgstr "ਹੋਰ ਗਰਾਫੀਕਲ ਵਿਹੜੇ"
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
#, fuzzy, c-format
msgid "Window Maker, Enlightenment, Fvwm, etc"
msgstr "Icewm, Window Maker, Enlightenment, Fvwm, ਆਦਿ"
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
#, c-format
msgid "Utilities"
msgstr "ਸਹੂਲਤਾਂ"
#: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
#, c-format
msgid "SSH Server"
msgstr "SSH ਸਰਵਰ"
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
#, c-format
msgid "Webmin"
msgstr "Webmin"
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
#, c-format
msgid "Webmin Remote Configuration Server"
msgstr "Webmin ਰਿਮੋਟ ਸੰਰਚਨਾ ਸਰਵਰ"
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
#, c-format
msgid "Network Utilities/Monitoring"
msgstr "ਨੈੱਟਵਰਕ ਸਹੂਲਤਾਂ/ਪ੍ਰਬੰਧਨ"
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
#, c-format
msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
msgstr "ਪ੍ਰਬੰਧਨ ਸੰਦ, ਕਾਰਜ ਅਕਾਊਂਟਿੰਗ, tcpdump, nmap, ..."
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
#, fuzzy, c-format
msgid "Mandriva Wizards"
msgstr "ਮੈਂਡਰਿਵ-ਸਾਫਟ ਤਖਤੀ"
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
#, c-format
msgid "Wizards to configure server"
msgstr "ਸਰਵਰ ਸੰਰਚਨਾ ਲਈ ਤਖਤੀ"
@@ -811,17 +770,17 @@ msgstr ""
msgid "Click on images in order to see a bigger preview"
msgstr ""
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
#, c-format
msgid "Package Group Selection"
msgstr "ਪੈਕੇਜ ਸਮੂਹ ਚੋਣ"
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
#, c-format
msgid "Individual package selection"
msgstr "ਵੱਖ-ਵੱਖ ਪੈਕੇਜ ਚੋਣ"
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
#, c-format
msgid "Total size: %d / %d MB"
msgstr "ਕੁੱਲ ਅਕਾਰ: %d / %d ਮੈਬਾ"
@@ -938,12 +897,12 @@ msgstr "ਘੱਟੋ-ਘੱਟ ਇੰਸਟਾਲ"
msgid "Software Management"
msgstr "ਸਾਫਟਵੇਅਰ ਪ੍ਰਬੰਧਨ"
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
#, c-format
msgid "Choose the packages you want to install"
msgstr "ਇੰਸਟਾਲ ਕਰਨ ਲਈ ਪੈਕੇਜ ਚੁਣੋ"
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
#, c-format
msgid "Installing"
msgstr "ਇੰਸਟਾਲ ਹੋ ਰਹੇ ਹਨ"
@@ -970,7 +929,7 @@ msgid_plural "%d packages"
msgstr[0] "%d ਪੈਕੇਜ"
msgstr[1] "%d ਪੈਕੇਜ"
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
#, c-format
msgid "Summary"
msgstr "ਸਾਰ"
@@ -980,7 +939,7 @@ msgstr "ਸਾਰ"
msgid "Configure"
msgstr "ਸੰਰਚਨਾ"
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
#, c-format
msgid "not configured"
msgstr "ਸੰਰਚਿਤ ਨਹੀਂ"
@@ -990,7 +949,7 @@ msgstr "ਸੰਰਚਿਤ ਨਹੀਂ"
msgid "Media Selection"
msgstr "ਪੈਕੇਜ ਸਮੂਹ ਚੋਣ"
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
#, c-format
msgid ""
"The following installation media have been found.\n"
@@ -999,7 +958,7 @@ msgstr ""
"ਹੇਠਲੇ ਇੰਸਟਾਲੇਸ਼ਨ ਮਾਧਿਅਨ ਲੱਭੇ ਹਨ।\n"
"ਜੇ ਤੁਸੀਂ ਇਹਨਾਂ ਵਿੱਚੋਂ ਕੁਝ ਛੱਡਣੇ ਚਾਹੁੰਦੇ ਹੋ, ਤੁਸੀਂ ਹੁਣ ਰੱਦ ਕਰ ਸਕਦੇ ਹੋ।"
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
#, c-format
msgid ""
"You have the option to copy the contents of the CDs onto the hard drive "
@@ -1011,7 +970,7 @@ msgstr ""
"ਇਹ ਫਿਰ ਹਾਰਡ ਡਰਾਈਵ ਤੋਂ ਜਾਰੀ ਕਰੇਗਾ ਅਤੇ ਪੈਕੇਜ ਸਿਸਟਮ ਪੂਰੀ ਤਰਾਂ ਇੰਸਟਾਲ ਹੋਣ ਤੋਂ ਬਾਅਦ ਵੀ ਉਪਲੱਬਧ "
"ਰਹਿਣਗੇ।"
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
#, c-format
msgid "Copy whole CDs"
msgstr "ਪੂਰੀ CDs ਨਕਲ ਕਰੋ"
@@ -1031,59 +990,49 @@ msgstr "ਕਿਰਪਾ ਕਰਕੇ ਆਪਣਾ ਕੀਬੋਰਡ ਖਾਕ
msgid "Here is the full list of available keyboards:"
msgstr "ਇੱਥੇ ਉਪਲੱਬਧ ਕੀਬੋਰਡਾਂ ਦੀ ਸੂਚੀ ਹੈ"
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
#, c-format
msgid "Install/Upgrade"
msgstr "ਇੰਸਟਾਲ/ਨਵੀਨੀਕਰਨ"
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
#, c-format
msgid "Is this an install or an upgrade?"
msgstr "ਕੀ ਇਹ ਇੰਸਟਾਲ ਜਾਂ ਨਵੀਨੀਕਰਨ ਹੈ?"
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
#, fuzzy, c-format
msgid ""
"_: This is a noun:\n"
"Install"
msgstr "ਇੰਸਟਾਲ"
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
#, c-format
msgid "Upgrade %s"
msgstr "ਨਵੀਨੀਕਰਨ %s"
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
#, c-format
msgid "Encryption key for %s"
msgstr "%s ਲਈ ਇਨਕ੍ਰਿਪਸ਼ਨ ਕੁੰਜੀ"
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
#, c-format
msgid "Cancel installation, reboot system"
msgstr ""
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
#, fuzzy, c-format
msgid "New Installation"
msgstr "ਇੰਸਟਾਲ ਹੋ ਰਹੇ ਹਨ"
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
#, c-format
msgid "Upgrade previous installation (not recommended)"
msgstr ""
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
#, c-format
msgid ""
"Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1095,17 +1044,17 @@ msgid ""
"Installation\"."
msgstr ""
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "IDE"
msgstr "IDE"
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "Configuring IDE"
msgstr "IDE ਸੰਰਚਨਾ ਹੋ ਰਹੀ ਹੈ"
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
#, c-format
msgid ""
"No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1114,7 +1063,7 @@ msgstr ""
"1ਮੈਬਾ ਬੂਟਸਟਰੈਪ ਲਈ ਕੋਈ ਖਾਲੀ ਥਾਂ ਨਹੀਂ ਹੈ! ਇੰਸਟਾਲ ਜਾਰੀ ਰਹੇਗੀ, ਪਰ ਤੁਹਾਡਾ ਸਿਸਟਮ ਬੂਟ ਕਰਨ ਲਈ, "
"ਤੁਹਾਨੂੰ DiskDrake ਵਿੱਚ ਬੂਟਸਟਰੈਪ ਭਾਗ ਬਣਾਉਣ ਦੀ ਲੋੜ ਪਵੇਗੀ।"
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
#, c-format
msgid ""
"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1124,7 +1073,7 @@ msgstr ""
"PPC PReP Boot ਬੂਟਸਟਰੈਪ ਲਈ ਕੋਈ ਖਾਲੀ ਥਾਂ ਨਹੀਂ ਹੈ! ਇੰਸਟਾਲ ਜਾਰੀ ਰਹੇਗੀ, ਪਰ ਤੁਹਾਡਾ ਸਿਸਟਮ ਬੂਟ "
"ਕਰਨ ਲਈ, ਤੁਹਾਨੂੰ DiskDrake ਵਿੱਚ ਬੂਟਸਟਰੈਪ ਭਾਗ ਬਣਾਉਣ ਦੀ ਲੋੜ ਪਵੇਗੀ।"
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
#, c-format
msgid ""
"Change your Cd-Rom!\n"
@@ -1136,19 +1085,19 @@ msgstr ""
"ਕਿਰਪਾ ਕਰਕੇ \"%s\" ਲੇਬਲ ਵਾਲੀ Cd-Rom ਆਪਣੀ ਡਰਾਈਵ ਵਿੱਚ ਪਾਓ ਅਤੇ ਸਮਾਪਤੀ ਤੇ ਠੀਕ ਹੈ ਦਬਾਓ\n"
"ਜੇ ਤੁਹਾਡੇ ਕੋਲ ਇਹ ਨਹੀਂ ਹੈ, ਇਸ Cd-Rom ਤੋਂ ਇੰਸਟਾਲੇਸ਼ਨ ਰੋਕਣ ਲਈ ਰੱਦ ਕਰੋ ਦਬਾਓ।"
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
#, c-format
msgid "Looking for available packages..."
msgstr "ਉਪਲੱਬਧ ਪੈਕੇਜ ਲੋਡ ਕਰ ਰਿਹਾ ਹੈ..."
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
#, c-format
msgid ""
"Your system does not have enough space left for installation or upgrade (%"
"dMB > %dMB)"
msgstr ""
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
#, fuzzy, c-format
msgid ""
"Please choose load or save package selection.\n"
@@ -1157,52 +1106,52 @@ msgstr ""
"ਕਿਰਪਾ ਕਰਕੇ ਫਲਾਪੀ ਤੇ ਪੈਕੇਜ ਲੋਡ ਜਾਂ ਸੰਭਾਲ ਚੁਣੋ।\n"
"ਫਾਰਮਿਟ ਫਲਾਪੀਆਂ ਦੁਆਰਾ ਬਣਾਏ auto_install ਵਾਂਗ ਹੈ।"
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, fuzzy, c-format
msgid "Load"
msgstr "ਪੋਲੈਂਡ"
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Save"
msgstr "ਸੰਭਾਲੋ"
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
#, fuzzy, c-format
msgid "Bad file"
msgstr "ਅਸਲੀ ਫਾਇਲ"
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
#, fuzzy, c-format
msgid "KDE"
msgstr "IDE"
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
#, c-format
msgid "GNOME"
msgstr "ਗਨੋਮ"
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
#, fuzzy, c-format
msgid "Desktop Selection"
msgstr "ਪੈਕੇਜ ਸਮੂਹ ਚੋਣ"
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
#, c-format
msgid "You can choose your workstation desktop profile."
msgstr ""
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
#, c-format
msgid "Selected size is larger than available space"
msgstr "ਚੁਣਿਆ ਅਕਾਰ ਉਪਲੱਬਧ ਥਾਂ ਨਾਲੋਂ ਜਿਆਦਾ ਹੈ"
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
#, c-format
msgid "Type of install"
msgstr "ਇੰਸਟਾਲ ਦੀ ਕਿਸਮ"
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
#, c-format
msgid ""
"You have not selected any group of packages.\n"
@@ -1211,82 +1160,82 @@ msgstr ""
"ਤੁਸੀਂ ਪੈਕੇਜਾਂ ਦਾ ਕੋਈ ਸਮੂਹ ਨਹੀਂ ਚੁਣਿਆ।\n"
"ਕਿਰਪਾ ਕਰਕੇ ਘੱਟੋ-ਘੱਟ ਇੰਸਟਾਲੇਸ਼ਨ ਚੁਣੋ:"
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
#, c-format
msgid "With X"
msgstr "X ਨਾਲ"
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
#, c-format
msgid "With basic documentation (recommended!)"
msgstr "ਮੁੱਢਲੀ ਦਸਤਾਵੇਜ਼ੀ ਨਾਲ (ਸਿਫਾਰਸ਼ੀ)"
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
#, c-format
msgid "Truly minimal install (especially no urpmi)"
msgstr "ਯਕੀਨਨ ਘੱਟੋ-ਘੱਟ ਇੰਸਟਾਲ (ਖਾਸ ਤੌਰ ਤੇ urpmi)"
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
#, c-format
msgid "Preparing installation"
msgstr "ਇੰਸਟਾਲੇਸ਼ਨ ਤਿਆਰੀ ਹੋ ਰਹੀ ਹੈ"
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
#, c-format
msgid "Installing package %s"
msgstr "%s ਪੈਕੇਜ ਇੰਸਟਾਲ ਹੋ ਰਹੀ ਹੈ"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "There was an error ordering packages:"
msgstr "ਪੈਕੇਜ ਕ੍ਰਮਬੱਧ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ:"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "Go on anyway?"
msgstr "ਕਿਸੇ ਤਰਾਂ ਜਾਰੀ ਰੱਖੋ?"
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
#, c-format
msgid "Retry"
msgstr ""
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
#, c-format
msgid "Skip this package"
msgstr ""
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
#, c-format
msgid "Skip all packages from medium \"%s\""
msgstr ""
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
#, fuzzy, c-format
msgid "Go back to media and packages selection"
msgstr "ਪੈਕੇਜ ਚੋਣ ਸੰਭਾਲੋ"
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
#, fuzzy, c-format
msgid "There was an error installing package %s."
msgstr "ਪੈਕੇਜ ਇੰਸਟਾਲ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ:"
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
#, c-format
msgid "Post-install configuration"
msgstr "ਪੋਸਟ-ਇੰਸਟਾਲ ਸੰਰਚਨਾ"
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
#, c-format
msgid "Please ensure the Update Modules media is in drive %s"
msgstr ""
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
#, c-format
msgid "Updates"
msgstr "ਨਵਿਨੀਕਰਨ"
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
#, c-format
msgid ""
"You now have the opportunity to download updated packages. These packages\n"
@@ -1299,95 +1248,95 @@ msgid ""
"Do you want to install the updates?"
msgstr ""
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
#, c-format
msgid "%s on %s"
msgstr "%s, %s ਉੱਪਰ"
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
#, c-format
msgid "Hardware"
msgstr "ਜੰਤਰ"
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
#, c-format
msgid "Sound card"
msgstr "ਸਾਊਂਡ ਕਾਰਡ"
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
#, c-format
msgid "Do you have an ISA sound card?"
msgstr "ਕੀ ਤੁਹਾਡੇ ਕੋਲ ISA ਸਾਊਂਡ ਕਾਰਡ ਹੈ?"
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
#, c-format
msgid ""
"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
"card"
msgstr "ਆਪਣੀ ਸਾਊਂਡ ਕਾਰਡ ਸੰਰਚਨਾ ਲਈ ਇੰਸਟਾਲੇਸ਼ਨ ਮਗਰੋਂ \"alsaconf\" ਜਾਂ \"sndconfig\" ਚਲਾਓ"
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
#, c-format
msgid "No sound card detected. Try \"harddrake\" after installation"
msgstr "ਕੋਈ ਸਾਊਂਡ ਕਾਰਡ ਨਹੀਂ ਲੱਭਿਆ। ਇੰਸਟਾਲੇਸ਼ਨ ਮਗਰੋਂ \"harddrake\" ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰੋ"
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
#, c-format
msgid "Graphical interface"
msgstr "ਗਰਾਫੀਕਲ ਇੰਟਰਫੇਸ"
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
#, c-format
msgid "Network & Internet"
msgstr "ਨੈੱਟਵਰਕ ਤੇ ਇੰਟਰਨੈੱਟ"
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
#, c-format
msgid "Proxies"
msgstr "ਪਰਾਕਸੀ"
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
#, c-format
msgid "configured"
msgstr "ਸੰਰਚਿਤ"
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
#, c-format
msgid "Security Level"
msgstr "ਸੁਰੱਖਿਆ ਪੱਧਰ"
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
#, c-format
msgid "Firewall"
msgstr "ਫਾਇਰਵਾਲ"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "activated"
msgstr "ਸਰਗਰਮ"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "disabled"
msgstr "ਅਯੋਗ"
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
#, c-format
msgid "You have not configured X. Are you sure you really want this?"
msgstr "ਤੁਸੀਂ X ਸੰਰਚਿਤ ਨਹੀਂ ਕੀਤਾ। ਕੀ ਤੁਸੀਂ ਯਕੀਨਨ ਇਸ ਨੂੰ ਚਾਹੁੰਦੇ ਹੋ?"
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
#, c-format
msgid "Preparing bootloader..."
msgstr "ਬੂਟ-ਲੋਡਰ ਤਿਆਰ ਕਰ ਰਿਹਾ ਹੈ..."
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
#, c-format
msgid "Be patient, this may take a while..."
msgstr ""
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
#, c-format
msgid ""
"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1399,24 +1348,24 @@ msgstr ""
"ਜਾਰੀ ਰਹੇਗਾ, ਪਰ ਤੁਹਾਨੂੰ ਆਪਣੀ ਮਸ਼ੀਨ ਬੂਟ ਕਰਨ ਲਈ BootX ਜਾਂ ਹੋਰ ਢੰਗ ਵਰਤਣ ਦੀ ਲੋੜ ਪਵੇਗੀ। ਰੂਟ "
"ਫਾਇਲ ਸਿਸਟਮ ਲਈ ਕਰਨਲ ਆਰਗੂਮੈਂਟ ਹਨ: root=%s"
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
#, c-format
msgid ""
"In this security level, access to the files in the Windows partition is "
"restricted to the administrator."
msgstr "ਇਸ ਸੁਰੱਖਿਆ ਪੱਧਰ ਵਿੱਚ, Windows ਭਾਗ ਵਿਚਲੀ ਫਾਇਲਾਂ ਵਰਤਣ ਲਈ ਪ੍ਰਬੰਧਕ ਨੂੰ ਮਨਾਹੀ ਹੈ।"
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr "ਡਰਾਈਵ %s ਵਿੱਚ ਖਾਲੀ ਫਲਾਪੀ ਪਾਓ"
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
#, c-format
msgid "Creating auto install floppy..."
msgstr "ਸਵੈ ਇੰਸਟਾਲ ਫਲਾਪੀ ਬਣਾ ਰਿਹਾ ਹੈ..."
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
#, c-format
msgid ""
"Some steps are not completed.\n"
@@ -1427,7 +1376,7 @@ msgstr ""
"\n"
"ਕੀ ਤੁਸੀਂ ਹੁਣ ਯਕੀਨਨ ਬਾਹਰ ਜਾਣਾ ਹੈ?"
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
#, c-format
msgid "Congratulations"
msgstr "ਮੁਬਾਰਕਾਂ"
@@ -1572,6 +1521,10 @@ msgid ""
msgstr "ਬਾਹਰ"
#, fuzzy
+#~ msgid "Downloading file %s..."
+#~ msgstr "ਫਾਇਲਾਂ ਭੇਜ ਰਿਹਾ ਹੈ..."
+
+#, fuzzy
#~ msgid "IceWm Desktop"
#~ msgstr "ਵਿਹੜਾ"
diff --git a/perl-install/install/share/po/pl.po b/perl-install/install/share/po/pl.po
index b3bf8a201..a0cee708a 100644
--- a/perl-install/install/share/po/pl.po
+++ b/perl-install/install/share/po/pl.po
@@ -18,40 +18,17 @@ msgid ""
msgstr ""
"Project-Id-Version: DrakX\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
"PO-Revision-Date: 2009-03-31 08:02+0200\n"
-"Last-Translator: Amazis.net sp. z o.o. - Tomasz Bednarski <tomasz.bednarski@amazis.pl>\n"
+"Last-Translator: Amazis.net sp. z o.o. - Tomasz Bednarski <tomasz."
+"bednarski@amazis.pl>\n"
"Language-Team: <pl@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr "Twój biurkowy system na kluczu USB"
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr "Open source w 100%% - dystrybucja Mandriva Linux"
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr "Mandriva One - łatwy sposób na poznanie Linuksa"
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr "Kompletny system Mandriva Linux z pomocą techniczną"
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr "Mandriva: systemy dla każdego"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%"
+"100<10 || n%100>=20) ? 1 : 2);\n"
#: any.pm:109
#, c-format
@@ -93,71 +70,73 @@ msgstr "Sieć (FTP)"
msgid "Network (NFS)"
msgstr "Sieć (NFS)"
-#: any.pm:163
+#: any.pm:165
#, c-format
msgid "URL of the mirror?"
msgstr "Adres URL dla serwera zwierciadlanego?"
-#: any.pm:169
+#: any.pm:171
#, c-format
msgid "URL must start with ftp:// or http://"
msgstr "Adres URL musi zaczynać się od ftp:// lub http://"
-#: any.pm:180
+#: any.pm:182
#, c-format
-msgid "Contacting Mandriva Linux web site to get the list of available mirrors..."
+msgid ""
+"Contacting Mandriva Linux web site to get the list of available mirrors..."
msgstr ""
"Łączenie ze stroną Mandriva Linux w celu pobrania listy dostępnych "
"serwerów..."
-#: any.pm:185
+#: any.pm:187
#, c-format
msgid ""
"Failed contacting Mandriva Linux web site to get the list of available "
"mirrors"
-msgstr "Łączenie ze stroną Mandriva Linux w celu pobrania listy dostępnych serwerów"
+msgstr ""
+"Łączenie ze stroną Mandriva Linux w celu pobrania listy dostępnych serwerów"
-#: any.pm:195
+#: any.pm:197
#, c-format
msgid "Choose a mirror from which to get the packages"
msgstr "Wybierz serwer lustrzany, z którego chcesz pobrać pakiety"
-#: any.pm:225
+#: any.pm:227
#, c-format
msgid "NFS setup"
msgstr "Konfiguracja NFS"
-#: any.pm:226
+#: any.pm:228
#, c-format
msgid "Please enter the hostname and directory of your NFS media"
msgstr "Wprowadź nazwę komputera i katalog nośnika NFS"
-#: any.pm:230
+#: any.pm:232
#, c-format
msgid "Hostname missing"
msgstr "Brak nazwy hosta"
-#: any.pm:231
+#: any.pm:233
#, c-format
msgid "Directory must begin with \"/\""
msgstr "Oznaczenie katalogu musi się zaczynać od znaku \"/\""
-#: any.pm:235
+#: any.pm:237
#, c-format
msgid "Hostname of the NFS mount ?"
msgstr "Nazwa komputera udostępniające udziały NFS?"
-#: any.pm:236
+#: any.pm:238
#, c-format
msgid "Directory"
msgstr "Katalog"
-#: any.pm:258
+#: any.pm:260
#, c-format
msgid "Supplementary"
msgstr "Dodatkowe"
-#: any.pm:293
+#: any.pm:295
#, c-format
msgid ""
"Can't find a package list file on this mirror. Make sure the location is "
@@ -166,22 +145,22 @@ msgstr ""
"Nie można znaleźć listy pakietów na tym serwerze. Sprawdź poprawność "
"lokalizacji."
-#: any.pm:328
+#: any.pm:334
#, c-format
msgid "Looking at packages already installed..."
msgstr "Wyszukiwanie już zainstalowanych pakietów..."
-#: any.pm:362
+#: any.pm:368
#, c-format
msgid "Finding packages to upgrade..."
msgstr "Wyszukiwanie pakietów do uaktualnienia..."
-#: any.pm:381
+#: any.pm:387
#, c-format
msgid "Removing packages prior to upgrade..."
msgstr "Usuwanie pakietów w celu wykonania aktualizacji..."
-#: any.pm:402
+#: any.pm:408
#, c-format
msgid ""
"You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -203,18 +182,18 @@ msgstr ""
"uruchom ponownie komputer i zaktualizuj system używając apletu Mandriva "
"Update."
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
#, c-format
msgid "Reboot"
msgstr "Uruchom ponownie"
-#: any.pm:407
+#: any.pm:413
#, c-format
msgid "Proceed"
msgstr "Rozpocznij"
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -227,72 +206,72 @@ msgstr ""
"\n"
"Czy naprawdę chcesz usunąć te pakiety?\n"
-#: any.pm:815
+#: any.pm:821
#, c-format
msgid "Error reading file %s"
msgstr "Błąd odczytu pliku %s"
-#: any.pm:1022
+#: any.pm:1028
#, c-format
msgid "The following disk(s) were renamed:"
msgstr "Zmieniono nazwy następujących dysków:"
-#: any.pm:1024
+#: any.pm:1030
#, c-format
msgid "%s (previously named as %s)"
msgstr "%s (wcześniejsza nazwa: %s)"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "HTTP"
msgstr "HTTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "FTP"
msgstr "FTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "NFS"
msgstr "NFS"
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
#, c-format
msgid "Network"
msgstr "Sieć"
-#: any.pm:1104
+#: any.pm:1110
#, c-format
msgid "Please choose a media"
msgstr "Proszę wybrać nośnik"
-#: any.pm:1120
+#: any.pm:1126
#, c-format
msgid "File already exists. Overwrite it?"
msgstr "Plik już istnieje. Nadpisać?"
-#: any.pm:1124
+#: any.pm:1130
#, c-format
msgid "Permission denied"
msgstr "Dostęp zabroniony"
-#: any.pm:1172
+#: any.pm:1178
#, c-format
msgid "Bad NFS name"
msgstr "Niepoprawna nazwa NFS"
-#: any.pm:1193
+#: any.pm:1199
#, c-format
msgid "Bad media %s"
msgstr "Nieprawidłowy nośnik %s"
-#: any.pm:1236
+#: any.pm:1242
#, c-format
msgid "Can not make screenshots before partitioning"
msgstr "Nie można pobrać zrzutu ekranu przed partycjonowaniem"
-#: any.pm:1244
+#: any.pm:1250
#, c-format
msgid "Screenshots will be available after install in %s"
msgstr "Zrzuty ekranu będą dostępne po instalacji w %s"
@@ -303,11 +282,15 @@ msgid "Installation"
msgstr "Instalacja"
#: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
#, c-format
msgid "Configuration"
msgstr "Konfiguracja"
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
#: install2.pm:168
#, c-format
msgid "You must also format %s"
@@ -332,22 +315,22 @@ msgstr "Uruchamianie sieci"
msgid "Bringing down the network"
msgstr "Zatrzymywanie sieci"
-#: media.pm:402
+#: media.pm:399
#, c-format
msgid "Please wait, retrieving file"
msgstr "Proszę czekać. Pobieranie pliku"
-#: media.pm:734
+#: media.pm:718
#, c-format
-msgid "Downloading file %s..."
-msgstr "Pobieranie pliku %s..."
+msgid "unable to add medium"
+msgstr ""
-#: media.pm:822
+#: media.pm:758
#, c-format
msgid "Copying some packages on disks for future use"
msgstr "Kopiowanie wybranych pakietów do późniejszego wykorzystania"
-#: media.pm:875
+#: media.pm:811
#, c-format
msgid "Copying in progress"
msgstr "Kopiowanie w toku"
@@ -391,27 +374,27 @@ msgstr ""
msgid "An error occurred:"
msgstr "Wystąpił błąd:"
-#: pkgs.pm:776
+#: pkgs.pm:780
#, c-format
msgid "%d installation transactions failed"
msgstr "%d transakcji instalacyjnych zakończonych niepowodzeniem"
-#: pkgs.pm:777
+#: pkgs.pm:781
#, c-format
msgid "Installation of packages failed:"
msgstr "Instalowanie pakietów nie powiodło się:"
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
#, c-format
msgid "Workstation"
msgstr "Stacja robocza"
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
#, c-format
msgid "Office Workstation"
msgstr "Stacja biurowa"
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
#, c-format
msgid ""
"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -420,7 +403,7 @@ msgstr ""
"Programy biurowe: procesory tekstu (OpenOffice.org Writer, Kword), arkusze "
"kalkulacyjne (OpenOffice.org, Kspread), przeglądarki pdf, itd."
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
#, c-format
msgid ""
"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -429,32 +412,32 @@ msgstr ""
"Programy biurowe: procesory tekstu (kword, abiword), arkusze kalkulacyjne "
"(kspread, gnumeric), przeglądarki pdf, itd."
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
#, c-format
msgid "Game station"
msgstr "Stacja rozrywkowa (gry)"
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
#, c-format
msgid "Amusement programs: arcade, boards, strategy, etc"
msgstr "Programy rozrywkowe: gry przygodowe, planszowe, strategie, itd."
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
#, c-format
msgid "Multimedia station"
msgstr "Stacja multimedialna"
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
#, c-format
msgid "Sound and video playing/editing programs"
msgstr "Programy do odtwarzania/edycji dźwięku i obrazu"
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
#, c-format
msgid "Internet station"
msgstr "Stacja internetowa"
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
#, c-format
msgid ""
"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -463,211 +446,193 @@ msgstr ""
"Zestaw narzędzi do odczytu i przesyłania poczty i grup dyskusyjnych (mutt, "
"tin...) oraz przeglądania sieci"
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
#, c-format
msgid "Network Computer (client)"
msgstr "Komputer sieciowy (klient)"
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
#, c-format
msgid "Clients for different protocols including ssh"
msgstr "Programy klienckie dla różnych protokołów włączając ssh"
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
#, c-format
msgid "Tools to ease the configuration of your computer"
msgstr "Narzędzia do łatwego zarządzania komputerem"
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
#, c-format
msgid "Console Tools"
msgstr "Narzędzia konsolowe"
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
#, c-format
msgid "Editors, shells, file tools, terminals"
msgstr "Edytory, powłoki, narzędzia plikowe, terminale"
#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
#, c-format
msgid "Development"
msgstr "Programowanie"
#: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
#, c-format
msgid "C and C++ development libraries, programs and include files"
msgstr "Biblioteki programistyczne C i C++, programy i pliki nagłówkowe"
#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
#, c-format
msgid "Documentation"
msgstr "Dokumentacja"
#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
#, c-format
msgid "Books and Howto's on Linux and Free Software"
msgstr "Książki i dokumenty HOWTO o Linuksie i Otwartym Oprogramowaniu"
#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
#, c-format
msgid "LSB"
msgstr "LSB"
#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
#, c-format
msgid "Linux Standard Base. Third party applications support"
msgstr "Linux Standard Base. Obsługa aplikacji firm trzecich"
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
#, c-format
msgid "Web Server"
msgstr "Serwer WWW"
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
#, c-format
msgid "Apache"
msgstr "Apache"
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
#, c-format
msgid "Groupware"
msgstr "System do pracy grupowej"
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
#, c-format
msgid "Kolab Server"
msgstr "Serwer Kolab"
#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
#, c-format
msgid "Firewall/Router"
msgstr "Zapora sieciowa/router"
#: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
#, c-format
msgid "Internet gateway"
msgstr "Bramka internetowa"
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
#, c-format
msgid "Mail/News"
msgstr "Poczta/wiadomości"
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
#, c-format
msgid "Postfix mail server, Inn news server"
msgstr "Serwer pocztowy Postfix, serwer grup Inn"
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
#, c-format
msgid "Directory Server"
msgstr "Serwer katalogowy"
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
#, c-format
msgid "FTP Server"
msgstr "Serwer FTP"
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
#, c-format
msgid "ProFTPd"
msgstr "ProFTPd"
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
#, c-format
msgid "DNS/NIS"
msgstr "DNS/NIS"
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
#, c-format
msgid "Domain Name and Network Information Server"
msgstr "Serwer nazw domenowych i informacji sieciowych"
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
#, c-format
msgid "File and Printer Sharing Server"
msgstr "Serwer udostępniania plików i drukarek"
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
#, c-format
msgid "NFS Server, Samba server"
msgstr "Serwer NFS, serwer Samby"
#: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
#, c-format
msgid "Database"
msgstr "Baza danych"
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
#, c-format
msgid "PostgreSQL and MySQL Database Server"
msgstr "Serwer bazodanowy PostgreSQL i MySQL"
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
#, c-format
msgid "Web/FTP"
msgstr "Web/FTP"
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
#, c-format
msgid "Apache, Pro-ftpd"
msgstr "Apache, Pro-ftpd"
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
#, c-format
msgid "Mail"
msgstr "Poczta"
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
#, c-format
msgid "Postfix mail server"
msgstr "Serwer pocztowy Postfix"
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
#, c-format
msgid "PostgreSQL or MySQL database server"
msgstr "Serwer bazodanowy PostgreSQL i MySQL"
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
#, c-format
msgid "Network Computer server"
msgstr "Serwer sieciowy"
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
#, c-format
msgid "NFS server, SMB server, Proxy server, ssh server"
msgstr "Serwer NIS, serwer SMB, serwer pośrednika, serwer ssh"
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
#, c-format
msgid "Graphical Environment"
msgstr "Środowisko graficzne"
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
#, c-format
msgid "KDE Workstation"
msgstr "Stacja KDE"
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
#, c-format
msgid ""
"The K Desktop Environment, the basic graphical environment with a collection "
@@ -676,12 +641,12 @@ msgstr ""
"Środowisko graficzne KDE, podstawowe środowisko graficzne ze zbiorem "
"narzędzi towarzyszących"
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
#, c-format
msgid "GNOME Workstation"
msgstr "Stacja GNOME"
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
#, c-format
msgid ""
"A graphical environment with user-friendly set of applications and desktop "
@@ -690,7 +655,7 @@ msgstr ""
"Środowisko graficzne z przyjaznym dla użytkownika zbiorem aplikacji i "
"narzędzi graficznych"
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
#, c-format
msgid "LXDE Desktop"
msgstr "Pulpit LXDE"
@@ -701,57 +666,55 @@ msgid ""
"A lightweight & fast graphical environment with user-friendly set of "
"applications and desktop tools"
msgstr ""
-"Lekkie i szybkie środowisko graficzne z przyjaznym dla użytkownika zbiorem aplikacji i "
-"narzędzi graficznych"
+"Lekkie i szybkie środowisko graficzne z przyjaznym dla użytkownika zbiorem "
+"aplikacji i narzędzi graficznych"
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
#, c-format
msgid "Other Graphical Desktops"
msgstr "Inne środowiska graficzne"
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
#, c-format
msgid "Window Maker, Enlightenment, Fvwm, etc"
msgstr "Window Maker, Enlightenment, Fvwm, itd."
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
#, c-format
msgid "Utilities"
msgstr "Narzędzia"
#: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
#, c-format
msgid "SSH Server"
msgstr "Serwer SSH"
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
#, c-format
msgid "Webmin"
msgstr "Webmin"
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
#, c-format
msgid "Webmin Remote Configuration Server"
msgstr "Serwer konfiguracji zdalnej Webmin"
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
#, c-format
msgid "Network Utilities/Monitoring"
msgstr "Narzędzia sieciowe/monitorowanie"
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
#, c-format
msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
msgstr "Narzędzia do monitorowania, księgowania procesów, tcpdump, nmap, ..."
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
#, c-format
msgid "Mandriva Wizards"
msgstr "Druidy Mandriva"
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
#, c-format
msgid "Wizards to configure server"
msgstr "Druidy do konfiguracji serwera"
@@ -850,17 +813,17 @@ msgstr "Przegląd pulpitu '%s'."
msgid "Click on images in order to see a bigger preview"
msgstr "Kliknij obrazek, aby zobaczyć większy podgląd"
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
#, c-format
msgid "Package Group Selection"
msgstr "Wybór grup pakietów"
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
#, c-format
msgid "Individual package selection"
msgstr "Samodzielny wybór pakietów"
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
#, c-format
msgid "Total size: %d / %d MB"
msgstr "Rozmiar: %d / %d MB"
@@ -977,12 +940,12 @@ msgstr "Minimalna instalacja"
msgid "Software Management"
msgstr "Zarządzanie oprogramowaniem"
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
#, c-format
msgid "Choose the packages you want to install"
msgstr "Wybierz pakiety do zainstalowania"
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
#, c-format
msgid "Installing"
msgstr "Instalowanie"
@@ -1010,7 +973,7 @@ msgstr[0] "pakiet"
msgstr[1] "%d pakietów"
msgstr[2] "%d pakietów"
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
#, c-format
msgid "Summary"
msgstr "Różne"
@@ -1020,7 +983,7 @@ msgstr "Różne"
msgid "Configure"
msgstr "Konfiguruj"
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
#, c-format
msgid "not configured"
msgstr "nie skonfigurowano"
@@ -1030,7 +993,7 @@ msgstr "nie skonfigurowano"
msgid "Media Selection"
msgstr "Wybór nośników"
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
#, c-format
msgid ""
"The following installation media have been found.\n"
@@ -1039,7 +1002,7 @@ msgstr ""
"Znaleziono poniższe nośniki instalacyjne.\n"
"Jeśli chcesz pominąć któreś z nich, możesz je teraz odznaczyć."
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
#, c-format
msgid ""
"You have the option to copy the contents of the CDs onto the hard drive "
@@ -1052,7 +1015,7 @@ msgstr ""
"Instalacja będzie kontynuowana z dysku twardego a skopiowane pakiety będą "
"dostępne po zakończeniu instalacji."
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
#, c-format
msgid "Copy whole CDs"
msgstr "Skopiuj wszystkie płyty CD"
@@ -1072,59 +1035,49 @@ msgstr "Wybierz układ klawiatury"
msgid "Here is the full list of available keyboards:"
msgstr "Oto pełna lista dostępnych klawiatur:"
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
#, c-format
msgid "Install/Upgrade"
msgstr "Instalacja/Uaktualnienie"
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
#, c-format
msgid "Is this an install or an upgrade?"
msgstr "Czy to instalacja czy uaktualnienie?"
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
#, c-format
msgid ""
"_: This is a noun:\n"
"Install"
msgstr "Zainstaluj"
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
#, c-format
msgid "Upgrade %s"
msgstr "Uaktualnienie %s"
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr "Aktualizacja z 32 do 64 bitowej wersji dystrybucji nie jest obsługiwana"
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr "Aktualizacja z 64 do 32 bitowej wersji dystrybucji nie jest obsługiwana"
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
#, c-format
msgid "Encryption key for %s"
msgstr "Klucz szyfrujący dla %s"
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
#, c-format
msgid "Cancel installation, reboot system"
msgstr "Anuluj instalację, uruchom komputer ponownie"
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
#, c-format
msgid "New Installation"
msgstr "Nowa instalacja"
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
#, c-format
msgid "Upgrade previous installation (not recommended)"
msgstr "Zaktualizuj istniejącą instalację (nie zalecane)"
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
#, c-format
msgid ""
"Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1143,17 +1096,17 @@ msgstr ""
"Uwaga: wykonaj kopie wszystkich osobistych plików zanim wybierzesz\n"
"opcję \"Nowa instalacja\"."
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "IDE"
msgstr "IDE"
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "Configuring IDE"
msgstr "Konfiguracja IDE"
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
#, c-format
msgid ""
"No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1163,7 +1116,7 @@ msgstr ""
"lecz aby uruchomić system, należy utworzyć partycję bootstrap za pomocą "
"programu DiskDrake."
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
#, c-format
msgid ""
"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1174,7 +1127,7 @@ msgstr ""
"kontynuowana, lecz aby uruchomić system, należy utworzyć partycję bootstrap "
"w programie DiskDrake."
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
#, c-format
msgid ""
"Change your Cd-Rom!\n"
@@ -1187,12 +1140,12 @@ msgstr ""
"Włóż płytę \"%s\" do napędu i naciśnij Ok. Jeśli jej nie posiadasz, naciśnij "
"Anuluj, aby pominąć instalację pakietów z tej płyty."
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
#, c-format
msgid "Looking for available packages..."
msgstr "Wyszukiwanie dostępnych pakietów..."
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
#, c-format
msgid ""
"Your system does not have enough space left for installation or upgrade (%"
@@ -1201,7 +1154,7 @@ msgstr ""
"Za mało miejsca na dysku dla przeprowadzenia instalacji lub aktualizacji (%"
"dMB > %dMB)"
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
#, c-format
msgid ""
"Please choose load or save package selection.\n"
@@ -1211,52 +1164,52 @@ msgstr ""
"Format jest identyczny z dyskiem automatycznej\n"
"instalacji."
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Load"
msgstr "Wczytaj"
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Save"
msgstr "Zapisz"
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
#, c-format
msgid "Bad file"
msgstr "Nieprawidłowy plik"
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
#, c-format
msgid "KDE"
msgstr "KDE"
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
#, c-format
msgid "GNOME"
msgstr "GNOME"
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
#, c-format
msgid "Desktop Selection"
msgstr "Wybór pulpitu"
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
#, c-format
msgid "You can choose your workstation desktop profile."
msgstr "Możesz wybrać profil swojego pulpitu: "
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
#, c-format
msgid "Selected size is larger than available space"
msgstr "Wybrany rozmiar przekracza dostępne miejsce"
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
#, c-format
msgid "Type of install"
msgstr "Typ instalacji"
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
#, c-format
msgid ""
"You have not selected any group of packages.\n"
@@ -1265,82 +1218,82 @@ msgstr ""
"Nie wybrano żadnej grupy pakietów.\n"
"Wybierz minimalną żądaną instalację:"
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
#, c-format
msgid "With X"
msgstr "Z X Window"
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
#, c-format
msgid "With basic documentation (recommended!)"
msgstr "Z podstawową dokumentacją (zalecane!)"
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
#, c-format
msgid "Truly minimal install (especially no urpmi)"
msgstr "Naprawdę minimalna instalacja (w szczególności bez urpmi)"
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
#, c-format
msgid "Preparing installation"
msgstr "Przygotowywanie instalacji"
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
#, c-format
msgid "Installing package %s"
msgstr "Instalowanie pakietu %s"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "There was an error ordering packages:"
msgstr "Wystąpił błąd porządkowania pakietów:"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "Go on anyway?"
msgstr "Kontynuować?"
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
#, c-format
msgid "Retry"
msgstr "Ponów próbę"
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
#, c-format
msgid "Skip this package"
msgstr "Pomiń ten pakiet"
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
#, c-format
msgid "Skip all packages from medium \"%s\""
msgstr "Pomiń wszystkie pakiety z nośnika \"%s\""
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
#, c-format
msgid "Go back to media and packages selection"
msgstr "Wróć do wyboru nośników i pakietów"
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
#, c-format
msgid "There was an error installing package %s."
msgstr "Wystąpił błąd podczas instalowania pakietu %s."
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
#, c-format
msgid "Post-install configuration"
msgstr "Konfiguracja poinstalacyjna"
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
#, c-format
msgid "Please ensure the Update Modules media is in drive %s"
msgstr "Upewnij się, że nośnik Update Modules znajduje się w napędzie %s"
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
#, c-format
msgid "Updates"
msgstr "Aktualizacje"
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
#, c-format
msgid ""
"You now have the opportunity to download updated packages. These packages\n"
@@ -1360,28 +1313,28 @@ msgstr ""
"\n"
"Czy chcesz zainstalować uaktualnienia ?"
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
#, c-format
msgid "%s on %s"
msgstr "%s na %s"
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
#, c-format
msgid "Hardware"
msgstr "Sprzęt"
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
#, c-format
msgid "Sound card"
msgstr "Karta dźwiękowa"
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
#, c-format
msgid "Do you have an ISA sound card?"
msgstr "Czy posiadasz kartę dźwiękową ISA?"
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
#, c-format
msgid ""
"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1390,69 +1343,69 @@ msgstr ""
"Uruchom \"alsaconf\" lub \"sndconfig\" po zakończeniu instalacji aby "
"skonfigurować kartę dźwiękową"
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
#, c-format
msgid "No sound card detected. Try \"harddrake\" after installation"
msgstr ""
"Karta dźwiękowa nie została wykryta. Wypróbuj \"harddrake\" po zakończeniu "
"instalacji"
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
#, c-format
msgid "Graphical interface"
msgstr "Interfejs graficzny"
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
#, c-format
msgid "Network & Internet"
msgstr "Sieć i Internet"
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
#, c-format
msgid "Proxies"
msgstr "Serwery pośredniczące"
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
#, c-format
msgid "configured"
msgstr "skonfigurowano"
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
#, c-format
msgid "Security Level"
msgstr "Poziom bezpieczeństwa"
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
#, c-format
msgid "Firewall"
msgstr "Zapora sieciowa"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "activated"
msgstr "aktywowano"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "disabled"
msgstr "wyłączono"
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
#, c-format
msgid "You have not configured X. Are you sure you really want this?"
msgstr "Nie masz skonfigurowanego systemu X Window. Czy na pewno chcesz tego?"
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
#, c-format
msgid "Preparing bootloader..."
msgstr "Przygotowywanie programu rozruchowego..."
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
#, c-format
msgid "Be patient, this may take a while..."
msgstr "Proszę o cierpliwość, to może potrwać chwilę..."
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
#, c-format
msgid ""
"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1465,7 +1418,7 @@ msgstr ""
"kontynuowana, lecz konieczne jest użycie programu BootX, aby uruchomić "
"komputer. Argument jądra dla głównego systemu plików \"/\": root=%s"
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
#, c-format
msgid ""
"In this security level, access to the files in the Windows partition is "
@@ -1474,17 +1427,17 @@ msgstr ""
"W tym poziomie zabezpieczeń, dostęp do plików na partycji Windows jest "
"ograniczony do administratora."
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr "Włóż pustą dyskietkę do stacji %s"
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
#, c-format
msgid "Creating auto install floppy..."
msgstr "Tworzenie dyskietki automatycznej instalacji..."
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
#, c-format
msgid ""
"Some steps are not completed.\n"
@@ -1495,7 +1448,7 @@ msgstr ""
"\n"
"Czy na pewno chcesz teraz zakończyć?"
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
#, c-format
msgid "Congratulations"
msgstr "Gratulacje"
@@ -1639,3 +1592,28 @@ msgid ""
"Exit"
msgstr "Wyjdź"
+#~ msgid "Your desktop on a USB key"
+#~ msgstr "Twój biurkowy system na kluczu USB"
+
+#~ msgid "The 100%% open source Mandriva Linux distribution"
+#~ msgstr "Open source w 100%% - dystrybucja Mandriva Linux"
+
+#~ msgid "Explore Linux easily with Mandriva One"
+#~ msgstr "Mandriva One - łatwy sposób na poznanie Linuksa"
+
+#~ msgid "A full Mandriva Linux desktop, with support"
+#~ msgstr "Kompletny system Mandriva Linux z pomocą techniczną"
+
+#~ msgid "Mandriva: distributions for everybody's needs"
+#~ msgstr "Mandriva: systemy dla każdego"
+
+#~ msgid "Downloading file %s..."
+#~ msgstr "Pobieranie pliku %s..."
+
+#~ msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
+#~ msgstr ""
+#~ "Aktualizacja z 32 do 64 bitowej wersji dystrybucji nie jest obsługiwana"
+
+#~ msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
+#~ msgstr ""
+#~ "Aktualizacja z 64 do 32 bitowej wersji dystrybucji nie jest obsługiwana"
diff --git a/perl-install/install/share/po/pt.po b/perl-install/install/share/po/pt.po
index 0c21b21f7..cd619c413 100644
--- a/perl-install/install/share/po/pt.po
+++ b/perl-install/install/share/po/pt.po
@@ -22,7 +22,7 @@ msgid ""
msgstr ""
"Project-Id-Version: pt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
"PO-Revision-Date: 2008-10-02 21:35+0100\n"
"Last-Translator: Zé <ze@mandriva.org>\n"
"Language-Team: Português <pt@li.org>\n"
@@ -32,31 +32,6 @@ msgstr ""
"X-Generator: KBabel 1.11.4\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr "O seu ecrã num dispositivo USB"
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr "A distribuição Mandriva Linux 100%% código livre"
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr "Explore o Linux facilmente com o Mandriva One"
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr "Um ecrã Mandriva Linux completo, com suporte"
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr "Mandriva: distribuições para as necessidades de todos os utilizadores"
-
#: any.pm:109
#, c-format
msgid "Do you have further supplementary media?"
@@ -96,17 +71,17 @@ msgstr "Rede (FTP)"
msgid "Network (NFS)"
msgstr "Rede (NFS)"
-#: any.pm:163
+#: any.pm:165
#, c-format
msgid "URL of the mirror?"
msgstr "URL do espelho?"
-#: any.pm:169
+#: any.pm:171
#, c-format
msgid "URL must start with ftp:// or http://"
msgstr "O URL deve começar por ftp:// ou http://"
-#: any.pm:180
+#: any.pm:182
#, c-format
msgid ""
"Contacting Mandriva Linux web site to get the list of available mirrors..."
@@ -114,7 +89,7 @@ msgstr ""
"A contactar o sítio web Mandriva Linux para obter a lista de espelhos "
"disponíveis..."
-#: any.pm:185
+#: any.pm:187
#, c-format
msgid ""
"Failed contacting Mandriva Linux web site to get the list of available "
@@ -123,47 +98,47 @@ msgstr ""
"Falha ao contactar o sítio web Mandriva Linux para obter a lista de espelhos "
"disponíveis"
-#: any.pm:195
+#: any.pm:197
#, c-format
msgid "Choose a mirror from which to get the packages"
msgstr "Escolha um espelho para transferir os pacotes"
-#: any.pm:225
+#: any.pm:227
#, c-format
msgid "NFS setup"
msgstr "Configuração NFS"
-#: any.pm:226
+#: any.pm:228
#, c-format
msgid "Please enter the hostname and directory of your NFS media"
msgstr "Por favor indique o endereço e o directório da sua média NFS"
-#: any.pm:230
+#: any.pm:232
#, c-format
msgid "Hostname missing"
msgstr "Nome do endereço em falta"
-#: any.pm:231
+#: any.pm:233
#, c-format
msgid "Directory must begin with \"/\""
msgstr "O directório deve começar por \"/\""
-#: any.pm:235
+#: any.pm:237
#, c-format
msgid "Hostname of the NFS mount ?"
msgstr "Endereço da montagem NFS?"
-#: any.pm:236
+#: any.pm:238
#, c-format
msgid "Directory"
msgstr "Directório"
-#: any.pm:258
+#: any.pm:260
#, c-format
msgid "Supplementary"
msgstr "Suplementar"
-#: any.pm:293
+#: any.pm:295
#, c-format
msgid ""
"Can't find a package list file on this mirror. Make sure the location is "
@@ -172,22 +147,22 @@ msgstr ""
"Não é possível encontrar o ficheiro hdlist neste espelho. Certifique-se que "
"a localização está correcta."
-#: any.pm:328
+#: any.pm:334
#, c-format
msgid "Looking at packages already installed..."
msgstr "A verificar os pacotes já instalados..."
-#: any.pm:362
+#: any.pm:368
#, c-format
msgid "Finding packages to upgrade..."
msgstr "A procurar pacotes para actualizar..."
-#: any.pm:381
+#: any.pm:387
#, c-format
msgid "Removing packages prior to upgrade..."
msgstr "A remover pacotes antes de actualizar..."
-#: any.pm:402
+#: any.pm:408
#, c-format
msgid ""
"You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -207,18 +182,18 @@ msgstr ""
"por favor reinicie o seu sistema e actualize usando a ferramenta de "
"actualização Mandriva."
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
#, c-format
msgid "Reboot"
msgstr "Reiniciar"
-#: any.pm:407
+#: any.pm:413
#, c-format
msgid "Proceed"
msgstr ""
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -232,72 +207,72 @@ msgstr ""
"\n"
"Deseja realmente remover estes pacotes ?\n"
-#: any.pm:815
+#: any.pm:821
#, c-format
msgid "Error reading file %s"
msgstr "Erro ao ler o ficheiro %s"
-#: any.pm:1022
+#: any.pm:1028
#, c-format
msgid "The following disk(s) were renamed:"
msgstr "Os seguintes discos foram renomeados:"
-#: any.pm:1024
+#: any.pm:1030
#, c-format
msgid "%s (previously named as %s)"
msgstr "%s (anteriormente conhecido por %s)"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "HTTP"
msgstr "HTTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "FTP"
msgstr "FTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "NFS"
msgstr "NFS"
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
#, c-format
msgid "Network"
msgstr "Rede"
-#: any.pm:1104
+#: any.pm:1110
#, c-format
msgid "Please choose a media"
msgstr "Por favor escolha uma média"
-#: any.pm:1120
+#: any.pm:1126
#, c-format
msgid "File already exists. Overwrite it?"
msgstr "O ficheiro já existe. Deseja sobrepôr o ficheiro?"
-#: any.pm:1124
+#: any.pm:1130
#, c-format
msgid "Permission denied"
msgstr "Permissão negada"
-#: any.pm:1172
+#: any.pm:1178
#, c-format
msgid "Bad NFS name"
msgstr "Nome NFS inválido"
-#: any.pm:1193
+#: any.pm:1199
#, c-format
msgid "Bad media %s"
msgstr "Média danificada %s"
-#: any.pm:1236
+#: any.pm:1242
#, c-format
msgid "Can not make screenshots before partitioning"
msgstr "Não é possível capturar imagens do ecrã antes de particionar"
-#: any.pm:1244
+#: any.pm:1250
#, c-format
msgid "Screenshots will be available after install in %s"
msgstr "As capturas de ecrã estarão disponíveis após instalar em %s"
@@ -308,11 +283,15 @@ msgid "Installation"
msgstr "Instalação"
#: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
#, c-format
msgid "Configuration"
msgstr "Configuração"
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
#: install2.pm:168
#, c-format
msgid "You must also format %s"
@@ -337,22 +316,22 @@ msgstr "A ligar a rede"
msgid "Bringing down the network"
msgstr "A desligar a rede"
-#: media.pm:402
+#: media.pm:399
#, c-format
msgid "Please wait, retrieving file"
msgstr "Por favor aguarde, a obter o ficheiro"
-#: media.pm:734
+#: media.pm:718
#, c-format
-msgid "Downloading file %s..."
-msgstr "A transferir o ficheiro %s..."
+msgid "unable to add medium"
+msgstr ""
-#: media.pm:822
+#: media.pm:758
#, c-format
msgid "Copying some packages on disks for future use"
msgstr "A copiar alguns pacotes no disco para uso futuro"
-#: media.pm:875
+#: media.pm:811
#, c-format
msgid "Copying in progress"
msgstr "Cópia em progresso"
@@ -396,27 +375,27 @@ msgstr ""
msgid "An error occurred:"
msgstr "Ocorreu um erro"
-#: pkgs.pm:776
+#: pkgs.pm:780
#, c-format
msgid "%d installation transactions failed"
msgstr "%d transacções de instalação falhadas"
-#: pkgs.pm:777
+#: pkgs.pm:781
#, fuzzy, c-format
msgid "Installation of packages failed:"
msgstr "A instalar o pacote %s"
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
#, c-format
msgid "Workstation"
msgstr "Estação de Trabalho"
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
#, c-format
msgid "Office Workstation"
msgstr "Estação de Trabalho de Escritório"
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
#, c-format
msgid ""
"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -425,7 +404,7 @@ msgstr ""
"Programas Office: processadores de texto (OpenOffice.org Writer, Kword), "
"folhas de cálculo (OpenOffice.org Calc, Kspread), visualizadores PDF, etc"
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
#, c-format
msgid ""
"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -434,32 +413,32 @@ msgstr ""
"Programas office: processadores de texto (kword, abiword), folhas de cálculo "
"(kspread, gnumeric), visualizadores pdf, etc"
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
#, c-format
msgid "Game station"
msgstr "Estação de Jogo"
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
#, c-format
msgid "Amusement programs: arcade, boards, strategy, etc"
msgstr "Programas de divertimento: arcada, tabuleiros, estratégia, etc"
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
#, c-format
msgid "Multimedia station"
msgstr "Estação multimédia"
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
#, c-format
msgid "Sound and video playing/editing programs"
msgstr "Aplicações de reprodução/edição de som e vídeo"
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
#, c-format
msgid "Internet station"
msgstr "Estação internet"
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
#, c-format
msgid ""
"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -468,212 +447,194 @@ msgstr ""
"Conjunto de ferramentas para ler e enviar correio electrónico e news (pine, "
"mutt, tin...) e para navegar na Web"
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
#, c-format
msgid "Network Computer (client)"
msgstr "Computador de Rede (cliente)"
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
#, c-format
msgid "Clients for different protocols including ssh"
msgstr "Clientes para diferentes protocolos incluindo ssh"
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
#, c-format
msgid "Tools to ease the configuration of your computer"
msgstr "Ferramentas para facilitar a configuração do seu computador"
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
#, c-format
msgid "Console Tools"
msgstr "Ferramentas de Consola"
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
#, c-format
msgid "Editors, shells, file tools, terminals"
msgstr ""
"Editores, Linha de Comandos (shell), ferramentas de ficheiros, terminais"
#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
#, c-format
msgid "Development"
msgstr "Desenvolvimento"
#: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
#, c-format
msgid "C and C++ development libraries, programs and include files"
msgstr "C e C++ bibliotecas de programação, programas e ficheiros 'include'"
#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
#, c-format
msgid "Documentation"
msgstr "Documentação"
#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
#, c-format
msgid "Books and Howto's on Linux and Free Software"
msgstr "Livros e Howto's sobre o Linux e Programas Livres"
#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
#, c-format
msgid "LSB"
msgstr "LSB"
#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
#, c-format
msgid "Linux Standard Base. Third party applications support"
msgstr "Base Padrão do Linux (LSB). Suporte a aplicações terceiras."
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
#, c-format
msgid "Web Server"
msgstr "Servidor Web"
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
#, c-format
msgid "Apache"
msgstr "Apache"
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
#, c-format
msgid "Groupware"
msgstr "Groupware"
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
#, c-format
msgid "Kolab Server"
msgstr "Servidor Kolab"
#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
#, c-format
msgid "Firewall/Router"
msgstr "Firewall/Router"
#: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
#, c-format
msgid "Internet gateway"
msgstr "Internet gateway"
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
#, c-format
msgid "Mail/News"
msgstr "Correio/Noticias"
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
#, c-format
msgid "Postfix mail server, Inn news server"
msgstr "Servidor de correio electrónico Postfix , servidor de noticias In"
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
#, c-format
msgid "Directory Server"
msgstr "Servidor de Directório"
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
#, c-format
msgid "FTP Server"
msgstr "Servidor FTP"
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
#, c-format
msgid "ProFTPd"
msgstr "ProFTPd"
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
#, c-format
msgid "DNS/NIS"
msgstr "DNS/NIS"
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
#, c-format
msgid "Domain Name and Network Information Server"
msgstr "Nome do Domínio e Servidor de Informação da Rede"
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
#, c-format
msgid "File and Printer Sharing Server"
msgstr "Servidor de Partilhas de Ficheiros e Impressão"
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
#, c-format
msgid "NFS Server, Samba server"
msgstr "Servidor NFS, Servidor Samba"
#: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
#, c-format
msgid "Database"
msgstr "Base de Dados"
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
#, c-format
msgid "PostgreSQL and MySQL Database Server"
msgstr "Servidor de Base de Dados PostgreSQL e MySQL"
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
#, c-format
msgid "Web/FTP"
msgstr "Web/FTP"
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
#, c-format
msgid "Apache, Pro-ftpd"
msgstr "Apache, Pro-ftpd"
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
#, c-format
msgid "Mail"
msgstr "Correio Electrónico"
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
#, c-format
msgid "Postfix mail server"
msgstr "Servidor de correio electrónico Postfix"
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
#, c-format
msgid "PostgreSQL or MySQL database server"
msgstr "Servidor de Base de Dados PostgreSQL ou MySQL"
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
#, c-format
msgid "Network Computer server"
msgstr "Servidor/Computador de Rede"
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
#, c-format
msgid "NFS server, SMB server, Proxy server, ssh server"
msgstr "Servidor NFS, servidor SMB, servidor Proxy, servidor SSH"
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
#, c-format
msgid "Graphical Environment"
msgstr "Ambiente Gráfico"
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
#, c-format
msgid "KDE Workstation"
msgstr "Estação de Trabalho KDE"
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
#, c-format
msgid ""
"The K Desktop Environment, the basic graphical environment with a collection "
@@ -682,12 +643,12 @@ msgstr ""
"O Ecrã de Trabalho K (KDE), o ambiente gráfico básico com uma colecção de "
"ferramentas de acompanhamento"
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
#, c-format
msgid "GNOME Workstation"
msgstr "Estação de Trabalho GNOME"
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
#, c-format
msgid ""
"A graphical environment with user-friendly set of applications and desktop "
@@ -696,7 +657,7 @@ msgstr ""
"Um ambiente gráfico com um conjunto de aplicações amigáveis e ferramentas de "
"ecrâ"
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
#, fuzzy, c-format
msgid "LXDE Desktop"
msgstr "Ecrâ KDE"
@@ -710,55 +671,53 @@ msgstr ""
"Um ambiente gráfico com um conjunto de aplicações amigáveis e ferramentas de "
"ecrâ"
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
#, c-format
msgid "Other Graphical Desktops"
msgstr "Outros Ambientes Gráficos"
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
#, c-format
msgid "Window Maker, Enlightenment, Fvwm, etc"
msgstr "Window Maker, Enlightenment, Fvwm, etc"
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
#, c-format
msgid "Utilities"
msgstr "Utilidades"
#: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
#, c-format
msgid "SSH Server"
msgstr "Servidor SSH"
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
#, c-format
msgid "Webmin"
msgstr "Webmin"
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
#, c-format
msgid "Webmin Remote Configuration Server"
msgstr "Servidor de Configuração Remota Webmin"
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
#, c-format
msgid "Network Utilities/Monitoring"
msgstr "Utilidades de Rede/Monitorização"
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
#, c-format
msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
msgstr ""
"Monitorização de ferramentas, contabilidade de processos, tcpdump, nmap, ..."
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
#, c-format
msgid "Mandriva Wizards"
msgstr "Assistentes Mandriva"
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
#, c-format
msgid "Wizards to configure server"
msgstr "Assistentes para configurar o servidor"
@@ -858,17 +817,17 @@ msgstr "Aqui está uma previsão do ecrã '%s'."
msgid "Click on images in order to see a bigger preview"
msgstr "Clique nas imagens para ver uma previsão maior."
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
#, c-format
msgid "Package Group Selection"
msgstr "Selecção dos Grupos de Pacotes"
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
#, c-format
msgid "Individual package selection"
msgstr "Selecção individual de pacotes"
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
#, c-format
msgid "Total size: %d / %d MB"
msgstr "Tamanho total: %d / %d MB"
@@ -986,12 +945,12 @@ msgstr "Instalação mínima"
msgid "Software Management"
msgstr "Gestão de Programas"
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
#, c-format
msgid "Choose the packages you want to install"
msgstr "Escolha os pacotes que deseja instalar"
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
#, c-format
msgid "Installing"
msgstr "Instalação"
@@ -1018,7 +977,7 @@ msgid_plural "%d packages"
msgstr[0] "%d pacote"
msgstr[1] "%d pacotes"
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
#, c-format
msgid "Summary"
msgstr "Sumário"
@@ -1028,7 +987,7 @@ msgstr "Sumário"
msgid "Configure"
msgstr "Configurar"
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
#, c-format
msgid "not configured"
msgstr "não configurado"
@@ -1038,7 +997,7 @@ msgstr "não configurado"
msgid "Media Selection"
msgstr "Selecção de Média"
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
#, c-format
msgid ""
"The following installation media have been found.\n"
@@ -1047,7 +1006,7 @@ msgstr ""
"A seguinte média de instalação foi encontrada.\n"
"Se quer evitar alguns deles, pode desmarcá-los agora."
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
#, c-format
msgid ""
"You have the option to copy the contents of the CDs onto the hard drive "
@@ -1060,7 +1019,7 @@ msgstr ""
"Irá continuar a partir do disco rígido e os pacotes irão permanecer "
"disponíveis assim que o sistema estiver instalado."
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
#, c-format
msgid "Copy whole CDs"
msgstr "Copiar todos os CDs"
@@ -1080,61 +1039,49 @@ msgstr "Por favor escolha o tipo de teclado"
msgid "Here is the full list of available keyboards:"
msgstr "Aqui está a lista completa dos teclados disponíveis:"
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
#, c-format
msgid "Install/Upgrade"
msgstr "Instalar/Actualizar"
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
#, c-format
msgid "Is this an install or an upgrade?"
msgstr "Isto é uma instalação ou uma actualização?"
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
#, c-format
msgid ""
"_: This is a noun:\n"
"Install"
msgstr "Instalar"
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
#, c-format
msgid "Upgrade %s"
msgstr "Actualizar %s"
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr ""
-"A actualização de uma distribuição 32bit para uma 64bit não é suportada"
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr ""
-"A actualização de uma distribuição 64bit para uma 32bit não é suportada"
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
#, c-format
msgid "Encryption key for %s"
msgstr "Senha de encriptação para %s"
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
#, c-format
msgid "Cancel installation, reboot system"
msgstr "Cancelar instalação, reiniciar o sistema"
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
#, c-format
msgid "New Installation"
msgstr "Nova Instalação"
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
#, c-format
msgid "Upgrade previous installation (not recommended)"
msgstr "Actualizar instalação anterior (não recomendado)"
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
#, c-format
msgid ""
"Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1153,17 +1100,17 @@ msgstr ""
"Aviso: deve salvaguardar todos os seus dados pessoais antes de\n"
"escolher \"Nova Instalação\"."
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "IDE"
msgstr "IDE"
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "Configuring IDE"
msgstr "A configurar IDE"
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
#, c-format
msgid ""
"No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1173,7 +1120,7 @@ msgstr ""
"instalação irá continuar, mas para arrancar o seu sistema, irá precisar de "
"criar a partição de arranque no DiskDrake"
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
#, c-format
msgid ""
"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1184,7 +1131,7 @@ msgstr ""
"instalação irá continuar, mas para arrancar o seu sistema, irá precisar de "
"criar a partição de arranque no DiskDrake"
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
#, c-format
msgid ""
"Change your Cd-Rom!\n"
@@ -1196,12 +1143,12 @@ msgstr ""
"Por favor insira o Cd-Rom \"%s\" no seu dispositivo e prima Ok.\n"
"Se não tiver este Cd-Rom, prima Cancelar para evitar a instalação deste."
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
#, c-format
msgid "Looking for available packages..."
msgstr "A procurar pacotes disponíveis..."
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
#, c-format
msgid ""
"Your system does not have enough space left for installation or upgrade (%"
@@ -1210,7 +1157,7 @@ msgstr ""
"O seu sistema não tem espaço suficiente em disco para instalar ou actualizar "
"(%dMB > %dMB)"
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
#, c-format
msgid ""
"Please choose load or save package selection.\n"
@@ -1219,52 +1166,52 @@ msgstr ""
"Por favor escolha carregar ou gravar uma selecção de pacotes.\n"
"O formato é o mesmo como o dos ficheiros gerados por auto_install."
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Load"
msgstr "Carregar"
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Save"
msgstr "Gravar"
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
#, c-format
msgid "Bad file"
msgstr "Ficheiro danificado"
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
#, c-format
msgid "KDE"
msgstr "KDE"
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
#, c-format
msgid "GNOME"
msgstr "GNOME"
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
#, c-format
msgid "Desktop Selection"
msgstr "Selecção de Ecrã"
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
#, c-format
msgid "You can choose your workstation desktop profile."
msgstr "Pode escolher o seu perfil de ambiente de trabalho."
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
#, c-format
msgid "Selected size is larger than available space"
msgstr "O tamanho seleccionado é maior que o espaço disponível"
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
#, c-format
msgid "Type of install"
msgstr "Tipo de instalação"
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
#, c-format
msgid ""
"You have not selected any group of packages.\n"
@@ -1273,84 +1220,84 @@ msgstr ""
"Não escolheu qualquer grupo de pacotes.\n"
"Por favor escolha o tipo de instalação mínima que deseja:"
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
#, c-format
msgid "With X"
msgstr "Com X"
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
#, c-format
msgid "With basic documentation (recommended!)"
msgstr "Com documentação básica (recomendado!)"
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
#, c-format
msgid "Truly minimal install (especially no urpmi)"
msgstr "Instalação mínima (especialmente sem urpmi)"
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
#, c-format
msgid "Preparing installation"
msgstr "A preparar instalação"
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
#, c-format
msgid "Installing package %s"
msgstr "A instalar o pacote %s"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "There was an error ordering packages:"
msgstr "Ocorreu um erro ao ordenar os pacotes:"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "Go on anyway?"
msgstr "Continuar mesmo assim?"
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
#, c-format
msgid "Retry"
msgstr "Tentar novamente"
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
#, c-format
msgid "Skip this package"
msgstr "Saltar este pacote"
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
#, c-format
msgid "Skip all packages from medium \"%s\""
msgstr "Saltar todos os pacotes da média \"%s\""
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
#, c-format
msgid "Go back to media and packages selection"
msgstr "Voltar à média e selecção de pacotes"
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
#, c-format
msgid "There was an error installing package %s."
msgstr "Ocorreu um erro ao instalar o pacote %s."
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
#, c-format
msgid "Post-install configuration"
msgstr "Configuração pós-instalação"
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
#, c-format
msgid "Please ensure the Update Modules media is in drive %s"
msgstr ""
"Por favor certifique-se que a média Módulos de Actualização está no "
"dispositivo %s"
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
#, c-format
msgid "Updates"
msgstr "Actualizações"
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
#, c-format
msgid ""
"You now have the opportunity to download updated packages. These packages\n"
@@ -1370,28 +1317,28 @@ msgstr ""
"\n"
"Deseja instalar as actualizações ?"
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
#, c-format
msgid "%s on %s"
msgstr "%s em %s"
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
#, c-format
msgid "Hardware"
msgstr "Material"
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
#, c-format
msgid "Sound card"
msgstr "Placa de Som"
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
#, c-format
msgid "Do you have an ISA sound card?"
msgstr "Tem alguma placa de som ISA?"
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
#, c-format
msgid ""
"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1400,67 +1347,67 @@ msgstr ""
"Execute \"alsaconf\" ou \"sndconfig\" após a instalação para configurar a "
"sua placa de som"
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
#, c-format
msgid "No sound card detected. Try \"harddrake\" after installation"
msgstr "Nenhuma placa de som detectada. Tente \"harddrake\" após a instalação"
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
#, c-format
msgid "Graphical interface"
msgstr "Interface gráfico"
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
#, c-format
msgid "Network & Internet"
msgstr "Rede e Internet"
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
#, c-format
msgid "Proxies"
msgstr "Proxies"
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
#, c-format
msgid "configured"
msgstr "configurado"
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
#, c-format
msgid "Security Level"
msgstr "Nível de Segurança"
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
#, c-format
msgid "Firewall"
msgstr "Firewall"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "activated"
msgstr "activado"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "disabled"
msgstr "desactivado"
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
#, c-format
msgid "You have not configured X. Are you sure you really want this?"
msgstr "Não configurou o X. Tem certeza que deseja fazer isto?"
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
#, c-format
msgid "Preparing bootloader..."
msgstr "A preparar o carregador de arranque..."
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
#, c-format
msgid "Be patient, this may take a while..."
msgstr ""
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
#, c-format
msgid ""
"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1473,7 +1420,7 @@ msgstr ""
"irá precisar de usar o BootX ou algum outro meio para arrancar a sua "
"máquina. O argumento do kernel para root fs é: root=%s"
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
#, c-format
msgid ""
"In this security level, access to the files in the Windows partition is "
@@ -1482,17 +1429,17 @@ msgstr ""
"Neste nível de segurança, o acesso aos ficheiros na partição do Windows é "
"limitado ao administrador."
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr "Insira uma disquete vazia no dispositivo %s"
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
#, c-format
msgid "Creating auto install floppy..."
msgstr "A criar disquete de auto-instalação..."
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
#, c-format
msgid ""
"Some steps are not completed.\n"
@@ -1503,7 +1450,7 @@ msgstr ""
"\n"
"Deseja realmente sair agora?"
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
#, c-format
msgid "Congratulations"
msgstr "Parabéns"
@@ -1647,6 +1594,33 @@ msgid ""
"Exit"
msgstr "Sair"
+#~ msgid "Your desktop on a USB key"
+#~ msgstr "O seu ecrã num dispositivo USB"
+
+#~ msgid "The 100%% open source Mandriva Linux distribution"
+#~ msgstr "A distribuição Mandriva Linux 100%% código livre"
+
+#~ msgid "Explore Linux easily with Mandriva One"
+#~ msgstr "Explore o Linux facilmente com o Mandriva One"
+
+#~ msgid "A full Mandriva Linux desktop, with support"
+#~ msgstr "Um ecrã Mandriva Linux completo, com suporte"
+
+#~ msgid "Mandriva: distributions for everybody's needs"
+#~ msgstr ""
+#~ "Mandriva: distribuições para as necessidades de todos os utilizadores"
+
+#~ msgid "Downloading file %s..."
+#~ msgstr "A transferir o ficheiro %s..."
+
+#~ msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
+#~ msgstr ""
+#~ "A actualização de uma distribuição 32bit para uma 64bit não é suportada"
+
+#~ msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
+#~ msgstr ""
+#~ "A actualização de uma distribuição 64bit para uma 32bit não é suportada"
+
#~ msgid ""
#~ "You have selected the following server(s): %s\n"
#~ "\n"
diff --git a/perl-install/install/share/po/pt_BR.po b/perl-install/install/share/po/pt_BR.po
index ea90bcfb9..454c8559b 100644
--- a/perl-install/install/share/po/pt_BR.po
+++ b/perl-install/install/share/po/pt_BR.po
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: pt_BR\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
"PO-Revision-Date: 2009-02-16 18:15-0300\n"
"Last-Translator: Sergio Rafael Lemke <sergio@mandriva.com.br>\n"
"Language-Team: Brazilian portuguese <en@li.org>\n"
@@ -30,31 +30,6 @@ msgstr ""
"X-Generator: KBabel 1.11.4\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr "Seu desktop em um Pendrive USB"
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr "A distribuição Mandriva Linux 100%% open source"
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr "Explore facilmente o Linux com o Mandriva One"
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr "Um Desktop Mandriva Linux completo, com suporte"
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr "Mandriva: distribuições para todas as necessidades"
-
#: any.pm:109
#, c-format
msgid "Do you have further supplementary media?"
@@ -94,17 +69,17 @@ msgstr "Rede (FTP)"
msgid "Network (NFS)"
msgstr "Rede (NFS)"
-#: any.pm:163
+#: any.pm:165
#, c-format
msgid "URL of the mirror?"
msgstr "URL do Servidor?"
-#: any.pm:169
+#: any.pm:171
#, c-format
msgid "URL must start with ftp:// or http://"
msgstr "URL deve começar com ftp:// ou http://"
-#: any.pm:180
+#: any.pm:182
#, c-format
msgid ""
"Contacting Mandriva Linux web site to get the list of available mirrors..."
@@ -112,7 +87,7 @@ msgstr ""
"Contactando o site da Mandriva Linux para pegar a lista de servidores "
"disponíveis..."
-#: any.pm:185
+#: any.pm:187
#, c-format
msgid ""
"Failed contacting Mandriva Linux web site to get the list of available "
@@ -121,47 +96,47 @@ msgstr ""
"Falha contactando o site do Mandriva Linux em busca da lista de servidores "
"disponíveis"
-#: any.pm:195
+#: any.pm:197
#, c-format
msgid "Choose a mirror from which to get the packages"
msgstr "Escolha um servidor de onde pegar os pacotes "
-#: any.pm:225
+#: any.pm:227
#, c-format
msgid "NFS setup"
msgstr "Configuração NFS"
-#: any.pm:226
+#: any.pm:228
#, c-format
msgid "Please enter the hostname and directory of your NFS media"
msgstr "Por favor, entre o nome do servidor e o diretório da sua mídia NFS"
-#: any.pm:230
+#: any.pm:232
#, c-format
msgid "Hostname missing"
msgstr "Nome da máquina faltando"
-#: any.pm:231
+#: any.pm:233
#, c-format
msgid "Directory must begin with \"/\""
msgstr "O diretório deve começar com \"/\""
-#: any.pm:235
+#: any.pm:237
#, c-format
msgid "Hostname of the NFS mount ?"
msgstr "Nome do servidor do ponto de montagem NFS"
-#: any.pm:236
+#: any.pm:238
#, c-format
msgid "Directory"
msgstr "Diretório"
-#: any.pm:258
+#: any.pm:260
#, c-format
msgid "Supplementary"
msgstr "Adicional"
-#: any.pm:293
+#: any.pm:295
#, c-format
msgid ""
"Can't find a package list file on this mirror. Make sure the location is "
@@ -170,22 +145,22 @@ msgstr ""
"Não encontro uma lista de pacotes neste servidor. Verifique se a localização "
"está correta."
-#: any.pm:328
+#: any.pm:334
#, c-format
msgid "Looking at packages already installed..."
msgstr "Procurando por pacotes já instalados..."
-#: any.pm:362
+#: any.pm:368
#, c-format
msgid "Finding packages to upgrade..."
msgstr "Procurando pacotes para atualizar..."
-#: any.pm:381
+#: any.pm:387
#, c-format
msgid "Removing packages prior to upgrade..."
msgstr "Removendo pacotes antes da atualização..."
-#: any.pm:402
+#: any.pm:408
#, c-format
msgid ""
"You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -206,18 +181,18 @@ msgstr ""
"reinicie o seu sistema\n"
"e faça a tualização utilizando o applet da Mandriva."
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
#, c-format
msgid "Reboot"
msgstr "Reiniciar"
-#: any.pm:407
+#: any.pm:413
#, c-format
msgid "Proceed"
msgstr "Proceder"
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -231,72 +206,72 @@ msgstr ""
"\n"
"Você realmente quer remover estes pacotes?\n"
-#: any.pm:815
+#: any.pm:821
#, c-format
msgid "Error reading file %s"
msgstr "Erro ao ler o arquivo %s"
-#: any.pm:1022
+#: any.pm:1028
#, c-format
msgid "The following disk(s) were renamed:"
msgstr "O(s) seguinte(s) disco(s) foi renomeado:"
-#: any.pm:1024
+#: any.pm:1030
#, c-format
msgid "%s (previously named as %s)"
msgstr "%s (previamente nomeado como %s)"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "HTTP"
msgstr "HTTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "FTP"
msgstr "FTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "NFS"
msgstr "NFS"
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
#, c-format
msgid "Network"
msgstr "Rede"
-#: any.pm:1104
+#: any.pm:1110
#, c-format
msgid "Please choose a media"
msgstr "Por favor, escolha uma mídia"
-#: any.pm:1120
+#: any.pm:1126
#, c-format
msgid "File already exists. Overwrite it?"
msgstr "O arquivo já existe. Sobrescrevê-lo?"
-#: any.pm:1124
+#: any.pm:1130
#, c-format
msgid "Permission denied"
msgstr "Permissão negada"
-#: any.pm:1172
+#: any.pm:1178
#, c-format
msgid "Bad NFS name"
msgstr "Nome NFS inválido"
-#: any.pm:1193
+#: any.pm:1199
#, c-format
msgid "Bad media %s"
msgstr "Mídia %s ruim"
-#: any.pm:1236
+#: any.pm:1242
#, c-format
msgid "Can not make screenshots before partitioning"
msgstr "Não foi possível capturar telas antes de particionar"
-#: any.pm:1244
+#: any.pm:1250
#, c-format
msgid "Screenshots will be available after install in %s"
msgstr "As captura de tela estarão disponíveis depois da instalação em %s"
@@ -307,11 +282,15 @@ msgid "Installation"
msgstr "Instalação"
#: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
#, c-format
msgid "Configuration"
msgstr "Configuração"
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
#: install2.pm:168
#, c-format
msgid "You must also format %s"
@@ -336,22 +315,22 @@ msgstr "Ativando a rede"
msgid "Bringing down the network"
msgstr "Desativando a rede"
-#: media.pm:402
+#: media.pm:399
#, c-format
msgid "Please wait, retrieving file"
msgstr "Por favor aguarde, obtendo o arquivo"
-#: media.pm:734
+#: media.pm:718
#, c-format
-msgid "Downloading file %s..."
-msgstr "Baixando arquivo %s..."
+msgid "unable to add medium"
+msgstr ""
-#: media.pm:822
+#: media.pm:758
#, c-format
msgid "Copying some packages on disks for future use"
msgstr "Copiando alguns pacotes em disco para uso posterior"
-#: media.pm:875
+#: media.pm:811
#, c-format
msgid "Copying in progress"
msgstr "Cópia em progresso"
@@ -395,27 +374,27 @@ msgstr ""
msgid "An error occurred:"
msgstr "Um erro ocorreu:"
-#: pkgs.pm:776
+#: pkgs.pm:780
#, c-format
msgid "%d installation transactions failed"
msgstr "%d Instalação Falhou"
-#: pkgs.pm:777
+#: pkgs.pm:781
#, c-format
msgid "Installation of packages failed:"
msgstr "Instalação dos programas falhou:"
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
#, c-format
msgid "Workstation"
msgstr "Estação de Trabalho"
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
#, c-format
msgid "Office Workstation"
msgstr "Estação de Trabalho de Escritório"
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
#, c-format
msgid ""
"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -424,7 +403,7 @@ msgstr ""
"Programas de escritório: processadores de texto (OpenOffice.org Writer, "
"Kword), tabelas (OpenOffice.org Calc, Kspread), visualizadores PDF, etc."
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
#, c-format
msgid ""
"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -433,32 +412,32 @@ msgstr ""
"Programas de escritório: processadores de texto (Kword, Abiword), tabelas "
"(Kspread, Gnumeric), visualizadores PDF, etc"
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
#, c-format
msgid "Game station"
msgstr "Estação de Jogos"
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
#, c-format
msgid "Amusement programs: arcade, boards, strategy, etc"
msgstr "Programas de entretenimento: arcade, tabuleiro, estratégia, etc."
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
#, c-format
msgid "Multimedia station"
msgstr "Estação de Multimídia"
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
#, c-format
msgid "Sound and video playing/editing programs"
msgstr "Programas de edição/reprodução de som e vídeo"
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
#, c-format
msgid "Internet station"
msgstr "Estação de Internet"
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
#, c-format
msgid ""
"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -467,212 +446,194 @@ msgstr ""
"Conjunto de ferramentas para ler e enviar mensagens e notícias (mutt, "
"tin...) e para navegar na Web."
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
#, c-format
msgid "Network Computer (client)"
msgstr "Computador de rede (cliente)"
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
#, c-format
msgid "Clients for different protocols including ssh"
msgstr "Clientes para diferentes protocolos, incluindo ssh"
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
#, c-format
msgid "Tools to ease the configuration of your computer"
msgstr "Ferramentas para facilitar a configuração do seu computador"
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
#, c-format
msgid "Console Tools"
msgstr "Ferramentas de Console"
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
#, c-format
msgid "Editors, shells, file tools, terminals"
msgstr "Editores, shells, ferramentas de arquivos, terminais"
#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
#, c-format
msgid "Development"
msgstr "Desenvolvimento"
#: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
#, c-format
msgid "C and C++ development libraries, programs and include files"
msgstr "Bibliotecas de desenvolvimento C e C++, programas e arquivos include"
#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
#, c-format
msgid "Documentation"
msgstr "Documentação"
#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
#, c-format
msgid "Books and Howto's on Linux and Free Software"
msgstr "Livros, documentos e tutoriais sobre Linux e Software Livre"
#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
#, c-format
msgid "LSB"
msgstr "LSB"
#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
#, c-format
msgid "Linux Standard Base. Third party applications support"
msgstr "Linux Standard Base. Suporte a aplicativos de terceiros"
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
#, c-format
msgid "Web Server"
msgstr "Servidor Web"
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
#, c-format
msgid "Apache"
msgstr "Apache"
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
#, c-format
msgid "Groupware"
msgstr "Groupware"
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
#, c-format
msgid "Kolab Server"
msgstr "Servidor Kolab"
#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
#, c-format
msgid "Firewall/Router"
msgstr "Firewall/Roteador"
#: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
#, c-format
msgid "Internet gateway"
msgstr "Gateway Internet"
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
#, c-format
msgid "Mail/News"
msgstr "E-mail/Notícias"
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
#, c-format
msgid "Postfix mail server, Inn news server"
msgstr "Servidor de e-mail Postfix, servidor de notícias Inn"
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
#, c-format
msgid "Directory Server"
msgstr "Servidor de Diretório"
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
#, c-format
msgid "FTP Server"
msgstr "Servidor FTP"
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
#, c-format
msgid "ProFTPd"
msgstr "ProFTPd"
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
#, c-format
msgid "DNS/NIS"
msgstr "DNS/NIS"
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
#, c-format
msgid "Domain Name and Network Information Server"
msgstr ""
"Servidor de Nomes do Domínio (DNS) e Servidor de Informações de Rede (NIS)"
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
#, c-format
msgid "File and Printer Sharing Server"
msgstr "Servidor de Compartilhamento de Impressoras e Arquivos"
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
#, c-format
msgid "NFS Server, Samba server"
msgstr "Servidor NFS, Servidor Samba"
#: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
#, c-format
msgid "Database"
msgstr "Banco de dados"
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
#, c-format
msgid "PostgreSQL and MySQL Database Server"
msgstr "Servidor de banco de dados PostgreSQL e MySQL"
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
#, c-format
msgid "Web/FTP"
msgstr "Web/FTP"
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
#, c-format
msgid "Apache, Pro-ftpd"
msgstr "Apache, Pro-ftpd"
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
#, c-format
msgid "Mail"
msgstr "E-mail"
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
#, c-format
msgid "Postfix mail server"
msgstr "Servidor de e-mail Postfix"
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
#, c-format
msgid "PostgreSQL or MySQL database server"
msgstr "Servidor de banco de dados PostgreSQL ou MySQL"
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
#, c-format
msgid "Network Computer server"
msgstr "Servidor de Rede"
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
#, c-format
msgid "NFS server, SMB server, Proxy server, ssh server"
msgstr "Servidor NFS, servidor SMB, servidor Proxy, servidor SSH"
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
#, c-format
msgid "Graphical Environment"
msgstr "Ambiente Gráfico"
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
#, c-format
msgid "KDE Workstation"
msgstr "Estação de Trabalho KDE"
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
#, c-format
msgid ""
"The K Desktop Environment, the basic graphical environment with a collection "
@@ -681,12 +642,12 @@ msgstr ""
"O ambiente de trabalho KDE, sua área de trabalho básica acompanhada por uma "
"coleção extra de ferramentas"
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
#, c-format
msgid "GNOME Workstation"
msgstr "Estação de Trabalho GNOME"
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
#, c-format
msgid ""
"A graphical environment with user-friendly set of applications and desktop "
@@ -694,7 +655,7 @@ msgid ""
msgstr ""
"Um ambiente gráfico com um conjunto de aplicativos e ferramentas amigáveis"
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
#, c-format
msgid "LXDE Desktop"
msgstr "Ambiente de Trabalho LXDE"
@@ -708,55 +669,53 @@ msgstr ""
"Um ambiente gráfico leve & rápido com uma coleção amigável de programas e "
"ferramentas de desktop"
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
#, c-format
msgid "Other Graphical Desktops"
msgstr "Outros ambientes de Área de trabalho"
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
#, c-format
msgid "Window Maker, Enlightenment, Fvwm, etc"
msgstr "Window Maker, Enlightenment, Fvwm, etc"
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
#, c-format
msgid "Utilities"
msgstr "Utilitários"
#: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
#, c-format
msgid "SSH Server"
msgstr "Servidor SSH"
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
#, c-format
msgid "Webmin"
msgstr "Webmin"
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
#, c-format
msgid "Webmin Remote Configuration Server"
msgstr "Servidor de Configuração Remota Webmin"
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
#, c-format
msgid "Network Utilities/Monitoring"
msgstr "Utilitários de Rede/Monitoramento"
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
#, c-format
msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
msgstr ""
"Ferramentas de monitoração, contabilização de processos, tcpdump, nmap, ..."
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
#, c-format
msgid "Mandriva Wizards"
msgstr "Assistentes Mandriva"
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
#, c-format
msgid "Wizards to configure server"
msgstr "Assistentes para configurar o servidor"
@@ -856,17 +815,17 @@ msgstr "Aqui está uma prévia do desktop '%s'."
msgid "Click on images in order to see a bigger preview"
msgstr "Clique nas imagens para ampliar-las"
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
#, c-format
msgid "Package Group Selection"
msgstr "Seleção de Grupo de Pacotes"
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
#, c-format
msgid "Individual package selection"
msgstr "Seleção individual de pacotes"
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
#, c-format
msgid "Total size: %d / %d MB"
msgstr "Tamanho total: %d / %d MB"
@@ -985,12 +944,12 @@ msgstr "Instalação mínima"
msgid "Software Management"
msgstr "Gerenciamento de Software"
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
#, c-format
msgid "Choose the packages you want to install"
msgstr "Escolha os pacotes que você quer instalar"
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
#, c-format
msgid "Installing"
msgstr "Instalando"
@@ -1017,7 +976,7 @@ msgid_plural "%d packages"
msgstr[0] "%d pacote"
msgstr[1] "%d pacotes"
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
#, c-format
msgid "Summary"
msgstr "Resumo"
@@ -1027,7 +986,7 @@ msgstr "Resumo"
msgid "Configure"
msgstr "Configurar"
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
#, c-format
msgid "not configured"
msgstr "não configurado"
@@ -1037,7 +996,7 @@ msgstr "não configurado"
msgid "Media Selection"
msgstr "Seleção de Mídia"
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
#, c-format
msgid ""
"The following installation media have been found.\n"
@@ -1046,7 +1005,7 @@ msgstr ""
"As seguintes mídias de instalação foram encontradas.\n"
"Se você deseja ignorar alguma delas, você pode desmarcá-las agora."
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
#, c-format
msgid ""
"You have the option to copy the contents of the CDs onto the hard drive "
@@ -1059,7 +1018,7 @@ msgstr ""
"A instalação irá continuar a partir do seu disco rígido e os pacotes "
"continuarão disponíveis após a instalação ser finalizada."
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
#, c-format
msgid "Copy whole CDs"
msgstr "Copiar todos os CDs"
@@ -1079,59 +1038,49 @@ msgstr "Por favor, escolha o layout do seu teclado"
msgid "Here is the full list of available keyboards:"
msgstr "Aqui está a lista completa dos teclados disponíveis:"
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
#, c-format
msgid "Install/Upgrade"
msgstr "Instalar/Atualizar"
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
#, c-format
msgid "Is this an install or an upgrade?"
msgstr "Esta é uma instalação ou atualização?"
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
#, c-format
msgid ""
"_: This is a noun:\n"
"Install"
msgstr "Instalação"
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
#, c-format
msgid "Upgrade %s"
msgstr "Atualizar %s"
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr "A atualização de distribuição 32 bits para 64 bits não é suportada"
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr "A atualização de distribuição 64 bits para 32 bits não é suportada"
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
#, c-format
msgid "Encryption key for %s"
msgstr "Chave de criptografia para %s"
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
#, c-format
msgid "Cancel installation, reboot system"
msgstr "Cancelar instalação, reiniciar o sistema"
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
#, c-format
msgid "New Installation"
msgstr "Nova Instalação"
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
#, c-format
msgid "Upgrade previous installation (not recommended)"
msgstr "Atualizar instalação anterior (não recomendado)"
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
#, c-format
msgid ""
"Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1151,17 +1100,17 @@ msgstr ""
"\"Nova\n"
"Instalação\"."
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "IDE"
msgstr "IDE"
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "Configuring IDE"
msgstr "Configurando IDE"
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
#, c-format
msgid ""
"No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1171,7 +1120,7 @@ msgstr ""
"poder iniciar seu sistema você precisará criar uma partição bootstrap no "
"DiskDrake"
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
#, c-format
msgid ""
"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1182,7 +1131,7 @@ msgstr ""
"mas para iniciar seu sistema, você precisa criar uma partição bootstrap no "
"DiskDrake."
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
#, c-format
msgid ""
"Change your Cd-Rom!\n"
@@ -1197,12 +1146,12 @@ msgstr ""
"Se você não o tiver em mãos, clique em Cancelar para evitar a instalação "
"desse CD-ROM."
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
#, c-format
msgid "Looking for available packages..."
msgstr "Procurando por pacotes disponíveis..."
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
#, c-format
msgid ""
"Your system does not have enough space left for installation or upgrade (%"
@@ -1211,7 +1160,7 @@ msgstr ""
"Seu sistema não possui espaço suficiente para a instalação ou atualização (%"
"dMB > %dMB)"
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
#, c-format
msgid ""
"Please choose load or save package selection.\n"
@@ -1220,52 +1169,52 @@ msgstr ""
"Por favor, escolha entre carregar ou salvar a seleção de pacotes. \n"
"O formato é o mesmo que os arquivos gerados pelo auto_install."
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Load"
msgstr "Carregar"
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Save"
msgstr "Salvar"
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
#, c-format
msgid "Bad file"
msgstr "Arquivo corrompido"
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
#, c-format
msgid "KDE"
msgstr "KDE"
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
#, c-format
msgid "GNOME"
msgstr "GNOME"
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
#, c-format
msgid "Desktop Selection"
msgstr "Seleção de Desktop"
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
#, c-format
msgid "You can choose your workstation desktop profile."
msgstr "Você pode escolher seu perfil de estação de trabalho."
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
#, c-format
msgid "Selected size is larger than available space"
msgstr "O tamanho escolhido é maior que o espaço disponível"
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
#, c-format
msgid "Type of install"
msgstr "Tipo de instalação"
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
#, c-format
msgid ""
"You have not selected any group of packages.\n"
@@ -1274,83 +1223,83 @@ msgstr ""
"Você não selecionou nenhum grupo de pacotes.\n"
"Por favor, escolha a instalação mínima que deseja:"
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
#, c-format
msgid "With X"
msgstr "Com X"
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
#, c-format
msgid "With basic documentation (recommended!)"
msgstr "Com documentação básica (recomendado)"
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
#, c-format
msgid "Truly minimal install (especially no urpmi)"
msgstr "Instalação mínima (sem o uprmi)"
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
#, c-format
msgid "Preparing installation"
msgstr "Preparando a instalação"
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
#, c-format
msgid "Installing package %s"
msgstr "Instalando o pacote %s"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "There was an error ordering packages:"
msgstr "Houve um erro durante a ordenação dos pacotes:"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "Go on anyway?"
msgstr "Continuar mesmo assim?"
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
#, c-format
msgid "Retry"
msgstr "Tentar Novamente"
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
#, c-format
msgid "Skip this package"
msgstr "Pular este pacote"
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
#, c-format
msgid "Skip all packages from medium \"%s\""
msgstr "Pular todos os pacotes da mídia \"%s\""
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
#, c-format
msgid "Go back to media and packages selection"
msgstr "Voltar para a seleção de mídia e de pacotes"
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
#, c-format
msgid "There was an error installing package %s."
msgstr "Houve um erro durante a instalação do pacote %s."
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
#, c-format
msgid "Post-install configuration"
msgstr "Configuração pós-instalação"
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
#, c-format
msgid "Please ensure the Update Modules media is in drive %s"
msgstr ""
"Por favor, certifique-se de que a mídia Atualizar Módulos está no drive %s"
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
#, c-format
msgid "Updates"
msgstr "Atualizações"
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
#, c-format
msgid ""
"You now have the opportunity to download updated packages. These packages\n"
@@ -1372,28 +1321,28 @@ msgstr ""
"\n"
"Você deseja instalar estas atualizações?"
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
#, c-format
msgid "%s on %s"
msgstr "%s em %s"
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
#, c-format
msgid "Hardware"
msgstr "Hardware"
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
#, c-format
msgid "Sound card"
msgstr "Placa de som"
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
#, c-format
msgid "Do you have an ISA sound card?"
msgstr "Você tem alguma placa de som ISA?"
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
#, c-format
msgid ""
"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1402,68 +1351,68 @@ msgstr ""
"Execute \"alsaconf\"ou \"sndconfig\" após a instalação para configurar sua "
"placa de som"
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
#, c-format
msgid "No sound card detected. Try \"harddrake\" after installation"
msgstr ""
"Nenhuma placa de som detectada. Tente o \"harddrake\" após a instalação"
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
#, c-format
msgid "Graphical interface"
msgstr "Interface gráfica"
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
#, c-format
msgid "Network & Internet"
msgstr "Rede & Internet"
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
#, c-format
msgid "Proxies"
msgstr "Proxies"
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
#, c-format
msgid "configured"
msgstr "configurado"
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
#, c-format
msgid "Security Level"
msgstr "Nível de Segurança"
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
#, c-format
msgid "Firewall"
msgstr "Firewall"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "activated"
msgstr "ativado"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "disabled"
msgstr "desativado"
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
#, c-format
msgid "You have not configured X. Are you sure you really want this?"
msgstr "Você não configurou o sistema X. Você quer realmente deixar assim?"
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
#, c-format
msgid "Preparing bootloader..."
msgstr "Preparando gerenciador de inicialização..."
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
#, c-format
msgid "Be patient, this may take a while..."
msgstr "Seja paciente, isto pode demorar um pouco..."
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
#, c-format
msgid ""
"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1476,7 +1425,7 @@ msgstr ""
"você precisará usar o BootX ou outros meios para inicializar sua máquina. O "
"argumento do kernel para o sistema de arquivos raiz é: root=%s"
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
#, c-format
msgid ""
"In this security level, access to the files in the Windows partition is "
@@ -1485,17 +1434,17 @@ msgstr ""
"Neste nível de segurança, o acesso aos arquivos em partições Windows é "
"restrita apenas para o administrador."
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr "Insira um disquete vazio no drive %s"
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
#, c-format
msgid "Creating auto install floppy..."
msgstr "Criando disquete de instalação automática..."
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
#, c-format
msgid ""
"Some steps are not completed.\n"
@@ -1506,7 +1455,7 @@ msgstr ""
"\n"
"Você realmente quer sair agora?"
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
#, c-format
msgid "Congratulations"
msgstr "Parabéns"
@@ -1650,6 +1599,30 @@ msgid ""
"Exit"
msgstr "Sair"
+#~ msgid "Your desktop on a USB key"
+#~ msgstr "Seu desktop em um Pendrive USB"
+
+#~ msgid "The 100%% open source Mandriva Linux distribution"
+#~ msgstr "A distribuição Mandriva Linux 100%% open source"
+
+#~ msgid "Explore Linux easily with Mandriva One"
+#~ msgstr "Explore facilmente o Linux com o Mandriva One"
+
+#~ msgid "A full Mandriva Linux desktop, with support"
+#~ msgstr "Um Desktop Mandriva Linux completo, com suporte"
+
+#~ msgid "Mandriva: distributions for everybody's needs"
+#~ msgstr "Mandriva: distribuições para todas as necessidades"
+
+#~ msgid "Downloading file %s..."
+#~ msgstr "Baixando arquivo %s..."
+
+#~ msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
+#~ msgstr "A atualização de distribuição 32 bits para 64 bits não é suportada"
+
+#~ msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
+#~ msgstr "A atualização de distribuição 64 bits para 32 bits não é suportada"
+
#~ msgid ""
#~ "You have selected the following server(s): %s\n"
#~ "\n"
diff --git a/perl-install/install/share/po/ro.po b/perl-install/install/share/po/ro.po
index 8e41bac68..69971e990 100644
--- a/perl-install/install/share/po/ro.po
+++ b/perl-install/install/share/po/ro.po
@@ -45,7 +45,7 @@ msgid ""
msgstr ""
"Project-Id-Version: DrakX 7.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
"PO-Revision-Date: 2009-03-31 13:10+0100\n"
"Last-Translator: Florin Cătălin RUSSEN <cfrussen@yahoo.co.uk>\n"
"Language-Team: Mandrivausers.ro\n"
@@ -55,31 +55,6 @@ msgstr ""
"Plural-Forms: nplurals=3;plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?"
"2:1))\n"
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr "Biroul vostru pe un stic de memorie USB"
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr "Distribuția Mandriva Linux 100%% open source"
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr "Explorați facil Linux cu Mandriva One"
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr "Un birou Mandriva Linux complet, cu suport"
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr "Mandriva: distribuții pentru necesitățile fiecăruia"
-
#: any.pm:109
#, c-format
msgid "Do you have further supplementary media?"
@@ -120,17 +95,17 @@ msgstr "Rețea (FTP)"
msgid "Network (NFS)"
msgstr "Rețea (NFS)"
-#: any.pm:163
+#: any.pm:165
#, c-format
msgid "URL of the mirror?"
msgstr "Adresa URL a serverului alternativ?"
-#: any.pm:169
+#: any.pm:171
#, c-format
msgid "URL must start with ftp:// or http://"
msgstr "Adresa URL trebuie să înceapă cu ftp:// sau http://"
-#: any.pm:180
+#: any.pm:182
#, c-format
msgid ""
"Contacting Mandriva Linux web site to get the list of available mirrors..."
@@ -138,7 +113,7 @@ msgstr ""
"Se contactează situl Mandriva Linux pentru obținerea listei serverelor "
"alternative disponibile..."
-#: any.pm:185
+#: any.pm:187
#, c-format
msgid ""
"Failed contacting Mandriva Linux web site to get the list of available "
@@ -147,47 +122,47 @@ msgstr ""
"Nu s-a putut contacta situl Mandriva Linux pentru obținerea listei "
"serverelor alternative disponibile..."
-#: any.pm:195
+#: any.pm:197
#, c-format
msgid "Choose a mirror from which to get the packages"
msgstr "Alegeți un server alternativ de pe care să descărcați pachetele"
-#: any.pm:225
+#: any.pm:227
#, c-format
msgid "NFS setup"
msgstr "Configurare NFS"
-#: any.pm:226
+#: any.pm:228
#, c-format
msgid "Please enter the hostname and directory of your NFS media"
msgstr "Introduceți numele gazdei și directorului mediului NFS"
-#: any.pm:230
+#: any.pm:232
#, c-format
msgid "Hostname missing"
msgstr "Lipsește numele gazdei"
-#: any.pm:231
+#: any.pm:233
#, c-format
msgid "Directory must begin with \"/\""
msgstr "Directorul trebuie să înceapă cu \"/\""
-#: any.pm:235
+#: any.pm:237
#, c-format
msgid "Hostname of the NFS mount ?"
msgstr "Numele de gazdă al montajului NFS?"
-#: any.pm:236
+#: any.pm:238
#, c-format
msgid "Directory"
msgstr "Director"
-#: any.pm:258
+#: any.pm:260
#, c-format
msgid "Supplementary"
msgstr "Suplimentar"
-#: any.pm:293
+#: any.pm:295
#, c-format
msgid ""
"Can't find a package list file on this mirror. Make sure the location is "
@@ -196,22 +171,22 @@ msgstr ""
"Nu s-a găsit lista de pachete pe aceast server alternativ. Asigurați-vă că "
"adresa este corectă."
-#: any.pm:328
+#: any.pm:334
#, c-format
msgid "Looking at packages already installed..."
msgstr "Se caută pachetele deja instalate..."
-#: any.pm:362
+#: any.pm:368
#, c-format
msgid "Finding packages to upgrade..."
msgstr "Se caută pachetele de actualizat"
-#: any.pm:381
+#: any.pm:387
#, c-format
msgid "Removing packages prior to upgrade..."
msgstr "Se înlătură pachetele înainte de actualizare..."
-#: any.pm:402
+#: any.pm:408
#, c-format
msgid ""
"You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -233,18 +208,18 @@ msgstr ""
"reporniți sistemul și lansați actualizarea majoră din miniaplicația de "
"actualizare Mandriva."
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
#, c-format
msgid "Reboot"
msgstr "Repornire sistem"
-#: any.pm:407
+#: any.pm:413
#, c-format
msgid "Proceed"
msgstr "Procedează"
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -258,72 +233,72 @@ msgstr ""
"\n"
"Chiar doriți înlăturarea acestor pachete?\n"
-#: any.pm:815
+#: any.pm:821
#, c-format
msgid "Error reading file %s"
msgstr "Eroare la citirea fișierului %s"
-#: any.pm:1022
+#: any.pm:1028
#, c-format
msgid "The following disk(s) were renamed:"
msgstr "Următoarele discuri au fost redenumite:"
-#: any.pm:1024
+#: any.pm:1030
#, c-format
msgid "%s (previously named as %s)"
msgstr "%s (denumit anterior %s)"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "HTTP"
msgstr "HTTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "FTP"
msgstr "FTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "NFS"
msgstr "NFS"
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
#, c-format
msgid "Network"
msgstr "Rețea"
-#: any.pm:1104
+#: any.pm:1110
#, c-format
msgid "Please choose a media"
msgstr "Alegeți un mediu"
-#: any.pm:1120
+#: any.pm:1126
#, c-format
msgid "File already exists. Overwrite it?"
msgstr "Fișierul există deja. Se spuprascrie?"
-#: any.pm:1124
+#: any.pm:1130
#, c-format
msgid "Permission denied"
msgstr "Permisiune respinsă"
-#: any.pm:1172
+#: any.pm:1178
#, c-format
msgid "Bad NFS name"
msgstr "Nume NFS greșit"
-#: any.pm:1193
+#: any.pm:1199
#, c-format
msgid "Bad media %s"
msgstr "Mediu %s incorect"
-#: any.pm:1236
+#: any.pm:1242
#, c-format
msgid "Can not make screenshots before partitioning"
msgstr "Nu se pot face capturi de ecran înainte de partiționare"
-#: any.pm:1244
+#: any.pm:1250
#, c-format
msgid "Screenshots will be available after install in %s"
msgstr "Capturile de ecran vor fi disponibile după instalare în %s"
@@ -334,11 +309,15 @@ msgid "Installation"
msgstr "Instalare"
#: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
#, c-format
msgid "Configuration"
msgstr "Configurație"
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
#: install2.pm:168
#, c-format
msgid "You must also format %s"
@@ -364,22 +343,22 @@ msgstr "Se pornește rețeaua"
msgid "Bringing down the network"
msgstr "Se oprește rețeaua"
-#: media.pm:402
+#: media.pm:399
#, c-format
msgid "Please wait, retrieving file"
msgstr "Așteptați, se preia fișierul"
-#: media.pm:734
+#: media.pm:718
#, c-format
-msgid "Downloading file %s..."
-msgstr "Se descarcă fișierul %s..."
+msgid "unable to add medium"
+msgstr ""
-#: media.pm:822
+#: media.pm:758
#, c-format
msgid "Copying some packages on disks for future use"
msgstr "Se copiază unele pachete pe discuri pentru utilizare ulterioară"
-#: media.pm:875
+#: media.pm:811
#, c-format
msgid "Copying in progress"
msgstr "Se copiază..."
@@ -423,27 +402,27 @@ msgstr ""
msgid "An error occurred:"
msgstr "S-a produs o eroare:"
-#: pkgs.pm:776
+#: pkgs.pm:780
#, c-format
msgid "%d installation transactions failed"
msgstr "%d operațiuni de instalare eșuate"
-#: pkgs.pm:777
+#: pkgs.pm:781
#, c-format
msgid "Installation of packages failed:"
msgstr "Instalarea pachetelor a eșuat:"
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
#, c-format
msgid "Workstation"
msgstr "Stație de lucru"
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
#, c-format
msgid "Office Workstation"
msgstr "Calculator de birou"
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
#, c-format
msgid ""
"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -453,7 +432,7 @@ msgstr ""
"calcul tabelar (OpenOffice.org Calc, Kspread), vizualizatoare de fișiere pdf "
"etc."
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
#, c-format
msgid ""
"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -462,32 +441,32 @@ msgstr ""
"Programe de birotică: procesoare de text (kword, abiword), calcul tabelar "
"(kspread, gnumeric), vizualizatoare de fișiere pdf etc."
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
#, c-format
msgid "Game station"
msgstr "Calculator pentru jocuri"
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
#, c-format
msgid "Amusement programs: arcade, boards, strategy, etc"
msgstr "Programe de amuzament: jocuri de acțiune, table, strategie etc."
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
#, c-format
msgid "Multimedia station"
msgstr "Stație multimedia"
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
#, c-format
msgid "Sound and video playing/editing programs"
msgstr "Programe de editare/redare sunet și video"
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
#, c-format
msgid "Internet station"
msgstr "Stație Internet"
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
#, c-format
msgid ""
"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -496,211 +475,193 @@ msgstr ""
"Set de unelte pentru citire/trimitere poștă și știri (mutt, tin..) și "
"navigare pe Web"
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
#, c-format
msgid "Network Computer (client)"
msgstr "Calculator (client) în rețea"
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
#, c-format
msgid "Clients for different protocols including ssh"
msgstr "Clienți pentru diverse protocoale, inclusiv ssh"
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
#, c-format
msgid "Tools to ease the configuration of your computer"
msgstr "Unelete pentru a vă ușura configurarea calculatorului"
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
#, c-format
msgid "Console Tools"
msgstr "Unelte consolă"
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
#, c-format
msgid "Editors, shells, file tools, terminals"
msgstr "Editoare, interpretoare, terminale, unelte fișiere"
#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
#, c-format
msgid "Development"
msgstr "Dezvoltare"
#: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
#, c-format
msgid "C and C++ development libraries, programs and include files"
msgstr "Biblioteci de dezvoltare C și C++, programe și fișiere include"
#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
#, c-format
msgid "Documentation"
msgstr "Documentație"
#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
#, c-format
msgid "Books and Howto's on Linux and Free Software"
msgstr "Cărți și HowTo despre Linux și programele libere"
#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
#, c-format
msgid "LSB"
msgstr "LSB"
#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
#, c-format
msgid "Linux Standard Base. Third party applications support"
msgstr "Baza standard Linux. Suport pentru aplicații terțe."
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
#, c-format
msgid "Web Server"
msgstr "Server Web"
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
#, c-format
msgid "Apache"
msgstr "Apache"
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
#, c-format
msgid "Groupware"
msgstr "Groupware"
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
#, c-format
msgid "Kolab Server"
msgstr "Server Kolab"
#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
#, c-format
msgid "Firewall/Router"
msgstr "Parafoc/Ruter"
#: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
#, c-format
msgid "Internet gateway"
msgstr "Pasarelă Internet"
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
#, c-format
msgid "Mail/News"
msgstr "Poștă/Știri"
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
#, c-format
msgid "Postfix mail server, Inn news server"
msgstr "Server de poștă Postfix, server de știri Inn"
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
#, c-format
msgid "Directory Server"
msgstr "Server de anuar"
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
#, c-format
msgid "FTP Server"
msgstr "Server FTP"
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
#, c-format
msgid "ProFTPd"
msgstr "ProFTPd"
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
#, c-format
msgid "DNS/NIS"
msgstr "DNS/NIS"
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
#, c-format
msgid "Domain Name and Network Information Server"
msgstr "Server de nume de domeniu (DNS) și NIS"
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
#, c-format
msgid "File and Printer Sharing Server"
msgstr "Server de fișiere și de partajare a imprimantei"
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
#, c-format
msgid "NFS Server, Samba server"
msgstr "Server NFS, server Samba"
#: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
#, c-format
msgid "Database"
msgstr "Baze de date"
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
#, c-format
msgid "PostgreSQL and MySQL Database Server"
msgstr "Server de baze de date MySQL și PostgreSQL"
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
#, c-format
msgid "Web/FTP"
msgstr "Web/FTP"
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
#, c-format
msgid "Apache, Pro-ftpd"
msgstr "Apache, Pro-ftpd"
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
#, c-format
msgid "Mail"
msgstr "Poștă"
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
#, c-format
msgid "Postfix mail server"
msgstr "Server de poștă Postfix"
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
#, c-format
msgid "PostgreSQL or MySQL database server"
msgstr "Server de baze de date MySQL sau PostgreSQL"
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
#, c-format
msgid "Network Computer server"
msgstr "Server în rețea"
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
#, c-format
msgid "NFS server, SMB server, Proxy server, ssh server"
msgstr "Server NFS, SMB, Proxy, SSH"
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
#, c-format
msgid "Graphical Environment"
msgstr "Mediu Grafic"
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
#, c-format
msgid "KDE Workstation"
msgstr "Stație de lucru KDE"
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
#, c-format
msgid ""
"The K Desktop Environment, the basic graphical environment with a collection "
@@ -708,19 +669,19 @@ msgid ""
msgstr ""
"Mediul de birou K, mediul grafic de bază cu o colecție de unelte asociate"
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
#, c-format
msgid "GNOME Workstation"
msgstr "Stație de lucru Gnome"
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
#, c-format
msgid ""
"A graphical environment with user-friendly set of applications and desktop "
"tools"
msgstr "Un mediu grafic cu un set de aplicații prietenoase și unelte de birou"
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
#, c-format
msgid "LXDE Desktop"
msgstr "Birou LXDE"
@@ -734,54 +695,52 @@ msgstr ""
"Un mediu grafic lejer și rapid cu un set de aplicații prietenoase și unelte "
"de birou"
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
#, c-format
msgid "Other Graphical Desktops"
msgstr "Alte medii grafice"
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
#, c-format
msgid "Window Maker, Enlightenment, Fvwm, etc"
msgstr "Window Maker, Enlightenment, Fvwm, etc"
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
#, c-format
msgid "Utilities"
msgstr "Utilitare"
#: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
#, c-format
msgid "SSH Server"
msgstr "Server SSH"
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
#, c-format
msgid "Webmin"
msgstr "Webmin"
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
#, c-format
msgid "Webmin Remote Configuration Server"
msgstr "Server de configurare distant Webmin"
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
#, c-format
msgid "Network Utilities/Monitoring"
msgstr "Utilitare rețea/Supraveghere"
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
#, c-format
msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
msgstr "Unelte de supraveghere, evidența proceselor, tcpdump, nmap, ..."
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
#, c-format
msgid "Mandriva Wizards"
msgstr "Asistenți Mandriva"
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
#, c-format
msgid "Wizards to configure server"
msgstr "Asistenți de configurare a serverului"
@@ -881,17 +840,17 @@ msgstr "Iată o previzualizare a biroului '%s'."
msgid "Click on images in order to see a bigger preview"
msgstr "Apăsați pe imagini pentru o previzualizare mai mare"
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
#, c-format
msgid "Package Group Selection"
msgstr "Selectare grupuri de pachete"
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
#, c-format
msgid "Individual package selection"
msgstr "Selectare individuală a pachetelor"
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
#, c-format
msgid "Total size: %d / %d MB"
msgstr "Mărime totală: %d / %d Mo"
@@ -1008,12 +967,12 @@ msgstr "Instalare minimalistă"
msgid "Software Management"
msgstr "Gestionare programe"
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
#, c-format
msgid "Choose the packages you want to install"
msgstr "Alegeți pachetele pe care doriți să le instalați"
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
#, c-format
msgid "Installing"
msgstr "Se instalează"
@@ -1041,7 +1000,7 @@ msgstr[0] "%d pachete"
msgstr[1] "%d pachet"
msgstr[2] "%d pachete"
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
#, c-format
msgid "Summary"
msgstr "Sumar"
@@ -1051,7 +1010,7 @@ msgstr "Sumar"
msgid "Configure"
msgstr "Configurează"
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
#, c-format
msgid "not configured"
msgstr "neconfigurat"
@@ -1061,7 +1020,7 @@ msgstr "neconfigurat"
msgid "Media Selection"
msgstr "Selectare mediu"
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
#, c-format
msgid ""
"The following installation media have been found.\n"
@@ -1070,7 +1029,7 @@ msgstr ""
"Au fost găsite următoarele medii de instalare.\n"
"Dacă doriți să săriți peste unele din ele, le puteți deselecta acum."
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
#, c-format
msgid ""
"You have the option to copy the contents of the CDs onto the hard drive "
@@ -1083,7 +1042,7 @@ msgstr ""
"Se va continua de pe discul dur, iar pachetele vor rămîne disponibile după "
"instalarea sistemului."
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
#, c-format
msgid "Copy whole CDs"
msgstr "Copiază CD-urile în întregime"
@@ -1103,63 +1062,49 @@ msgstr "Alegeți dispunerea tastaturii"
msgid "Here is the full list of available keyboards:"
msgstr "Iată lista tuturor tastaturilor disponibile:"
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
#, c-format
msgid "Install/Upgrade"
msgstr "Instalare/Actualizare majoră"
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
#, c-format
msgid "Is this an install or an upgrade?"
msgstr "Este vorba de o instalare sau de o actualizare majoră?"
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
#, c-format
msgid ""
"_: This is a noun:\n"
"Install"
msgstr "Instalare"
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
#, c-format
msgid "Upgrade %s"
msgstr "Actualizare majoră %s"
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr ""
-"Actualizarea majoră de la o distribuție pe 32 de biți la una pe 64 de biți "
-"nu este suportată."
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr ""
-"Actualizarea majoră de la o distribuție pe 64 de biți la una pe 32 de biți "
-"nu este suportată."
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
#, c-format
msgid "Encryption key for %s"
msgstr "Cheia de criptare pentru %s"
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
#, c-format
msgid "Cancel installation, reboot system"
msgstr "Anulează instalarea, repornește sistemul"
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
#, c-format
msgid "New Installation"
msgstr "Instalare nouă"
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
#, c-format
msgid "Upgrade previous installation (not recommended)"
msgstr "Actualizare majoră peste instalarea precedentă (nerecomandat)"
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
#, c-format
msgid ""
"Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1178,17 +1123,17 @@ msgstr ""
"Atenție: ar trebui să vă salvgardați datele personale înainte de a alege "
"\"Instalare nouă\"."
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "IDE"
msgstr "IDE"
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "Configuring IDE"
msgstr "Se configurează IDE"
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
#, c-format
msgid ""
"No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1198,7 +1143,7 @@ msgstr ""
"pentru a porni sistemul va trebui să creați o partiție de prepornire "
"(bootstrap) cu DiskDrake"
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
#, c-format
msgid ""
"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1209,7 +1154,7 @@ msgstr ""
"pentru a porni sistemul va trebui să creați o partiție de prepornire "
"(bootstrap) cu DiskDrake"
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
#, c-format
msgid ""
"Change your Cd-Rom!\n"
@@ -1222,12 +1167,12 @@ msgstr ""
"Introduceți CD-ul etichetat \"%s\" și apoi apăsați Ok.\n"
"Dacă nu-l aveți, apăsați „Anulează” pentru a evita instalarea de pe acest CD."
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
#, c-format
msgid "Looking for available packages..."
msgstr "Se caută pachetele disponibile..."
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
#, c-format
msgid ""
"Your system does not have enough space left for installation or upgrade (%"
@@ -1236,7 +1181,7 @@ msgstr ""
"Sistemul dumneavoastră nu are suficient spațiu pentru o instalare sau "
"actualizare majoră (%dMo > %dMo)"
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
#, c-format
msgid ""
"Please choose load or save package selection.\n"
@@ -1245,52 +1190,52 @@ msgstr ""
"Alegeți încărcarea sau salvarea selecției de pachete.\n"
"Formatul este același cu fișierele generate de auto_install."
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Load"
msgstr "Încarcă"
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Save"
msgstr "Salvează"
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
#, c-format
msgid "Bad file"
msgstr "Fișier eronat"
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
#, c-format
msgid "KDE"
msgstr "KDE"
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
#, c-format
msgid "GNOME"
msgstr "GNOME"
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
#, c-format
msgid "Desktop Selection"
msgstr "Selectarea biroului"
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
#, c-format
msgid "You can choose your workstation desktop profile."
msgstr "Puteți alege profilul biroului stației voastre de lucru."
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
#, c-format
msgid "Selected size is larger than available space"
msgstr "Dimensiunea selectată este mai mare decît spațiul disponibil"
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
#, c-format
msgid "Type of install"
msgstr "Tip de instalare"
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
#, c-format
msgid ""
"You have not selected any group of packages.\n"
@@ -1299,82 +1244,82 @@ msgstr ""
"Nu ați selectat nici un grup de pachete.\n"
"Alegeți instalarea minimalistă pe care o doriți:"
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
#, c-format
msgid "With X"
msgstr "Cu X11"
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
#, c-format
msgid "With basic documentation (recommended!)"
msgstr "Cu documentația de bază (recomandat!)"
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
#, c-format
msgid "Truly minimal install (especially no urpmi)"
msgstr "Instalare cu adevărat minimalistă (în mod expres fără urpmi)"
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
#, c-format
msgid "Preparing installation"
msgstr "Se pregătește instalarea"
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
#, c-format
msgid "Installing package %s"
msgstr "Se instalează pachetul %s"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "There was an error ordering packages:"
msgstr "S-a produs o eroare la ordonarea pachetelor:"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "Go on anyway?"
msgstr "Să se continuie totuși?"
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
#, c-format
msgid "Retry"
msgstr "Reîncearcă"
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
#, c-format
msgid "Skip this package"
msgstr "Ignoră acest pachet"
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
#, c-format
msgid "Skip all packages from medium \"%s\""
msgstr "Ignoră toate pachetele din mediul \"%s\""
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
#, c-format
msgid "Go back to media and packages selection"
msgstr "Înapoi la selectarea mediilor și a pachetelor"
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
#, c-format
msgid "There was an error installing package %s."
msgstr "S-a produs o eroare la instalarea pachetului %s."
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
#, c-format
msgid "Post-install configuration"
msgstr "Configurare post-instalare"
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
#, c-format
msgid "Please ensure the Update Modules media is in drive %s"
msgstr "Asigurați-vă că mediul cu modulele de actualizare este în unitatea %s"
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
#, c-format
msgid "Updates"
msgstr "Actualizări"
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
#, c-format
msgid ""
"You now have the opportunity to download updated packages. These packages\n"
@@ -1395,28 +1340,28 @@ msgstr ""
"\n"
"Doriți să instalați actualizările?"
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
#, c-format
msgid "%s on %s"
msgstr "%s pe %s"
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
#, c-format
msgid "Hardware"
msgstr "Componente materiale"
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
#, c-format
msgid "Sound card"
msgstr "Placă de sunet"
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
#, c-format
msgid "Do you have an ISA sound card?"
msgstr "Aveți o placă de sunet ISA?"
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
#, c-format
msgid ""
"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1425,68 +1370,68 @@ msgstr ""
"Lansați \"alsaconf\" sau \"sndconfig\" după instalare pentru a vă configura "
"placa de sunet"
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
#, c-format
msgid "No sound card detected. Try \"harddrake\" after installation"
msgstr ""
"Nu s-a detectat nici o placă de sunet. Încercați \"harddrake\" după instalare"
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
#, c-format
msgid "Graphical interface"
msgstr "Interfață grafică"
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
#, c-format
msgid "Network & Internet"
msgstr "Rețea și Internet"
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
#, c-format
msgid "Proxies"
msgstr "Servere proxy"
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
#, c-format
msgid "configured"
msgstr "configurat"
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
#, c-format
msgid "Security Level"
msgstr "Nivel de securitate"
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
#, c-format
msgid "Firewall"
msgstr "Parafoc"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "activated"
msgstr "activat"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "disabled"
msgstr "dezactivat"
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
#, c-format
msgid "You have not configured X. Are you sure you really want this?"
msgstr "Nu ați configurat X11. Sînteți sigur că doriți acest lucru?"
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
#, c-format
msgid "Preparing bootloader..."
msgstr "Se pregătește încărcătorul de sistem..."
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
#, c-format
msgid "Be patient, this may take a while..."
msgstr "Aveți răbdare, va dura ceva timp..."
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
#, c-format
msgid ""
"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1499,7 +1444,7 @@ msgstr ""
"utilizați BootX sau alte mijloace pentru a porni sistemul. Argumentul de "
"nucleu pentru sistemul de fișiere rădăcină este: root=%s"
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
#, c-format
msgid ""
"In this security level, access to the files in the Windows partition is "
@@ -1508,17 +1453,17 @@ msgstr ""
"La acest nivel de securitate, accesul la fișierele de pe partiția Windows "
"este permis doar administratorului."
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr "Introduceți o dischetă goală în perifericul %s"
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
#, c-format
msgid "Creating auto install floppy..."
msgstr "Se creează discheta de autoinstalare..."
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
#, c-format
msgid ""
"Some steps are not completed.\n"
@@ -1529,7 +1474,7 @@ msgstr ""
"\n"
"Chiar vreți să abandonați acum?"
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
#, c-format
msgid "Congratulations"
msgstr "Felicitări"
@@ -1672,3 +1617,31 @@ msgid ""
"_: Keep these entry short\n"
"Exit"
msgstr "Ieșire"
+
+#~ msgid "Your desktop on a USB key"
+#~ msgstr "Biroul vostru pe un stic de memorie USB"
+
+#~ msgid "The 100%% open source Mandriva Linux distribution"
+#~ msgstr "Distribuția Mandriva Linux 100%% open source"
+
+#~ msgid "Explore Linux easily with Mandriva One"
+#~ msgstr "Explorați facil Linux cu Mandriva One"
+
+#~ msgid "A full Mandriva Linux desktop, with support"
+#~ msgstr "Un birou Mandriva Linux complet, cu suport"
+
+#~ msgid "Mandriva: distributions for everybody's needs"
+#~ msgstr "Mandriva: distribuții pentru necesitățile fiecăruia"
+
+#~ msgid "Downloading file %s..."
+#~ msgstr "Se descarcă fișierul %s..."
+
+#~ msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
+#~ msgstr ""
+#~ "Actualizarea majoră de la o distribuție pe 32 de biți la una pe 64 de "
+#~ "biți nu este suportată."
+
+#~ msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
+#~ msgstr ""
+#~ "Actualizarea majoră de la o distribuție pe 64 de biți la una pe 32 de "
+#~ "biți nu este suportată."
diff --git a/perl-install/install/share/po/ru.po b/perl-install/install/share/po/ru.po
index 6ee63b2c8..a8a576755 100644
--- a/perl-install/install/share/po/ru.po
+++ b/perl-install/install/share/po/ru.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ru\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
"PO-Revision-Date: 2009-04-07 15:46+0200\n"
"Last-Translator: Pavel Maryanov <acid_jack@ukr.net>\n"
"Language-Team: Russian <gnu@mx.ru>\n"
@@ -21,31 +21,6 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr "Рабочая система на USB-брелоке"
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr "100%% открытый дистрибутив Mandriva Linux"
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr "Открой Linux с Mandriva One"
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr "Полный дистрибутив Mandriva Linux с поддержкой"
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr "Mandriva: дистрибутив для каждого"
-
#: any.pm:109
#, c-format
msgid "Do you have further supplementary media?"
@@ -60,7 +35,8 @@ msgid ""
"\n"
"Do you have a supplementary installation medium to configure?"
msgstr ""
-"Был найден следующий носитель, который будет использован во время установки: %s.\n"
+"Был найден следующий носитель, который будет использован во время установки: "
+"%s.\n"
"\n"
"\n"
"Если ли дополнительный носитель для настройки?"
@@ -85,114 +61,128 @@ msgstr "Сеть (FTP)"
msgid "Network (NFS)"
msgstr "Сеть (NFS)"
-#: any.pm:163
+#: any.pm:165
#, c-format
msgid "URL of the mirror?"
msgstr "Адрес зеркала?"
-#: any.pm:169
+#: any.pm:171
#, c-format
msgid "URL must start with ftp:// or http://"
msgstr "Адрес должен начинаться с ftp:// или http://"
-#: any.pm:180
+#: any.pm:182
#, c-format
-msgid "Contacting Mandriva Linux web site to get the list of available mirrors..."
-msgstr "Устанавливается соединение с веб-сайтом Mandriva Linux для загрузки списка доступных пакетов..."
+msgid ""
+"Contacting Mandriva Linux web site to get the list of available mirrors..."
+msgstr ""
+"Устанавливается соединение с веб-сайтом Mandriva Linux для загрузки списка "
+"доступных пакетов..."
-#: any.pm:185
+#: any.pm:187
#, c-format
-msgid "Failed contacting Mandriva Linux web site to get the list of available mirrors"
-msgstr "Не удалось соединиться с веб-сайтом Mandriva Linux, чтобы загрузить список доступных зеркал"
+msgid ""
+"Failed contacting Mandriva Linux web site to get the list of available "
+"mirrors"
+msgstr ""
+"Не удалось соединиться с веб-сайтом Mandriva Linux, чтобы загрузить список "
+"доступных зеркал"
-#: any.pm:195
+#: any.pm:197
#, c-format
msgid "Choose a mirror from which to get the packages"
msgstr "Выберите зеркало, с которого будут загружены пакеты"
-#: any.pm:225
+#: any.pm:227
#, c-format
msgid "NFS setup"
msgstr "Настройка NFS"
-#: any.pm:226
+#: any.pm:228
#, c-format
msgid "Please enter the hostname and directory of your NFS media"
msgstr "Укажите имя компьютера и каталог ресурса NFS"
-#: any.pm:230
+#: any.pm:232
#, c-format
msgid "Hostname missing"
msgstr "Не указано имя компьютера"
-#: any.pm:231
+#: any.pm:233
#, c-format
msgid "Directory must begin with \"/\""
msgstr "Имя каталога должно начинаться с \"/\""
-#: any.pm:235
+#: any.pm:237
#, c-format
msgid "Hostname of the NFS mount ?"
msgstr "Имя компьютера для монтирования NFS?"
-#: any.pm:236
+#: any.pm:238
#, c-format
msgid "Directory"
msgstr "Каталог"
-#: any.pm:258
+#: any.pm:260
#, c-format
msgid "Supplementary"
msgstr "Дополнительный"
-#: any.pm:293
+#: any.pm:295
#, c-format
-msgid "Can't find a package list file on this mirror. Make sure the location is correct."
-msgstr "Невозможно найти список пакетов на этом зеркале. Проверьте правильность адреса."
+msgid ""
+"Can't find a package list file on this mirror. Make sure the location is "
+"correct."
+msgstr ""
+"Невозможно найти список пакетов на этом зеркале. Проверьте правильность "
+"адреса."
-#: any.pm:328
+#: any.pm:334
#, c-format
msgid "Looking at packages already installed..."
msgstr "Выполняется поиск установленных пакетов..."
-#: any.pm:362
+#: any.pm:368
#, c-format
msgid "Finding packages to upgrade..."
msgstr "Выполняется поиск пакетов для обновления..."
-#: any.pm:381
+#: any.pm:387
#, c-format
msgid "Removing packages prior to upgrade..."
msgstr "Удаляются пакеты перед обновлением..."
-#: any.pm:402
+#: any.pm:408
#, c-format
msgid ""
"You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
-"on your system. This installer cannot preserve KDE 3.5 in an upgrade. If you choose to proceed, \n"
-"KDE 4 will replace KDE 3, and you will lose your personal KDE configuration settings. \n"
+"on your system. This installer cannot preserve KDE 3.5 in an upgrade. If you "
+"choose to proceed, \n"
+"KDE 4 will replace KDE 3, and you will lose your personal KDE configuration "
+"settings. \n"
"To upgrade with KDE 3.5 and your personal settings preserved, \n"
"please reboot your system and upgrade using the Mandriva update applet."
msgstr ""
"Вы решили обновить вашу систему до %s. KDE 3.5 обнаружен \n"
-"в вашей системе. Этот установщик не сохраняет KDE 3.5 при обновлении. Если вы продолжите установку \n"
-"KDE 4 заменит KDE 3 и вы потеряете свою персональную конфигурацию и настройки KDE. \n"
+"в вашей системе. Этот установщик не сохраняет KDE 3.5 при обновлении. Если "
+"вы продолжите установку \n"
+"KDE 4 заменит KDE 3 и вы потеряете свою персональную конфигурацию и "
+"настройки KDE. \n"
"Для обновления с KDE 3.5 и сохранения ваших персональных настроек, \n"
"перезагрузите вашу систему и обновитесь с помощью аплета обновления Mandriva."
-#: any.pm:407
-#: steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
#, c-format
msgid "Reboot"
msgstr "Перезагрузка"
-#: any.pm:407
+#: any.pm:413
#, c-format
msgid "Proceed"
msgstr "Далее"
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -205,73 +195,72 @@ msgstr ""
"\n"
"Удалить эти пакеты?\n"
-#: any.pm:815
+#: any.pm:821
#, c-format
msgid "Error reading file %s"
msgstr "Ошибка при чтении файла %s"
-#: any.pm:1022
+#: any.pm:1028
#, c-format
msgid "The following disk(s) were renamed:"
msgstr "Следующие диски были переименованы:"
-#: any.pm:1024
+#: any.pm:1030
#, c-format
msgid "%s (previously named as %s)"
msgstr "%s (ранее назывался %s)"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "HTTP"
msgstr "HTTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "FTP"
msgstr "FTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "NFS"
msgstr "NFS"
-#: any.pm:1100
-#: steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
#, c-format
msgid "Network"
msgstr "Сеть"
-#: any.pm:1104
+#: any.pm:1110
#, c-format
msgid "Please choose a media"
msgstr "Выберите носитель"
-#: any.pm:1120
+#: any.pm:1126
#, c-format
msgid "File already exists. Overwrite it?"
msgstr "Файл уже существует. Переписать его?"
-#: any.pm:1124
+#: any.pm:1130
#, c-format
msgid "Permission denied"
msgstr "Доступ запрещён"
-#: any.pm:1172
+#: any.pm:1178
#, c-format
msgid "Bad NFS name"
msgstr "Неверное имя NFS"
-#: any.pm:1193
+#: any.pm:1199
#, c-format
msgid "Bad media %s"
msgstr "Неверный источник %s"
-#: any.pm:1236
+#: any.pm:1242
#, c-format
msgid "Can not make screenshots before partitioning"
msgstr "Невозможно создать скриншоты перед разметкой диска"
-#: any.pm:1244
+#: any.pm:1250
#, c-format
msgid "Screenshots will be available after install in %s"
msgstr "После установки скриншоты будут находиться в каталоге %s"
@@ -281,13 +270,16 @@ msgstr "После установки скриншоты будут находи
msgid "Installation"
msgstr "Установка"
-#: gtk.pm:134
-#: share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
+#: gtk.pm:134 share/meta-task/compssUsers.pl:44
#, c-format
msgid "Configuration"
msgstr "Настройка"
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
#: install2.pm:168
#, c-format
msgid "You must also format %s"
@@ -313,22 +305,22 @@ msgstr "Поднимается сеть"
msgid "Bringing down the network"
msgstr "Опускается сеть"
-#: media.pm:402
+#: media.pm:399
#, c-format
msgid "Please wait, retrieving file"
msgstr "Подождите, идёт загрузка"
-#: media.pm:734
+#: media.pm:718
#, c-format
-msgid "Downloading file %s..."
-msgstr "Загружается файл %s..."
+msgid "unable to add medium"
+msgstr ""
-#: media.pm:822
+#: media.pm:758
#, c-format
msgid "Copying some packages on disks for future use"
msgstr "На диск копируются пакеты для использования в будущем"
-#: media.pm:875
+#: media.pm:811
#, c-format
msgid "Copying in progress"
msgstr "Идёт копирование"
@@ -372,405 +364,347 @@ msgstr ""
msgid "An error occurred:"
msgstr "Произошла ошибка:"
-#: pkgs.pm:776
+#: pkgs.pm:780
#, c-format
msgid "%d installation transactions failed"
msgstr "%d установочных транзакций не удались"
-#: pkgs.pm:777
+#: pkgs.pm:781
#, c-format
msgid "Installation of packages failed:"
msgstr "Не удалось установить пакет:"
#: share/meta-task/compssUsers.pl:13
-#: share/meta-task/compssUsers.pl.orig:13
#, c-format
msgid "Workstation"
msgstr "Рабочая станция"
#: share/meta-task/compssUsers.pl:15
-#: share/meta-task/compssUsers.pl.orig:15
#, c-format
msgid "Office Workstation"
msgstr "Офисная рабочая станция"
#: share/meta-task/compssUsers.pl:17
-#: share/meta-task/compssUsers.pl.orig:17
#, c-format
-msgid "Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets (OpenOffice.org Calc, Kspread), PDF viewers, etc"
-msgstr "Офисные программы: текстовые процессоры (OpenOffice.org Writer, Kword), электронные таблицы (OpenOffice.org Calc, Kspread), программы для просмотра pdf и т.д."
+msgid ""
+"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
+"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
+msgstr ""
+"Офисные программы: текстовые процессоры (OpenOffice.org Writer, Kword), "
+"электронные таблицы (OpenOffice.org Calc, Kspread), программы для просмотра "
+"pdf и т.д."
#: share/meta-task/compssUsers.pl:18
-#: share/meta-task/compssUsers.pl.orig:18
#, c-format
-msgid "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, gnumeric), pdf viewers, etc"
-msgstr "Офисные программы: текстовые процессоры (kword, abiword), электронные таблицы (kspread, gnumeric), программы для просмотра pdf и т.д."
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+"Офисные программы: текстовые процессоры (kword, abiword), электронные "
+"таблицы (kspread, gnumeric), программы для просмотра pdf и т.д."
#: share/meta-task/compssUsers.pl:23
-#: share/meta-task/compssUsers.pl.orig:23
#, c-format
msgid "Game station"
msgstr "Игровой компьютер"
#: share/meta-task/compssUsers.pl:24
-#: share/meta-task/compssUsers.pl.orig:24
#, c-format
msgid "Amusement programs: arcade, boards, strategy, etc"
msgstr "Развлекательные программы: аркады, настольные игры, стратегии и т.д."
#: share/meta-task/compssUsers.pl:27
-#: share/meta-task/compssUsers.pl.orig:27
#, c-format
msgid "Multimedia station"
msgstr "Мультимедийный компьютер"
#: share/meta-task/compssUsers.pl:28
-#: share/meta-task/compssUsers.pl.orig:28
#, c-format
msgid "Sound and video playing/editing programs"
msgstr "Программы для воспроизведения/редактирования звука и видео"
#: share/meta-task/compssUsers.pl:33
-#: share/meta-task/compssUsers.pl.orig:33
#, c-format
msgid "Internet station"
msgstr "Интернет-компьютер"
#: share/meta-task/compssUsers.pl:34
-#: share/meta-task/compssUsers.pl.orig:34
#, c-format
-msgid "Set of tools to read and send mail and news (mutt, tin..) and to browse the Web"
-msgstr "Набор программ для работы с корреспонденцией (mutt, tin...) и веб-серфинга"
+msgid ""
+"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
+"Web"
+msgstr ""
+"Набор программ для работы с корреспонденцией (mutt, tin...) и веб-серфинга"
#: share/meta-task/compssUsers.pl:39
-#: share/meta-task/compssUsers.pl.orig:39
#, c-format
msgid "Network Computer (client)"
msgstr "Сетевой компьютер (клиент)"
#: share/meta-task/compssUsers.pl:40
-#: share/meta-task/compssUsers.pl.orig:40
#, c-format
msgid "Clients for different protocols including ssh"
msgstr "Клиенты для различных протоколов, включая ssh"
#: share/meta-task/compssUsers.pl:45
-#: share/meta-task/compssUsers.pl.orig:45
#, c-format
msgid "Tools to ease the configuration of your computer"
msgstr "Утилиты для облегчения настройки компьютера"
#: share/meta-task/compssUsers.pl:49
-#: share/meta-task/compssUsers.pl.orig:49
#, c-format
msgid "Console Tools"
msgstr "Утилиты для консоли"
#: share/meta-task/compssUsers.pl:50
-#: share/meta-task/compssUsers.pl.orig:50
#, c-format
msgid "Editors, shells, file tools, terminals"
msgstr "Редакторы, командные оболочки, файловые утилиты, терминалы"
-#: share/meta-task/compssUsers.pl:54
-#: share/meta-task/compssUsers.pl:157
+#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
#: share/meta-task/compssUsers.pl:159
-#: share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
#, c-format
msgid "Development"
msgstr "Разработка"
-#: share/meta-task/compssUsers.pl:55
-#: share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
+#: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
#, c-format
msgid "C and C++ development libraries, programs and include files"
msgstr "Библиотеки для разработки на C и C++, программы и заголовочные файлы"
-#: share/meta-task/compssUsers.pl:58
-#: share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
+#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
#, c-format
msgid "Documentation"
msgstr "Документация"
-#: share/meta-task/compssUsers.pl:59
-#: share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
+#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
#, c-format
msgid "Books and Howto's on Linux and Free Software"
msgstr "Книги и документация по Linux и свободному программному обеспечению"
-#: share/meta-task/compssUsers.pl:63
-#: share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
+#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
#, c-format
msgid "LSB"
msgstr "LSB"
-#: share/meta-task/compssUsers.pl:64
-#: share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
+#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
#, c-format
msgid "Linux Standard Base. Third party applications support"
msgstr "Linux Standard Base. Поддержка приложений сторонних разработчиков."
#: share/meta-task/compssUsers.pl:73
-#: share/meta-task/compssUsers.pl.orig:73
#, c-format
msgid "Web Server"
msgstr "Веб-сервер"
#: share/meta-task/compssUsers.pl:74
-#: share/meta-task/compssUsers.pl.orig:74
#, c-format
msgid "Apache"
msgstr "Apache"
#: share/meta-task/compssUsers.pl:77
-#: share/meta-task/compssUsers.pl.orig:77
#, c-format
msgid "Groupware"
msgstr "ПО для совместной работы"
#: share/meta-task/compssUsers.pl:78
-#: share/meta-task/compssUsers.pl.orig:78
#, c-format
msgid "Kolab Server"
msgstr "Сервер Kolab"
-#: share/meta-task/compssUsers.pl:81
-#: share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
+#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
#, c-format
msgid "Firewall/Router"
msgstr "Файервол/Маршрутизатор"
-#: share/meta-task/compssUsers.pl:82
-#: share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
+#: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
#, c-format
msgid "Internet gateway"
msgstr "Интернет-шлюз"
#: share/meta-task/compssUsers.pl:85
-#: share/meta-task/compssUsers.pl.orig:85
#, c-format
msgid "Mail/News"
msgstr "Почта/Новости"
#: share/meta-task/compssUsers.pl:86
-#: share/meta-task/compssUsers.pl.orig:86
#, c-format
msgid "Postfix mail server, Inn news server"
msgstr "Почтовый сервер Postfix, сервер новостей Inn"
#: share/meta-task/compssUsers.pl:89
-#: share/meta-task/compssUsers.pl.orig:89
#, c-format
msgid "Directory Server"
msgstr "Служба каталогов"
#: share/meta-task/compssUsers.pl:93
-#: share/meta-task/compssUsers.pl.orig:93
#, c-format
msgid "FTP Server"
msgstr "Сервер FTP"
#: share/meta-task/compssUsers.pl:94
-#: share/meta-task/compssUsers.pl.orig:94
#, c-format
msgid "ProFTPd"
msgstr "ProFTPd"
#: share/meta-task/compssUsers.pl:97
-#: share/meta-task/compssUsers.pl.orig:97
#, c-format
msgid "DNS/NIS"
msgstr "DNS/NIS"
#: share/meta-task/compssUsers.pl:98
-#: share/meta-task/compssUsers.pl.orig:98
#, c-format
msgid "Domain Name and Network Information Server"
msgstr "Сервер доменных имен и сетевые информационные службы (NIS)"
#: share/meta-task/compssUsers.pl:101
-#: share/meta-task/compssUsers.pl.orig:101
#, c-format
msgid "File and Printer Sharing Server"
msgstr "Сервер общего доступа к файлам и принтерам"
#: share/meta-task/compssUsers.pl:102
-#: share/meta-task/compssUsers.pl.orig:102
#, c-format
msgid "NFS Server, Samba server"
msgstr "Сервер NFS, сервер Samba"
-#: share/meta-task/compssUsers.pl:105
-#: share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
+#: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
#, c-format
msgid "Database"
msgstr "База данных"
#: share/meta-task/compssUsers.pl:106
-#: share/meta-task/compssUsers.pl.orig:106
#, c-format
msgid "PostgreSQL and MySQL Database Server"
msgstr "Сервер баз данных PostgreSQL и MySQL"
#: share/meta-task/compssUsers.pl:110
-#: share/meta-task/compssUsers.pl.orig:110
#, c-format
msgid "Web/FTP"
msgstr "Веб/FTP"
#: share/meta-task/compssUsers.pl:111
-#: share/meta-task/compssUsers.pl.orig:111
#, c-format
msgid "Apache, Pro-ftpd"
msgstr "Apache, Pro-ftpd"
#: share/meta-task/compssUsers.pl:114
-#: share/meta-task/compssUsers.pl.orig:114
#, c-format
msgid "Mail"
msgstr "Почта"
#: share/meta-task/compssUsers.pl:115
-#: share/meta-task/compssUsers.pl.orig:115
#, c-format
msgid "Postfix mail server"
msgstr "Почтовый сервер Postfix"
#: share/meta-task/compssUsers.pl:119
-#: share/meta-task/compssUsers.pl.orig:119
#, c-format
msgid "PostgreSQL or MySQL database server"
msgstr "Сервер баз данных PostgreSQL или MySQL"
#: share/meta-task/compssUsers.pl:126
-#: share/meta-task/compssUsers.pl.orig:126
#, c-format
msgid "Network Computer server"
msgstr "Сетевой сервер"
#: share/meta-task/compssUsers.pl:127
-#: share/meta-task/compssUsers.pl.orig:127
#, c-format
msgid "NFS server, SMB server, Proxy server, ssh server"
msgstr "Cервер NFS, сервер SMB, прокси-сервер, сервер SSH"
#: share/meta-task/compssUsers.pl:133
-#: share/meta-task/compssUsers.pl.orig:133
#, c-format
msgid "Graphical Environment"
msgstr "Графическое окружение"
#: share/meta-task/compssUsers.pl:135
-#: share/meta-task/compssUsers.pl.orig:135
#, c-format
msgid "KDE Workstation"
msgstr "Рабочая станция KDE"
#: share/meta-task/compssUsers.pl:136
-#: share/meta-task/compssUsers.pl.orig:136
#, c-format
-msgid "The K Desktop Environment, the basic graphical environment with a collection of accompanying tools"
-msgstr "K Desktop Environment - основная графическая среда с коллекцией сопроводительных утилит"
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr ""
+"K Desktop Environment - основная графическая среда с коллекцией "
+"сопроводительных утилит"
#: share/meta-task/compssUsers.pl:140
-#: share/meta-task/compssUsers.pl.orig:140
#, c-format
msgid "GNOME Workstation"
msgstr "Рабочая станция Gnome"
#: share/meta-task/compssUsers.pl:141
-#: share/meta-task/compssUsers.pl.orig:141
#, c-format
-msgid "A graphical environment with user-friendly set of applications and desktop tools"
-msgstr "Графическая среда с удобным для пользователя набором приложений и утилит рабочего стола"
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr ""
+"Графическая среда с удобным для пользователя набором приложений и утилит "
+"рабочего стола"
#: share/meta-task/compssUsers.pl:145
-#: share/meta-task/compssUsers.pl.orig:145
#, c-format
msgid "LXDE Desktop"
msgstr "Рабочий стол LXDE"
#: share/meta-task/compssUsers.pl:147
#, c-format
-msgid "A lightweight & fast graphical environment with user-friendly set of applications and desktop tools"
-msgstr "Простая и быстрая графическая среда с удобным для пользователя набором приложений и настольными программами"
+msgid ""
+"A lightweight & fast graphical environment with user-friendly set of "
+"applications and desktop tools"
+msgstr ""
+"Простая и быстрая графическая среда с удобным для пользователя набором "
+"приложений и настольными программами"
#: share/meta-task/compssUsers.pl:150
-#: share/meta-task/compssUsers.pl.orig:149
#, c-format
msgid "Other Graphical Desktops"
msgstr "Другие графические рабочие столы"
#: share/meta-task/compssUsers.pl:151
-#: share/meta-task/compssUsers.pl.orig:150
#, c-format
msgid "Window Maker, Enlightenment, Fvwm, etc"
msgstr "Window Maker, Enlightenment, Fvwm и т.п."
#: share/meta-task/compssUsers.pl:174
-#: share/meta-task/compssUsers.pl.orig:173
#, c-format
msgid "Utilities"
msgstr "Утилиты"
-#: share/meta-task/compssUsers.pl:176
-#: share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
+#: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
#, c-format
msgid "SSH Server"
msgstr "Сервер SSH"
#: share/meta-task/compssUsers.pl:181
-#: share/meta-task/compssUsers.pl.orig:180
#, c-format
msgid "Webmin"
msgstr "Webmin"
#: share/meta-task/compssUsers.pl:182
-#: share/meta-task/compssUsers.pl.orig:181
#, c-format
msgid "Webmin Remote Configuration Server"
msgstr "Сервер удалённой настройки Webmin"
#: share/meta-task/compssUsers.pl:186
-#: share/meta-task/compssUsers.pl.orig:185
#, c-format
msgid "Network Utilities/Monitoring"
msgstr "Сетевые утилиты/Мониторинг"
#: share/meta-task/compssUsers.pl:187
-#: share/meta-task/compssUsers.pl.orig:186
#, c-format
msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
msgstr "Утилиты мониторинга, учёт процессов, tcpdump, nmap, ..."
#: share/meta-task/compssUsers.pl:191
-#: share/meta-task/compssUsers.pl.orig:190
#, c-format
msgid "Mandriva Wizards"
msgstr "Мастеры настройки Mandriva"
#: share/meta-task/compssUsers.pl:192
-#: share/meta-task/compssUsers.pl.orig:191
#, c-format
msgid "Wizards to configure server"
msgstr "Мастеры настройки сервера"
@@ -789,14 +723,15 @@ msgstr ""
msgid ""
"Some important packages did not get installed properly.\n"
"Either your cdrom drive or your cdrom is defective.\n"
-"Check the cdrom on an installed computer using \"rpm -qpl media/main/*.rpm\"\n"
+"Check the cdrom on an installed computer using \"rpm -qpl media/main/*.rpm"
+"\"\n"
msgstr ""
"Некоторые важные пакеты установились некорректно.\n"
"Повреждён привод CDROM или компакт-диск.\n"
-"Проверьте вставленный в компьютер диск с помощью команды \"rpm -qpl media/main/*.rpm\"\n"
+"Проверьте вставленный в компьютер диск с помощью команды \"rpm -qpl media/"
+"main/*.rpm\"\n"
-#: steps_auto_install.pm:71
-#: steps_stdio.pm:27
+#: steps_auto_install.pm:71 steps_stdio.pm:27
#, c-format
msgid "Entering step `%s'\n"
msgstr "Выполняется переход на этап `%s'\n"
@@ -820,7 +755,8 @@ msgstr "Xorg-сервер долго запускается. Подождите.
#, c-format
msgid ""
"Your system is low on resources. You may have some problem installing\n"
-"Mandriva Linux. If that occurs, you can try a text install instead. For this,\n"
+"Mandriva Linux. If that occurs, you can try a text install instead. For "
+"this,\n"
"press `F1' when booting on CDROM, then enter `text'."
msgstr ""
"Системе не хватает ресурсов. Во время установки Mandriva Linux могут\n"
@@ -868,21 +804,17 @@ msgstr "Это предварительный вид рабочего стола
msgid "Click on images in order to see a bigger preview"
msgstr "Щёлкните картинку, чтобы увеличить её"
-#: steps_gtk.pm:315
-#: steps_interactive.pm:606
-#: steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
#, c-format
msgid "Package Group Selection"
msgstr "Выбор групп пакетов"
-#: steps_gtk.pm:336
-#: steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
#, c-format
msgid "Individual package selection"
msgstr "Выбор отдельных пакетов"
-#: steps_gtk.pm:360
-#: steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
#, c-format
msgid "Total size: %d / %d MB"
msgstr "Общий объём: %d / %d МБ"
@@ -939,7 +871,9 @@ msgstr "чтобы сохранить %s"
#: steps_gtk.pm:452
#, c-format
-msgid "You can not select this package as there is not enough space left to install it"
+msgid ""
+"You can not select this package as there is not enough space left to install "
+"it"
msgstr "Этот пакет нельзя выбрать, т.к. для его установки не хватает места"
#: steps_gtk.pm:455
@@ -997,15 +931,12 @@ msgstr "Минимальная установка"
msgid "Software Management"
msgstr "Управление ПО"
-#: steps_gtk.pm:517
-#: steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
#, c-format
msgid "Choose the packages you want to install"
msgstr "Выберите пакеты, которые нужно установить"
-#: steps_gtk.pm:534
-#: steps_interactive.pm:637
-#: steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
#, c-format
msgid "Installing"
msgstr "Установка"
@@ -1032,9 +963,7 @@ msgid_plural "%d packages"
msgstr[0] "%d пакет"
msgstr[1] "%d пакетов"
-#: steps_gtk.pm:651
-#: steps_interactive.pm:800
-#: steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
#, c-format
msgid "Summary"
msgstr "Сводка"
@@ -1044,9 +973,7 @@ msgstr "Сводка"
msgid "Configure"
msgstr "Настройка"
-#: steps_gtk.pm:687
-#: steps_interactive.pm:796
-#: steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
#, c-format
msgid "not configured"
msgstr "не настроен"
@@ -1056,8 +983,7 @@ msgstr "не настроен"
msgid "Media Selection"
msgstr "Выбор источника"
-#: steps_gtk.pm:730
-#: steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
#, c-format
msgid ""
"The following installation media have been found.\n"
@@ -1066,18 +992,20 @@ msgstr ""
"Найдены следующие источники для установки.\n"
"Если нужно пропустить некоторые из них, сейчас с них можно снять флажки."
-#: steps_gtk.pm:746
-#: steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
#, c-format
msgid ""
-"You have the option to copy the contents of the CDs onto the hard drive before installation.\n"
-"It will then continue from the hard drive and the packages will remain available once the system is fully installed."
+"You have the option to copy the contents of the CDs onto the hard drive "
+"before installation.\n"
+"It will then continue from the hard drive and the packages will remain "
+"available once the system is fully installed."
msgstr ""
-"Содержимое компакт-диска перед установкой можно скопировать на жёсткий диск.\n"
-"После этого установка продолжится с жёсткого диска, и пакеты будут доступны после полной установки системы."
+"Содержимое компакт-диска перед установкой можно скопировать на жёсткий "
+"диск.\n"
+"После этого установка продолжится с жёсткого диска, и пакеты будут доступны "
+"после полной установки системы."
-#: steps_gtk.pm:748
-#: steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
#, c-format
msgid "Copy whole CDs"
msgstr "Целиком скопировать компакт-диски"
@@ -1097,59 +1025,49 @@ msgstr "Выберите раскладку клавиатуры"
msgid "Here is the full list of available keyboards:"
msgstr "Полный список доступных раскладок:"
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
#, c-format
msgid "Install/Upgrade"
msgstr "Установка/Обновление"
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
#, c-format
msgid "Is this an install or an upgrade?"
msgstr "Это установка или обновление?"
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
#, c-format
msgid ""
"_: This is a noun:\n"
"Install"
msgstr "Установка"
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
#, c-format
msgid "Upgrade %s"
msgstr "Обновление %s"
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr "Обновление с 32-разрядного до 64-разрядного дистрибутива не поддерживается"
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr "Обновление с 64-разрядного до 32-разрядного дистрибутива не поддерживается"
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
#, c-format
msgid "Encryption key for %s"
msgstr "Ключ шифрования для %s"
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
#, c-format
msgid "Cancel installation, reboot system"
msgstr "Отмена установки, перезагрузка системы"
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
#, c-format
msgid "New Installation"
msgstr "Новая установка"
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
#, c-format
msgid "Upgrade previous installation (not recommended)"
msgstr "Обновление предыдущей установки (не рекомендуется)"
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
#, c-format
msgid ""
"Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1165,52 +1083,70 @@ msgstr ""
"\n"
"Рекомедуется заново установить систему, заменив существующую.\n"
"\n"
-"Внимание: вы должны сделать копию всех ваших персональных данных, перед выбором \"Новая\n"
+"Внимание: вы должны сделать копию всех ваших персональных данных, перед "
+"выбором \"Новая\n"
"Установка\"."
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "IDE"
msgstr "IDE"
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "Configuring IDE"
msgstr "Настраивается IDE"
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
#, c-format
-msgid "No free space for 1MB bootstrap! Install will continue, but to boot your system, you'll need to create the bootstrap partition in DiskDrake"
-msgstr "Недостаточно свободного места для программы самозагрузки! Установка продолжится, но для загрузки системы будет необходимо создать раздел начальной загрузки в DiskDrake"
+msgid ""
+"No free space for 1MB bootstrap! Install will continue, but to boot your "
+"system, you'll need to create the bootstrap partition in DiskDrake"
+msgstr ""
+"Недостаточно свободного места для программы самозагрузки! Установка "
+"продолжится, но для загрузки системы будет необходимо создать раздел "
+"начальной загрузки в DiskDrake"
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
#, c-format
-msgid "You'll need to create a PPC PReP Boot bootstrap! Install will continue, but to boot your system, you'll need to create the bootstrap partition in DiskDrake"
-msgstr "Необходимо создать загрузочный раздел PPC PReP! Установка продолжится, но для загрузки системы нужно будет создать раздел начальной загрузки в DiskDrake"
+msgid ""
+"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
+"to boot your system, you'll need to create the bootstrap partition in "
+"DiskDrake"
+msgstr ""
+"Необходимо создать загрузочный раздел PPC PReP! Установка продолжится, но "
+"для загрузки системы нужно будет создать раздел начальной загрузки в "
+"DiskDrake"
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
#, c-format
msgid ""
"Change your Cd-Rom!\n"
-"Please insert the Cd-Rom labelled \"%s\" in your drive and press Ok when done.\n"
+"Please insert the Cd-Rom labelled \"%s\" in your drive and press Ok when "
+"done.\n"
"If you do not have it, press Cancel to avoid installation from this Cd-Rom."
msgstr ""
"Смените компакт-диск!\n"
"\n"
"Вставьте в привод компакт-диск под названием \"%s\", а затем нажмите 'ОК'.\n"
-"Если у вас его нет, нажмите 'Отмена', чтобы отказаться от установки с этого диска."
+"Если у вас его нет, нажмите 'Отмена', чтобы отказаться от установки с этого "
+"диска."
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
#, c-format
msgid "Looking for available packages..."
msgstr "Поиск доступных пакетов..."
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
#, c-format
-msgid "Your system does not have enough space left for installation or upgrade (%dMB > %dMB)"
-msgstr "В вашей системе недостаточно свободного дискового пространства для установки или обновления (%d МБ > %d МБ)"
+msgid ""
+"Your system does not have enough space left for installation or upgrade (%"
+"dMB > %dMB)"
+msgstr ""
+"В вашей системе недостаточно свободного дискового пространства для установки "
+"или обновления (%d МБ > %d МБ)"
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
#, c-format
msgid ""
"Please choose load or save package selection.\n"
@@ -1219,52 +1155,52 @@ msgstr ""
"Выберите загрузку или сохранение выбора пакетов.\n"
"Формат файлов такой же, как и у созданных при автоматической установке."
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Load"
msgstr "Загрузить"
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Save"
msgstr "Сохранить"
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
#, c-format
msgid "Bad file"
msgstr "Неверный файл"
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
#, c-format
msgid "KDE"
msgstr "KDE"
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
#, c-format
msgid "GNOME"
msgstr "GNOME"
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
#, c-format
msgid "Desktop Selection"
msgstr "Выбор рабочего стола"
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
#, c-format
msgid "You can choose your workstation desktop profile."
msgstr "Можно выбрать профиль настольной среды."
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
#, c-format
msgid "Selected size is larger than available space"
msgstr "Выбранный размер превышает доступное место"
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
#, c-format
msgid "Type of install"
msgstr "Тип установки"
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
#, c-format
msgid ""
"You have not selected any group of packages.\n"
@@ -1273,83 +1209,82 @@ msgstr ""
"Не была выбрана ни одна группа пакетов.\n"
"Выберите тип минимальной установки:"
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
#, c-format
msgid "With X"
msgstr "С Х-сервером"
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
#, c-format
msgid "With basic documentation (recommended!)"
msgstr "С основной документацией (рекомендуется)"
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
#, c-format
msgid "Truly minimal install (especially no urpmi)"
msgstr "Действительно минимальная установка (даже без urpmi)"
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
#, c-format
msgid "Preparing installation"
msgstr "Подготовка к установке"
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
#, c-format
msgid "Installing package %s"
msgstr "Устанавливается пакет %s"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "There was an error ordering packages:"
msgstr "При загрузке пакетов возникла ошибка:"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "Go on anyway?"
msgstr "Всё равно продолжить?"
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
#, c-format
msgid "Retry"
msgstr "Повторить"
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
#, c-format
msgid "Skip this package"
msgstr "Пропустить этот пакет"
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
#, c-format
msgid "Skip all packages from medium \"%s\""
msgstr "Пропустить все пакеты из источника \"%s\""
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
#, c-format
msgid "Go back to media and packages selection"
msgstr "Вернуться к выбору источника и пакетов"
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
#, c-format
msgid "There was an error installing package %s."
msgstr "При установке пакета %s возникла ошибка."
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
#, c-format
msgid "Post-install configuration"
msgstr "Настройка после установки"
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
#, c-format
msgid "Please ensure the Update Modules media is in drive %s"
msgstr "Проверьте наличие носителя 'Update Modules' в устройстве %s"
-#: steps_interactive.pm:734
-#: steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
#, c-format
msgid "Updates"
msgstr "Обновления"
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
#, c-format
msgid ""
"You now have the opportunity to download updated packages. These packages\n"
@@ -1370,118 +1305,131 @@ msgstr ""
"\n"
"Установить эти обновления?"
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
#, c-format
msgid "%s on %s"
msgstr "%s на %s"
-#: steps_interactive.pm:875
-#: steps_interactive.pm:882
-#: steps_interactive.pm:895
-#: steps_interactive.pm:912
-#: steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
#, c-format
msgid "Hardware"
msgstr "Оборудование"
-#: steps_interactive.pm:896
-#: steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
#, c-format
msgid "Sound card"
msgstr "Звуковая карта"
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
#, c-format
msgid "Do you have an ISA sound card?"
msgstr "Есть ли у вас звуковая карта ISA?"
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
#, c-format
-msgid "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound card"
-msgstr "Для настройки звуковой карты запустите после установки утилиту \"alsaconf\" или \"sndconfig\"."
+msgid ""
+"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
+"card"
+msgstr ""
+"Для настройки звуковой карты запустите после установки утилиту \"alsaconf\" "
+"или \"sndconfig\"."
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
#, c-format
msgid "No sound card detected. Try \"harddrake\" after installation"
-msgstr "Звуковая карта не обнаружена. Попробуйте запустить после установки утилиту \"harddrake\" "
+msgstr ""
+"Звуковая карта не обнаружена. Попробуйте запустить после установки утилиту "
+"\"harddrake\" "
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
#, c-format
msgid "Graphical interface"
msgstr "Графический интерфейс"
-#: steps_interactive.pm:934
-#: steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
#, c-format
msgid "Network & Internet"
msgstr "Сеть и Интернет"
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
#, c-format
msgid "Proxies"
msgstr "Прокси"
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
#, c-format
msgid "configured"
msgstr "настроен"
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
#, c-format
msgid "Security Level"
msgstr "Уровень безопасности"
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
#, c-format
msgid "Firewall"
msgstr "Файервол"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "activated"
msgstr "включен"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "disabled"
msgstr "выключен"
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
#, c-format
msgid "You have not configured X. Are you sure you really want this?"
msgstr "Х-сервер ещё не настроен. Вы точно уверены в своих действиях?"
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
#, c-format
msgid "Preparing bootloader..."
msgstr "Подготавливается начальный загрузчик..."
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
#, c-format
msgid "Be patient, this may take a while..."
msgstr "Подождите, это может занять некоторое время..."
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
#, c-format
-msgid "You appear to have an OldWorld or Unknown machine, the yaboot bootloader will not work for you. The install will continue, but you'll need to use BootX or some other means to boot your machine. The kernel argument for the root fs is: root=%s"
-msgstr "Похоже, что вы являетесь обладателем очень старой или неизвестной машины, на которой начальный загрузчик 'yaboot' не будет работать. Установка продолжится, однако для загрузки придётся использовать загрузчик 'BootX' или какой-то другой. Параметр ядра для корневой файловой системы: root=%s"
+msgid ""
+"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
+"will not work for you. The install will continue, but you'll need to use "
+"BootX or some other means to boot your machine. The kernel argument for the "
+"root fs is: root=%s"
+msgstr ""
+"Похоже, что вы являетесь обладателем очень старой или неизвестной машины, на "
+"которой начальный загрузчик 'yaboot' не будет работать. Установка "
+"продолжится, однако для загрузки придётся использовать загрузчик 'BootX' или "
+"какой-то другой. Параметр ядра для корневой файловой системы: root=%s"
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
#, c-format
-msgid "In this security level, access to the files in the Windows partition is restricted to the administrator."
-msgstr "На данном уровне безопасности доступ к файлам на разделе Windows разрешён только администратору. "
+msgid ""
+"In this security level, access to the files in the Windows partition is "
+"restricted to the administrator."
+msgstr ""
+"На данном уровне безопасности доступ к файлам на разделе Windows разрешён "
+"только администратору. "
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr "Вставьте чистую дискету в дисковод %s"
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
#, c-format
msgid "Creating auto install floppy..."
msgstr "Создается дискета автоматической установки..."
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
#, c-format
msgid ""
"Some steps are not completed.\n"
@@ -1492,7 +1440,7 @@ msgstr ""
"\n"
"Действительно завершить работу?"
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
#, c-format
msgid "Congratulations"
msgstr "Поздравляем"
@@ -1505,8 +1453,7 @@ msgid ""
"Language"
msgstr "Выбор языка"
-#: steps_list.pm:16
-#: steps_list.pm:23
+#: steps_list.pm:16 steps_list.pm:23
#, c-format
msgid "Localization"
msgstr "Локализация"
@@ -1525,16 +1472,14 @@ msgid ""
"Mouse"
msgstr "Мышь"
-#: steps_list.pm:19
-#: steps_list.pm:20
+#: steps_list.pm:19 steps_list.pm:20
#, c-format
msgid ""
"_: Keep these entry short\n"
"Hard drive detection"
msgstr "Поиск жёсткого диска"
-#: steps_list.pm:21
-#: steps_list.pm:22
+#: steps_list.pm:21 steps_list.pm:22
#, c-format
msgid ""
"_: Keep these entry short\n"
@@ -1562,8 +1507,7 @@ msgid ""
"Partitioning"
msgstr "Разметка диска"
-#: steps_list.pm:27
-#: steps_list.pm:28
+#: steps_list.pm:27 steps_list.pm:28
#, c-format
msgid ""
"_: Keep these entry short\n"
@@ -1591,24 +1535,21 @@ msgid ""
"Users"
msgstr "Пользователи"
-#: steps_list.pm:36
-#: steps_list.pm:37
+#: steps_list.pm:36 steps_list.pm:37
#, c-format
msgid ""
"_: Keep these entry short\n"
"Networking"
msgstr "Сеть"
-#: steps_list.pm:38
-#: steps_list.pm:39
+#: steps_list.pm:38 steps_list.pm:39
#, c-format
msgid ""
"_: Keep these entry short\n"
"Bootloader"
msgstr "Загрузчик"
-#: steps_list.pm:40
-#: steps_list.pm:41
+#: steps_list.pm:40 steps_list.pm:41
#, c-format
msgid ""
"_: Keep these entry short\n"
@@ -1622,8 +1563,7 @@ msgid ""
"Summary"
msgstr "Сводка"
-#: steps_list.pm:44
-#: steps_list.pm:45
+#: steps_list.pm:44 steps_list.pm:45
#, c-format
msgid ""
"_: Keep these entry short\n"
@@ -1644,6 +1584,32 @@ msgid ""
"Exit"
msgstr "Выход"
+#~ msgid "Your desktop on a USB key"
+#~ msgstr "Рабочая система на USB-брелоке"
+
+#~ msgid "The 100%% open source Mandriva Linux distribution"
+#~ msgstr "100%% открытый дистрибутив Mandriva Linux"
+
+#~ msgid "Explore Linux easily with Mandriva One"
+#~ msgstr "Открой Linux с Mandriva One"
+
+#~ msgid "A full Mandriva Linux desktop, with support"
+#~ msgstr "Полный дистрибутив Mandriva Linux с поддержкой"
+
+#~ msgid "Mandriva: distributions for everybody's needs"
+#~ msgstr "Mandriva: дистрибутив для каждого"
+
+#~ msgid "Downloading file %s..."
+#~ msgstr "Загружается файл %s..."
+
+#~ msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
+#~ msgstr ""
+#~ "Обновление с 32-разрядного до 64-разрядного дистрибутива не поддерживается"
+
+#~ msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
+#~ msgstr ""
+#~ "Обновление с 64-разрядного до 32-разрядного дистрибутива не поддерживается"
+
#~ msgid ""
#~ "You have selected the following server(s): %s\n"
#~ "\n"
@@ -1668,6 +1634,6 @@ msgstr "Выход"
#~ "\n"
#~ "\n"
#~ "Установить эти серверы?\n"
+
#~ msgid "IceWm Desktop"
#~ msgstr "Рабочий стол IceWm"
-
diff --git a/perl-install/install/share/po/sc.po b/perl-install/install/share/po/sc.po
index 3cf36b7f7..4584d0a4e 100644
--- a/perl-install/install/share/po/sc.po
+++ b/perl-install/install/share/po/sc.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: DrakX-sc\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
"PO-Revision-Date: 2005-09-14 11:29+0100\n"
"Last-Translator: Antoni Pistis <antonio.pistis@virgilio.it>\n"
"Language-Team: Sardu\n"
@@ -15,31 +15,6 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.3\n"
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr ""
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr ""
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr ""
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr ""
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr ""
-
#: any.pm:109
#, c-format
msgid "Do you have further supplementary media?"
@@ -75,24 +50,24 @@ msgstr "Arretza (FTP)"
msgid "Network (NFS)"
msgstr "Arretza (NFS)"
-#: any.pm:163
+#: any.pm:165
#, c-format
msgid "URL of the mirror?"
msgstr "URL de su sprigu?"
-#: any.pm:169
+#: any.pm:171
#, c-format
msgid "URL must start with ftp:// or http://"
msgstr ""
-#: any.pm:180
+#: any.pm:182
#, c-format
msgid ""
"Contacting Mandriva Linux web site to get the list of available mirrors..."
msgstr ""
"Cuntatu su jassu web de Mandriva Linux po tenni sa lista de is sprigus..."
-#: any.pm:185
+#: any.pm:187
#, fuzzy, c-format
msgid ""
"Failed contacting Mandriva Linux web site to get the list of available "
@@ -100,69 +75,69 @@ msgid ""
msgstr ""
"Cuntatu su jassu web de Mandriva Linux po tenni sa lista de is sprigus..."
-#: any.pm:195
+#: any.pm:197
#, c-format
msgid "Choose a mirror from which to get the packages"
msgstr ""
-#: any.pm:225
+#: any.pm:227
#, c-format
msgid "NFS setup"
msgstr "Assètiu NFS"
-#: any.pm:226
+#: any.pm:228
#, c-format
msgid "Please enter the hostname and directory of your NFS media"
msgstr ""
-#: any.pm:230
+#: any.pm:232
#, c-format
msgid "Hostname missing"
msgstr ""
-#: any.pm:231
+#: any.pm:233
#, c-format
msgid "Directory must begin with \"/\""
msgstr ""
-#: any.pm:235
+#: any.pm:237
#, c-format
msgid "Hostname of the NFS mount ?"
msgstr ""
-#: any.pm:236
+#: any.pm:238
#, c-format
msgid "Directory"
msgstr "Directory"
-#: any.pm:258
+#: any.pm:260
#, c-format
msgid "Supplementary"
msgstr ""
-#: any.pm:293
+#: any.pm:295
#, c-format
msgid ""
"Can't find a package list file on this mirror. Make sure the location is "
"correct."
msgstr ""
-#: any.pm:328
+#: any.pm:334
#, c-format
msgid "Looking at packages already installed..."
msgstr "Càstiu is pakitus jai aposentaus..."
-#: any.pm:362
+#: any.pm:368
#, c-format
msgid "Finding packages to upgrade..."
msgstr "Agatu is pakitus po ajorronai..."
-#: any.pm:381
+#: any.pm:387
#, c-format
msgid "Removing packages prior to upgrade..."
msgstr "Srèxinu is pakitus ki dui funt po ajorronai..."
-#: any.pm:402
+#: any.pm:408
#, c-format
msgid ""
"You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -174,18 +149,18 @@ msgid ""
"please reboot your system and upgrade using the Mandriva update applet."
msgstr ""
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
#, c-format
msgid "Reboot"
msgstr "Torra a allui"
-#: any.pm:407
+#: any.pm:413
#, c-format
msgid "Proceed"
msgstr ""
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -194,72 +169,72 @@ msgid ""
"Do you really want to remove these packages?\n"
msgstr ""
-#: any.pm:815
+#: any.pm:821
#, c-format
msgid "Error reading file %s"
msgstr "Faddina ligendi su file %s"
-#: any.pm:1022
+#: any.pm:1028
#, c-format
msgid "The following disk(s) were renamed:"
msgstr "Apu arrenominau is discus ki sighint:"
-#: any.pm:1024
+#: any.pm:1030
#, c-format
msgid "%s (previously named as %s)"
msgstr "%s (innantis nominau %s)"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "HTTP"
msgstr "HTTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "FTP"
msgstr "FTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "NFS"
msgstr "NFS"
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
#, c-format
msgid "Network"
msgstr "Arretza"
-#: any.pm:1104
+#: any.pm:1110
#, c-format
msgid "Please choose a media"
msgstr "Sçobera unu suportu, po praxeri"
-#: any.pm:1120
+#: any.pm:1126
#, c-format
msgid "File already exists. Overwrite it?"
msgstr "Su file esistit jai. Nci scriu apitzus?"
-#: any.pm:1124
+#: any.pm:1130
#, c-format
msgid "Permission denied"
msgstr "Permissu dennegau"
-#: any.pm:1172
+#: any.pm:1178
#, c-format
msgid "Bad NFS name"
msgstr ""
-#: any.pm:1193
+#: any.pm:1199
#, c-format
msgid "Bad media %s"
msgstr ""
-#: any.pm:1236
+#: any.pm:1242
#, c-format
msgid "Can not make screenshots before partitioning"
msgstr "No fait a fai fotografias innantis de pratzidurai"
-#: any.pm:1244
+#: any.pm:1250
#, c-format
msgid "Screenshots will be available after install in %s"
msgstr "As a podi biri is fotografias apustis de s'aposentada in %s"
@@ -270,11 +245,15 @@ msgid "Installation"
msgstr "Seu aposentendi"
#: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
#, c-format
msgid "Configuration"
msgstr "Assètiu"
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
#: install2.pm:168
#, c-format
msgid "You must also format %s"
@@ -299,22 +278,22 @@ msgstr "Alluu s'arretza"
msgid "Bringing down the network"
msgstr "Studu s'arretza"
-#: media.pm:402
+#: media.pm:399
#, c-format
msgid "Please wait, retrieving file"
msgstr ""
-#: media.pm:734
+#: media.pm:718
#, c-format
-msgid "Downloading file %s..."
+msgid "unable to add medium"
msgstr ""
-#: media.pm:822
+#: media.pm:758
#, c-format
msgid "Copying some packages on disks for future use"
msgstr ""
-#: media.pm:875
+#: media.pm:811
#, c-format
msgid "Copying in progress"
msgstr "Còpia in cursu"
@@ -356,296 +335,278 @@ msgstr ""
msgid "An error occurred:"
msgstr "Faddina"
-#: pkgs.pm:776
+#: pkgs.pm:780
#, c-format
msgid "%d installation transactions failed"
msgstr "%d transatzionis de aposentadura faddias"
-#: pkgs.pm:777
+#: pkgs.pm:781
#, fuzzy, c-format
msgid "Installation of packages failed:"
msgstr "Sçobera tipu de aposentadura"
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
#, c-format
msgid "Workstation"
msgstr "Workstation"
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
#, c-format
msgid "Office Workstation"
msgstr ""
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
#, c-format
msgid ""
"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
msgstr ""
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
#, c-format
msgid ""
"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
"gnumeric), pdf viewers, etc"
msgstr ""
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
#, c-format
msgid "Game station"
msgstr ""
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
#, c-format
msgid "Amusement programs: arcade, boards, strategy, etc"
msgstr ""
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
#, fuzzy, c-format
msgid "Multimedia station"
msgstr "Multimedia"
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
#, c-format
msgid "Sound and video playing/editing programs"
msgstr ""
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
#, fuzzy, c-format
msgid "Internet station"
msgstr "Intrenatzionallisadura"
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
#, c-format
msgid ""
"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
"Web"
msgstr ""
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
#, fuzzy, c-format
msgid "Network Computer (client)"
msgstr "Informàtiga"
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
#, c-format
msgid "Clients for different protocols including ssh"
msgstr ""
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
#, c-format
msgid "Tools to ease the configuration of your computer"
msgstr ""
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
#, fuzzy, c-format
msgid "Console Tools"
msgstr "Console"
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
#, c-format
msgid "Editors, shells, file tools, terminals"
msgstr ""
#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
#, c-format
msgid "Development"
msgstr "Adelantamentu"
#: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
#, c-format
msgid "C and C++ development libraries, programs and include files"
msgstr ""
#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
#, c-format
msgid "Documentation"
msgstr "Documentadura"
#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
#, c-format
msgid "Books and Howto's on Linux and Free Software"
msgstr ""
#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
#, c-format
msgid "LSB"
msgstr "LSB"
#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
#, c-format
msgid "Linux Standard Base. Third party applications support"
msgstr ""
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
#, c-format
msgid "Web Server"
msgstr "Server Web"
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
#, c-format
msgid "Apache"
msgstr "Apache"
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
#, c-format
msgid "Groupware"
msgstr "Traballu in Grupu"
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
#, c-format
msgid "Kolab Server"
msgstr "Server Kolab"
#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
#, c-format
msgid "Firewall/Router"
msgstr "Firewall/Router"
#: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
#, c-format
msgid "Internet gateway"
msgstr "Gateway po Internet"
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
#, c-format
msgid "Mail/News"
msgstr "Curreu/Noas"
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
#, c-format
msgid "Postfix mail server, Inn news server"
msgstr "Server de curreu Postfix, server de noas Inn"
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
#, c-format
msgid "Directory Server"
msgstr "Server de Directory"
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
#, c-format
msgid "FTP Server"
msgstr "Server FTP"
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
#, c-format
msgid "ProFTPd"
msgstr "ProFTPd"
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
#, c-format
msgid "DNS/NIS"
msgstr "DNS/NIS"
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
#, c-format
msgid "Domain Name and Network Information Server"
msgstr ""
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
#, c-format
msgid "File and Printer Sharing Server"
msgstr ""
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
#, c-format
msgid "NFS Server, Samba server"
msgstr "Server NFS, server Samba"
#: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
#, c-format
msgid "Database"
msgstr "Database"
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
#, c-format
msgid "PostgreSQL and MySQL Database Server"
msgstr "Server po Database PostGreSQL e MySQL"
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
#, c-format
msgid "Web/FTP"
msgstr "Web/FTP"
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
#, c-format
msgid "Apache, Pro-ftpd"
msgstr "Apache, Pro-ftpd"
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
#, c-format
msgid "Mail"
msgstr "Curreu"
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
#, c-format
msgid "Postfix mail server"
msgstr "Server de curreu Postfix"
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
#, c-format
msgid "PostgreSQL or MySQL database server"
msgstr "Server po Database PostGreSQL e MySQL"
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
#, fuzzy, c-format
msgid "Network Computer server"
msgstr "Informàtiga"
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
#, c-format
msgid "NFS server, SMB server, Proxy server, ssh server"
msgstr ""
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
#, c-format
msgid "Graphical Environment"
msgstr "Ambienti Gràfigu"
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
#, c-format
msgid "KDE Workstation"
msgstr "KDE Workstation"
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
#, c-format
msgid ""
"The K Desktop Environment, the basic graphical environment with a collection "
"of accompanying tools"
msgstr ""
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
#, c-format
msgid "GNOME Workstation"
msgstr "GNOME Workstation"
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
#, c-format
msgid ""
"A graphical environment with user-friendly set of applications and desktop "
"tools"
msgstr ""
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
#, fuzzy, c-format
msgid "LXDE Desktop"
msgstr "IceWm Desktop"
@@ -657,54 +618,52 @@ msgid ""
"applications and desktop tools"
msgstr ""
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
#, c-format
msgid "Other Graphical Desktops"
msgstr "Atras scrianias gràfigas"
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
#, c-format
msgid "Window Maker, Enlightenment, Fvwm, etc"
msgstr "Window Maker, Enlightenment, Fvwm, etc"
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
#, c-format
msgid "Utilities"
msgstr ""
#: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
#, c-format
msgid "SSH Server"
msgstr "Server SSH"
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
#, c-format
msgid "Webmin"
msgstr "Webmin"
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
#, c-format
msgid "Webmin Remote Configuration Server"
msgstr ""
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
#, c-format
msgid "Network Utilities/Monitoring"
msgstr ""
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
#, c-format
msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
msgstr ""
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
#, c-format
msgid "Mandriva Wizards"
msgstr ""
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
#, c-format
msgid "Wizards to configure server"
msgstr ""
@@ -796,17 +755,17 @@ msgstr ""
msgid "Click on images in order to see a bigger preview"
msgstr ""
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
#, c-format
msgid "Package Group Selection"
msgstr ""
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
#, c-format
msgid "Individual package selection"
msgstr "Sçoberu pakitus unu a unu"
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
#, c-format
msgid "Total size: %d / %d MB"
msgstr "Mesura totali: %d / %d MB"
@@ -924,12 +883,12 @@ msgstr "Aposentadura minimali"
msgid "Software Management"
msgstr "Maniju de is programas"
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
#, c-format
msgid "Choose the packages you want to install"
msgstr "Sçobera is pakitus ki bolis aposentai"
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
#, c-format
msgid "Installing"
msgstr "Seu aposentendi"
@@ -956,7 +915,7 @@ msgid_plural "%d packages"
msgstr[0] "%d pakitus"
msgstr[1] "%d pakitus"
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
#, c-format
msgid "Summary"
msgstr "Arresùmini"
@@ -966,7 +925,7 @@ msgstr "Arresùmini"
msgid "Configure"
msgstr "Assètia"
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
#, c-format
msgid "not configured"
msgstr "no assetiau"
@@ -976,14 +935,14 @@ msgstr "no assetiau"
msgid "Media Selection"
msgstr "Càrriga/Sarva su sçoberu"
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
#, c-format
msgid ""
"The following installation media have been found.\n"
"If you want to skip some of them, you can unselect them now."
msgstr ""
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
#, c-format
msgid ""
"You have the option to copy the contents of the CDs onto the hard drive "
@@ -992,7 +951,7 @@ msgid ""
"available once the system is fully installed."
msgstr ""
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
#, c-format
msgid "Copy whole CDs"
msgstr "Còpia totu is CD"
@@ -1012,59 +971,49 @@ msgstr "Sçobera su skema de su tecrau"
msgid "Here is the full list of available keyboards:"
msgstr "Innoi sa lista de totu is tecraus a disposta"
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
#, c-format
msgid "Install/Upgrade"
msgstr "Aposenta/Ajorrona"
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
#, c-format
msgid "Is this an install or an upgrade?"
msgstr "Est una aposentadura o una ajorronadura?"
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
#, fuzzy, c-format
msgid ""
"_: This is a noun:\n"
"Install"
msgstr "Aposenta"
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
#, c-format
msgid "Upgrade %s"
msgstr "Ajorrona %s"
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
#, c-format
msgid "Encryption key for %s"
msgstr "Crai de cuadura po %s"
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
#, c-format
msgid "Cancel installation, reboot system"
msgstr ""
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
#, fuzzy, c-format
msgid "New Installation"
msgstr "Seu aposentendi"
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
#, c-format
msgid "Upgrade previous installation (not recommended)"
msgstr ""
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
#, c-format
msgid ""
"Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1076,24 +1025,24 @@ msgid ""
"Installation\"."
msgstr ""
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "IDE"
msgstr "IDE"
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "Configuring IDE"
msgstr "Assètiu IDE"
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
#, c-format
msgid ""
"No free space for 1MB bootstrap! Install will continue, but to boot your "
"system, you'll need to create the bootstrap partition in DiskDrake"
msgstr ""
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
#, c-format
msgid ""
"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1101,7 +1050,7 @@ msgid ""
"DiskDrake"
msgstr ""
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
#, c-format
msgid ""
"Change your Cd-Rom!\n"
@@ -1113,153 +1062,153 @@ msgstr ""
"Intra su Cd-Rom etiketau \"%s\" in su ligidori e craca Ok candu as fatu.\n"
"Ki no du tenis, craca Annudda po scampai s'aposentadura de custu Cd-Rom."
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
#, c-format
msgid "Looking for available packages..."
msgstr ""
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
#, c-format
msgid ""
"Your system does not have enough space left for installation or upgrade (%"
"dMB > %dMB)"
msgstr ""
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
#, c-format
msgid ""
"Please choose load or save package selection.\n"
"The format is the same as auto_install generated files."
msgstr ""
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Load"
msgstr "Càrriga"
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Save"
msgstr "Sarva"
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
#, c-format
msgid "Bad file"
msgstr "File malu"
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
#, fuzzy, c-format
msgid "KDE"
msgstr "IDE"
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
#, c-format
msgid "GNOME"
msgstr "GNOME"
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
#, c-format
msgid "Desktop Selection"
msgstr ""
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
#, c-format
msgid "You can choose your workstation desktop profile."
msgstr ""
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
#, c-format
msgid "Selected size is larger than available space"
msgstr ""
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
#, c-format
msgid "Type of install"
msgstr "Tipu de aposentadura"
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
#, c-format
msgid ""
"You have not selected any group of packages.\n"
"Please choose the minimal installation you want:"
msgstr ""
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
#, c-format
msgid "With X"
msgstr "Cun X"
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
#, c-format
msgid "With basic documentation (recommended!)"
msgstr ""
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
#, c-format
msgid "Truly minimal install (especially no urpmi)"
msgstr ""
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
#, c-format
msgid "Preparing installation"
msgstr "Apariçu s'aposentadura"
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
#, c-format
msgid "Installing package %s"
msgstr ""
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "There was an error ordering packages:"
msgstr "Faddina in s'ordinadura de is pakitus:"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "Go on anyway?"
msgstr "Sigu comuncas?"
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
#, c-format
msgid "Retry"
msgstr ""
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
#, c-format
msgid "Skip this package"
msgstr ""
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
#, c-format
msgid "Skip all packages from medium \"%s\""
msgstr ""
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
#, fuzzy, c-format
msgid "Go back to media and packages selection"
msgstr "Sarva su sçoberu de is pakitus"
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
#, fuzzy, c-format
msgid "There was an error installing package %s."
msgstr "Faddina in s'aposentadura de is pakitus:"
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
#, c-format
msgid "Post-install configuration"
msgstr "Assètiu pusti-aposentadura"
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
#, c-format
msgid "Please ensure the Update Modules media is in drive %s"
msgstr ""
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
#, c-format
msgid "Updates"
msgstr "Ajorronus"
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
#, c-format
msgid ""
"You now have the opportunity to download updated packages. These packages\n"
@@ -1272,95 +1221,95 @@ msgid ""
"Do you want to install the updates?"
msgstr ""
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
#, c-format
msgid "%s on %s"
msgstr "%s in %s"
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
#, c-format
msgid "Hardware"
msgstr "Hardware"
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
#, c-format
msgid "Sound card"
msgstr "Skeda de Sonu"
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
#, c-format
msgid "Do you have an ISA sound card?"
msgstr "Tenis una skeda de sonu ISA?"
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
#, c-format
msgid ""
"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
"card"
msgstr ""
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
#, c-format
msgid "No sound card detected. Try \"harddrake\" after installation"
msgstr ""
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
#, c-format
msgid "Graphical interface"
msgstr "Interfaci Gràfiga"
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
#, c-format
msgid "Network & Internet"
msgstr "Arretza & Internet"
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
#, c-format
msgid "Proxies"
msgstr "Proxy"
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
#, c-format
msgid "configured"
msgstr "assetiau"
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
#, c-format
msgid "Security Level"
msgstr "Arrasu de Siguresa"
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
#, c-format
msgid "Firewall"
msgstr "Firewall"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "activated"
msgstr "abivau"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "disabled"
msgstr "disabivau"
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
#, c-format
msgid "You have not configured X. Are you sure you really want this?"
msgstr "No as assetiau ancora X. Siguru ses ca bolis custu?"
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
#, c-format
msgid "Preparing bootloader..."
msgstr "Apariçu su bootloader..."
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
#, c-format
msgid "Be patient, this may take a while..."
msgstr ""
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
#, c-format
msgid ""
"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1369,24 +1318,24 @@ msgid ""
"root fs is: root=%s"
msgstr ""
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
#, c-format
msgid ""
"In this security level, access to the files in the Windows partition is "
"restricted to the administrator."
msgstr ""
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr "Intra unu floppy sbuidu in su trastu %s"
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
#, c-format
msgid "Creating auto install floppy..."
msgstr ""
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
#, c-format
msgid ""
"Some steps are not completed.\n"
@@ -1394,7 +1343,7 @@ msgid ""
"Do you really want to quit now?"
msgstr ""
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
#, c-format
msgid "Congratulations"
msgstr "Cumprimentus"
diff --git a/perl-install/install/share/po/sk.po b/perl-install/install/share/po/sk.po
index 6dd892da0..4aacefd91 100644
--- a/perl-install/install/share/po/sk.po
+++ b/perl-install/install/share/po/sk.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: DrakX\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
"PO-Revision-Date: 2005-09-21 14:03+0100\n"
"Last-Translator: Tibor Pittich <Tibor.Pittich@mandriva.org>\n"
"Language-Team: <i18n@mandrake.sk>\n"
@@ -16,31 +16,6 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr ""
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr ""
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr ""
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr ""
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr ""
-
#: any.pm:109
#, c-format
msgid "Do you have further supplementary media?"
@@ -76,24 +51,24 @@ msgstr "Sieť (FTP)"
msgid "Network (NFS)"
msgstr "Sieť (NFS)"
-#: any.pm:163
+#: any.pm:165
#, c-format
msgid "URL of the mirror?"
msgstr "URL zrkadliaceho servera"
-#: any.pm:169
+#: any.pm:171
#, c-format
msgid "URL must start with ftp:// or http://"
msgstr ""
-#: any.pm:180
+#: any.pm:182
#, c-format
msgid ""
"Contacting Mandriva Linux web site to get the list of available mirrors..."
msgstr ""
"Pripájam sa k web stránke Mandriva Linux pre stiahnutie zoznamu zrkadiel..."
-#: any.pm:185
+#: any.pm:187
#, fuzzy, c-format
msgid ""
"Failed contacting Mandriva Linux web site to get the list of available "
@@ -101,69 +76,69 @@ msgid ""
msgstr ""
"Pripájam sa k web stránke Mandriva Linux pre stiahnutie zoznamu zrkadiel..."
-#: any.pm:195
+#: any.pm:197
#, c-format
msgid "Choose a mirror from which to get the packages"
msgstr "Vyberte miror, z ktorého si chcete stiahnuť balíky"
-#: any.pm:225
+#: any.pm:227
#, c-format
msgid "NFS setup"
msgstr "Nastavenie NFS"
-#: any.pm:226
+#: any.pm:228
#, c-format
msgid "Please enter the hostname and directory of your NFS media"
msgstr "Zadajte prosím meno hostiteľa a priečinok pre vaše NFS médium"
-#: any.pm:230
+#: any.pm:232
#, c-format
msgid "Hostname missing"
msgstr ""
-#: any.pm:231
+#: any.pm:233
#, c-format
msgid "Directory must begin with \"/\""
msgstr ""
-#: any.pm:235
+#: any.pm:237
#, c-format
msgid "Hostname of the NFS mount ?"
msgstr "Meno hostiteľa pre NFS bod pripojenia ?"
-#: any.pm:236
+#: any.pm:238
#, c-format
msgid "Directory"
msgstr "Priečinok"
-#: any.pm:258
+#: any.pm:260
#, c-format
msgid "Supplementary"
msgstr ""
-#: any.pm:293
+#: any.pm:295
#, c-format
msgid ""
"Can't find a package list file on this mirror. Make sure the location is "
"correct."
msgstr "Nie je možné nájsť súbor hdlist na tomto zrkadliacom servery"
-#: any.pm:328
+#: any.pm:334
#, c-format
msgid "Looking at packages already installed..."
msgstr "Hľadám balíky, ktoré sú už nainštalované..."
-#: any.pm:362
+#: any.pm:368
#, c-format
msgid "Finding packages to upgrade..."
msgstr "Hľadám balíky pre aktualizáciu..."
-#: any.pm:381
+#: any.pm:387
#, c-format
msgid "Removing packages prior to upgrade..."
msgstr "Odstránenie balíkov pred aktualizáciou..."
-#: any.pm:402
+#: any.pm:408
#, c-format
msgid ""
"You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -175,18 +150,18 @@ msgid ""
"please reboot your system and upgrade using the Mandriva update applet."
msgstr ""
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
#, c-format
msgid "Reboot"
msgstr "Reštart"
-#: any.pm:407
+#: any.pm:413
#, c-format
msgid "Proceed"
msgstr ""
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -200,72 +175,72 @@ msgstr ""
"\n"
"Chcete naozaj tieto balíky odinštalovať?\n"
-#: any.pm:815
+#: any.pm:821
#, c-format
msgid "Error reading file %s"
msgstr "chyba pri čítaní zo súboru %s"
-#: any.pm:1022
+#: any.pm:1028
#, c-format
msgid "The following disk(s) were renamed:"
msgstr "Nasledovné disky boli premenované:"
-#: any.pm:1024
+#: any.pm:1030
#, c-format
msgid "%s (previously named as %s)"
msgstr "%s (predtým ako %s)"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "HTTP"
msgstr "HTTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "FTP"
msgstr "FTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "NFS"
msgstr "NFS"
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
#, c-format
msgid "Network"
msgstr "Sieť"
-#: any.pm:1104
+#: any.pm:1110
#, c-format
msgid "Please choose a media"
msgstr "Vyberte si zdroj"
-#: any.pm:1120
+#: any.pm:1126
#, c-format
msgid "File already exists. Overwrite it?"
msgstr "Súbor už existuje. Prepísať?"
-#: any.pm:1124
+#: any.pm:1130
#, c-format
msgid "Permission denied"
msgstr "Prístup zamietnutý"
-#: any.pm:1172
+#: any.pm:1178
#, c-format
msgid "Bad NFS name"
msgstr "Nesprávne NFS meno"
-#: any.pm:1193
+#: any.pm:1199
#, c-format
msgid "Bad media %s"
msgstr "Zlý zdroj %s"
-#: any.pm:1236
+#: any.pm:1242
#, c-format
msgid "Can not make screenshots before partitioning"
msgstr "Nemôžem spraviť kópie obrazovky pred rozdelením disku"
-#: any.pm:1244
+#: any.pm:1250
#, c-format
msgid "Screenshots will be available after install in %s"
msgstr "Kópie obrazovky budú po inštalácii dostupné v %s"
@@ -276,11 +251,15 @@ msgid "Installation"
msgstr "Inštalujem"
#: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
#, c-format
msgid "Configuration"
msgstr "Konfigurácia"
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
#: install2.pm:168
#, c-format
msgid "You must also format %s"
@@ -305,22 +284,22 @@ msgstr "Spúšťam prácu so sieťou"
msgid "Bringing down the network"
msgstr "Ukončuje sa prácu so sieťou"
-#: media.pm:402
+#: media.pm:399
#, c-format
msgid "Please wait, retrieving file"
msgstr ""
-#: media.pm:734
+#: media.pm:718
#, c-format
-msgid "Downloading file %s..."
-msgstr "Sťahovanie súboru %s..."
+msgid "unable to add medium"
+msgstr ""
-#: media.pm:822
+#: media.pm:758
#, c-format
msgid "Copying some packages on disks for future use"
msgstr ""
-#: media.pm:875
+#: media.pm:811
#, c-format
msgid "Copying in progress"
msgstr "Prebieha kopírovanie"
@@ -362,27 +341,27 @@ msgstr ""
msgid "An error occurred:"
msgstr "Vyskytla sa chyba"
-#: pkgs.pm:776
+#: pkgs.pm:780
#, c-format
msgid "%d installation transactions failed"
msgstr "%d inštalačná transakcia zlyhala"
-#: pkgs.pm:777
+#: pkgs.pm:781
#, fuzzy, c-format
msgid "Installation of packages failed:"
msgstr "Inštaluje sa balík %s"
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
#, c-format
msgid "Workstation"
msgstr "Pracovná stanica"
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
#, c-format
msgid "Office Workstation"
msgstr "Kancelárska stanica"
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
#, c-format
msgid ""
"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -391,7 +370,7 @@ msgstr ""
"Kancelárske programy: editory (OpenOffice.org Writer, Kword), tabuľkové "
"procesory (OpenOffice.org Calc, Kspread), pdf prehliadače, atď"
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
#, c-format
msgid ""
"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -400,32 +379,32 @@ msgstr ""
"Kancelárske programy: editory (kword, abiword), tabuľkové procesory "
"(kspread, gnumeric), pdf prehliadače, atď"
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
#, c-format
msgid "Game station"
msgstr "Hracia stanica"
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
#, c-format
msgid "Amusement programs: arcade, boards, strategy, etc"
msgstr "Zábavne programy: stolové, stratégie, atď"
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
#, c-format
msgid "Multimedia station"
msgstr "Multimediálna stanica"
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
#, c-format
msgid "Sound and video playing/editing programs"
msgstr "Programy na prehrávanie/editovanie zvuku a videa"
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
#, c-format
msgid "Internet station"
msgstr "Internetová stanica"
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
#, c-format
msgid ""
"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -434,211 +413,193 @@ msgstr ""
"Nástroje na čítanie a posielanie emailov a news správ (mutt, tin..) a "
"prehliadanie www"
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
#, c-format
msgid "Network Computer (client)"
msgstr "Sieťovy počítač (klient)"
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
#, c-format
msgid "Clients for different protocols including ssh"
msgstr "Klientovia pre rôzne protokoly vrátane ssh"
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
#, c-format
msgid "Tools to ease the configuration of your computer"
msgstr "Nástroje na jednoduchú konfiguráciu vášho počítača"
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
#, c-format
msgid "Console Tools"
msgstr "Konzolové nástroje"
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
#, c-format
msgid "Editors, shells, file tools, terminals"
msgstr "Editory, shelly, súborové nástroje, terminály"
#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
#, c-format
msgid "Development"
msgstr "Vývojárska"
#: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
#, c-format
msgid "C and C++ development libraries, programs and include files"
msgstr "C a C++ vývojove knižnice, programy a include súbory"
#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
#, c-format
msgid "Documentation"
msgstr "Dokumentácia"
#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
#, c-format
msgid "Books and Howto's on Linux and Free Software"
msgstr "Knihy a návody pre Linux a iný voľný softvér"
#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
#, c-format
msgid "LSB"
msgstr "LSB"
#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
#, c-format
msgid "Linux Standard Base. Third party applications support"
msgstr "Linux Standard Base. Aplikačná podpora od tretej strany"
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
#, c-format
msgid "Web Server"
msgstr "Web server"
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
#, c-format
msgid "Apache"
msgstr "Apache"
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
#, c-format
msgid "Groupware"
msgstr "Groupware"
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
#, c-format
msgid "Kolab Server"
msgstr "Kolab server"
#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
#, c-format
msgid "Firewall/Router"
msgstr "Firewall/Router"
#: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
#, c-format
msgid "Internet gateway"
msgstr "Brána k Internetu"
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
#, c-format
msgid "Mail/News"
msgstr "Mail/News"
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
#, c-format
msgid "Postfix mail server, Inn news server"
msgstr "Postfix poštový systém, Inn news server"
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
#, c-format
msgid "Directory Server"
msgstr "Adresárový server"
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
#, c-format
msgid "FTP Server"
msgstr "FTP server"
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
#, c-format
msgid "ProFTPd"
msgstr "ProFTPd"
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
#, c-format
msgid "DNS/NIS"
msgstr "DNS/NIS"
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
#, c-format
msgid "Domain Name and Network Information Server"
msgstr "Server doménových mien a sieťový informačný server (NIS)"
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
#, c-format
msgid "File and Printer Sharing Server"
msgstr "Súborový a tlačový server"
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
#, c-format
msgid "NFS Server, Samba server"
msgstr "NFS server, Samba server"
#: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
#, c-format
msgid "Database"
msgstr "Databázy"
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
#, c-format
msgid "PostgreSQL and MySQL Database Server"
msgstr "Databázový server PostgreSQL a MySQL"
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
#, c-format
msgid "Web/FTP"
msgstr "Web/FTP"
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
#, c-format
msgid "Apache, Pro-ftpd"
msgstr "Apache a Pro-ftpd"
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
#, c-format
msgid "Mail"
msgstr "Mail"
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
#, c-format
msgid "Postfix mail server"
msgstr "Postfix mail server"
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
#, c-format
msgid "PostgreSQL or MySQL database server"
msgstr "PostgreSQL, alebo MySQL databázový server"
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
#, c-format
msgid "Network Computer server"
msgstr "Sieťový server"
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
#, c-format
msgid "NFS server, SMB server, Proxy server, ssh server"
msgstr "NFS server, SMB server, Proxy server, SSH server"
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
#, c-format
msgid "Graphical Environment"
msgstr "Grafické prostredie"
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
#, c-format
msgid "KDE Workstation"
msgstr "KDE pracovná stanica"
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
#, c-format
msgid ""
"The K Desktop Environment, the basic graphical environment with a collection "
@@ -646,19 +607,19 @@ msgid ""
msgstr ""
"K Desktop Enviroment, grafické prostredie s množstvom pribalených programov"
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
#, c-format
msgid "GNOME Workstation"
msgstr "GNOME pracovná stanica"
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
#, c-format
msgid ""
"A graphical environment with user-friendly set of applications and desktop "
"tools"
msgstr "Grafické rozhranie s aplikáciami a desktopovými nástrojmi"
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
#, fuzzy, c-format
msgid "LXDE Desktop"
msgstr "Pracovná plocha IceWm"
@@ -670,54 +631,52 @@ msgid ""
"applications and desktop tools"
msgstr "Grafické rozhranie s aplikáciami a desktopovými nástrojmi"
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
#, c-format
msgid "Other Graphical Desktops"
msgstr "Iné grafické prostredia"
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
#, c-format
msgid "Window Maker, Enlightenment, Fvwm, etc"
msgstr "Window Maker, Enlightenment, Fvwm, atď"
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
#, c-format
msgid "Utilities"
msgstr "Utility"
#: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
#, c-format
msgid "SSH Server"
msgstr "SSH server"
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
#, c-format
msgid "Webmin"
msgstr "Webmin"
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
#, c-format
msgid "Webmin Remote Configuration Server"
msgstr "Vzdialená konfigurácia servera pomocou Webmin"
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
#, c-format
msgid "Network Utilities/Monitoring"
msgstr "Sieťové utility/Monitoring"
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
#, c-format
msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
msgstr "Monitorovacie nástroje, účtovanie procesov, tcpdump, nmap, ..."
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
#, c-format
msgid "Mandriva Wizards"
msgstr "Sprievodcovia Mandriva"
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
#, c-format
msgid "Wizards to configure server"
msgstr "Sprievodcovia pre konfiguráciu servera"
@@ -816,17 +775,17 @@ msgstr ""
msgid "Click on images in order to see a bigger preview"
msgstr ""
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
#, c-format
msgid "Package Group Selection"
msgstr "Výber skupín balíkov"
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
#, c-format
msgid "Individual package selection"
msgstr "Osobitná voľba balíkov"
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
#, c-format
msgid "Total size: %d / %d MB"
msgstr "Celková veľkosť: %d / %d MB"
@@ -944,12 +903,12 @@ msgstr "Minimálna inštalácia"
msgid "Software Management"
msgstr "Správa softvéru"
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
#, c-format
msgid "Choose the packages you want to install"
msgstr "Zvoľte balíky, ktoré si želáte nainštalovať"
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
#, c-format
msgid "Installing"
msgstr "Inštalujem"
@@ -977,7 +936,7 @@ msgstr[0] "%d balíky"
msgstr[1] "%d balíky"
msgstr[2] "%d balíky"
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
#, c-format
msgid "Summary"
msgstr "Zhrnutie"
@@ -987,7 +946,7 @@ msgstr "Zhrnutie"
msgid "Configure"
msgstr "Konfigurovať"
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
#, c-format
msgid "not configured"
msgstr "nenakonfigurované"
@@ -997,7 +956,7 @@ msgstr "nenakonfigurované"
msgid "Media Selection"
msgstr "Výber skupín balíkov"
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
#, c-format
msgid ""
"The following installation media have been found.\n"
@@ -1006,7 +965,7 @@ msgstr ""
"Nasledovné inštalačné médiá boli nájdené.\n"
"Ak nechcete niektoré z nich použiť, odznačte ich teraz."
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
#, c-format
msgid ""
"You have the option to copy the contents of the CDs onto the hard drive "
@@ -1018,7 +977,7 @@ msgstr ""
"Potom bude inštalácia pokračovať z pevného disku a balíky budú dostupné aj "
"po kompletnej inštalácii."
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
#, c-format
msgid "Copy whole CDs"
msgstr "Kopírovať kompletné CD"
@@ -1038,59 +997,49 @@ msgstr "Prosím, zvoľte si typ vašej klávesnice"
msgid "Here is the full list of available keyboards:"
msgstr "Tu je úplný zoznam dostupných klávesníc"
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
#, c-format
msgid "Install/Upgrade"
msgstr "Inštalácia/Aktualizácia"
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
#, c-format
msgid "Is this an install or an upgrade?"
msgstr "Želáte si vykonať inštaláciu alebo aktualizáciu?"
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
#, fuzzy, c-format
msgid ""
"_: This is a noun:\n"
"Install"
msgstr "Inštalácia"
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
#, c-format
msgid "Upgrade %s"
msgstr "Aktualizácia %s"
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
#, c-format
msgid "Encryption key for %s"
msgstr "Kryptovací kľúč pre %s"
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
#, c-format
msgid "Cancel installation, reboot system"
msgstr ""
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
#, fuzzy, c-format
msgid "New Installation"
msgstr "Inštalujem"
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
#, c-format
msgid "Upgrade previous installation (not recommended)"
msgstr ""
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
#, c-format
msgid ""
"Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1102,17 +1051,17 @@ msgid ""
"Installation\"."
msgstr ""
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "IDE"
msgstr "IDE"
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "Configuring IDE"
msgstr "Konfigurácia IDE"
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
#, c-format
msgid ""
"No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1121,7 +1070,7 @@ msgstr ""
"Nie je dostatok miesta pre 1MB veľký bootstrap! Inštalácia môže pokračovať, "
"ale pre spustenie systému musíte vytvoriť oddiel pomocou DiskDrake"
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
#, c-format
msgid ""
"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1132,7 +1081,7 @@ msgstr ""
"pokračovať, ale pre spustenie systému musíte vytvoriť bootstrap oddiel "
"pomocou DiskDrake"
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
#, c-format
msgid ""
"Change your Cd-Rom!\n"
@@ -1146,19 +1095,19 @@ msgstr ""
"Ak takýto CD disk nemáte, zvoľte Zrušiť pre zrušenie inštalácie z tohoto CD-"
"ROM disku."
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
#, c-format
msgid "Looking for available packages..."
msgstr "Hľadajú sa dostupné balíky..."
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
#, c-format
msgid ""
"Your system does not have enough space left for installation or upgrade (%"
"dMB > %dMB)"
msgstr ""
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
#, c-format
msgid ""
"Please choose load or save package selection.\n"
@@ -1168,52 +1117,52 @@ msgstr ""
"Formát je rovnaký ako pre diskety generované automatickou\n"
"inštaláciou."
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Load"
msgstr "Zaťaženie"
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Save"
msgstr "Uložiť"
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
#, c-format
msgid "Bad file"
msgstr "Zlý súbor"
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
#, fuzzy, c-format
msgid "KDE"
msgstr "IDE"
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
#, c-format
msgid "GNOME"
msgstr "GNOME"
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
#, fuzzy, c-format
msgid "Desktop Selection"
msgstr "Výber skupín balíkov"
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
#, c-format
msgid "You can choose your workstation desktop profile."
msgstr ""
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
#, c-format
msgid "Selected size is larger than available space"
msgstr "Zvolená veľkosť je väčšia ako dostupné miesto"
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
#, c-format
msgid "Type of install"
msgstr "Typ inštalácie"
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
#, c-format
msgid ""
"You have not selected any group of packages.\n"
@@ -1222,83 +1171,83 @@ msgstr ""
"Nebola vybraná žiadna skupina balíkov\n"
"Prosím, zvoľte si typ minimálnej inštalácie, ktorú si želáte vykonať:"
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
#, c-format
msgid "With X"
msgstr "S X Window System"
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
#, c-format
msgid "With basic documentation (recommended!)"
msgstr "So základnou dokumentáciou (doporučené!)"
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
#, c-format
msgid "Truly minimal install (especially no urpmi)"
msgstr "Naozaj minimálna inštalácia (bez urpmi)"
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
#, c-format
msgid "Preparing installation"
msgstr "Pripravuje sa inštalácia"
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
#, c-format
msgid "Installing package %s"
msgstr "Inštaluje sa balík %s"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "There was an error ordering packages:"
msgstr "Chyba pri zoraďovaní zoznamu balíkov:"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "Go on anyway?"
msgstr "Napriek tomu pokračovať?"
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
#, c-format
msgid "Retry"
msgstr ""
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
#, c-format
msgid "Skip this package"
msgstr ""
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
#, c-format
msgid "Skip all packages from medium \"%s\""
msgstr ""
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
#, fuzzy, c-format
msgid "Go back to media and packages selection"
msgstr "Uložiť výber balíkov"
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
#, fuzzy, c-format
msgid "There was an error installing package %s."
msgstr "Počas inštalácie balíkov sa vyskytla chyba:"
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
#, c-format
msgid "Post-install configuration"
msgstr "Poinštalačná konfigurácia"
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
#, c-format
msgid "Please ensure the Update Modules media is in drive %s"
msgstr ""
"Presvečte sa prosím, že médium s aktualizovanými modulmi je v mechanike %s"
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
#, c-format
msgid "Updates"
msgstr "Aktualizácie"
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
#, c-format
msgid ""
"You now have the opportunity to download updated packages. These packages\n"
@@ -1319,28 +1268,28 @@ msgstr ""
"\n"
"Želáte si nainštalovať aktualizácie balíčkov?"
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
#, c-format
msgid "%s on %s"
msgstr "%s na %s"
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
#, c-format
msgid "Hardware"
msgstr "Hardvér"
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
#, c-format
msgid "Sound card"
msgstr "Zvuková karta"
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
#, c-format
msgid "Do you have an ISA sound card?"
msgstr "Máte nejakú ISA zvukovú kartu?"
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
#, c-format
msgid ""
"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1349,67 +1298,67 @@ msgstr ""
"Po inštalácii spustite \"alsaconf\" alebo \"sndconfig\" ak chcete nastaviť "
"zvukovú kartu"
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
#, c-format
msgid "No sound card detected. Try \"harddrake\" after installation"
msgstr "Zvuková karta nebola nájdená. Skúste \"harddrake\" po inštalácii"
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
#, c-format
msgid "Graphical interface"
msgstr "Grafické rozhranie"
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
#, c-format
msgid "Network & Internet"
msgstr "Sieť a Internet"
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
#, c-format
msgid "Proxies"
msgstr "Proxy"
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
#, c-format
msgid "configured"
msgstr "nakonfigurované"
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
#, c-format
msgid "Security Level"
msgstr "Úroveň bezpečnosti"
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
#, c-format
msgid "Firewall"
msgstr "Firewall"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "activated"
msgstr "aktivované"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "disabled"
msgstr "zakázané"
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
#, c-format
msgid "You have not configured X. Are you sure you really want this?"
msgstr "Nemáte nakonfigurovaný X Window systém. Ste si istí, že to tak chcete?"
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
#, c-format
msgid "Preparing bootloader..."
msgstr "Pripravuje sa zavádzač..."
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
#, c-format
msgid "Be patient, this may take a while..."
msgstr ""
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
#, c-format
msgid ""
"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1422,7 +1371,7 @@ msgstr ""
"BootX pre štartovanie vášho počítača. Argument pre jadro s umiestnením "
"koreňového súborového systému je: root=%s"
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
#, c-format
msgid ""
"In this security level, access to the files in the Windows partition is "
@@ -1431,17 +1380,17 @@ msgstr ""
"Vrámci tejto bezpečnostnej úrovne je prístup k súborom na Windows oblasti "
"umožnený iba pre administrátora."
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr "Vložte čistú disketu do mechaniky %s"
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
#, c-format
msgid "Creating auto install floppy..."
msgstr "Pripravuje sa autoinštalačná disketa..."
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
#, c-format
msgid ""
"Some steps are not completed.\n"
@@ -1452,7 +1401,7 @@ msgstr ""
"\n"
"Naozaj chcete teraz skončiť?"
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
#, c-format
msgid "Congratulations"
msgstr "Gratulujeme"
@@ -1596,6 +1545,9 @@ msgid ""
"Exit"
msgstr "Koniec"
+#~ msgid "Downloading file %s..."
+#~ msgstr "Sťahovanie súboru %s..."
+
#~ msgid ""
#~ "You have selected the following server(s): %s\n"
#~ "\n"
diff --git a/perl-install/install/share/po/sl.po b/perl-install/install/share/po/sl.po
index db4079515..2b11980ae 100644
--- a/perl-install/install/share/po/sl.po
+++ b/perl-install/install/share/po/sl.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: sl\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
"PO-Revision-Date: 2009-02-15 08:14+0100\n"
"Last-Translator: Jure Repinc <jlp@holodeck1.com>\n"
"Language-Team: Slovenian <lugos-slo@lugos.si>\n"
@@ -21,31 +21,6 @@ msgstr ""
"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || "
"n%100==4 ? 2 : 3);\n"
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr "Vaše namizje na USB ključku"
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr "100%% odprto-kodna distribucija Mandriva Linux"
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr "Z Mandriva One je odkrivanje Linuxa preprosto"
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr "Popolno namizje Mandriva Linux, s podporo"
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr "Mandriva: distribucije za potrebe vsakogar"
-
#: any.pm:109
#, c-format
msgid "Do you have further supplementary media?"
@@ -85,17 +60,17 @@ msgstr "Omrežje (FTP)"
msgid "Network (NFS)"
msgstr "Omrežje (NFS)"
-#: any.pm:163
+#: any.pm:165
#, c-format
msgid "URL of the mirror?"
msgstr "Lokacija zrcalnega strežnika?"
-#: any.pm:169
+#: any.pm:171
#, c-format
msgid "URL must start with ftp:// or http://"
msgstr "Lokacija se mora začeti z ftp:// ali s http://"
-#: any.pm:180
+#: any.pm:182
#, c-format
msgid ""
"Contacting Mandriva Linux web site to get the list of available mirrors..."
@@ -103,7 +78,7 @@ msgstr ""
"Vzpostavljanje povezave s spletno stranjo Mandriva Linux in pridobivanje "
"seznama dosegljivih zrcalnih strežnikov ..."
-#: any.pm:185
+#: any.pm:187
#, c-format
msgid ""
"Failed contacting Mandriva Linux web site to get the list of available "
@@ -112,47 +87,47 @@ msgstr ""
"Vzpostavljanje povezave s spletno stranjo Mandriva Linux in pridobivanje "
"seznama dosegljivih zrcalnih strežnikov nista uspela"
-#: any.pm:195
+#: any.pm:197
#, c-format
msgid "Choose a mirror from which to get the packages"
msgstr "Izberite zrcalni strežnik, s katerega želite pridobiti pakete"
-#: any.pm:225
+#: any.pm:227
#, c-format
msgid "NFS setup"
msgstr "Namestitev prek NFS"
-#: any.pm:226
+#: any.pm:228
#, c-format
msgid "Please enter the hostname and directory of your NFS media"
msgstr "Prosim, vnesite ime gostitelja in ime mape vašega vira NFS"
-#: any.pm:230
+#: any.pm:232
#, c-format
msgid "Hostname missing"
msgstr "Manjka ime gostitelja"
-#: any.pm:231
+#: any.pm:233
#, c-format
msgid "Directory must begin with \"/\""
msgstr "Mapa se mora pričeti z »/«"
-#: any.pm:235
+#: any.pm:237
#, c-format
msgid "Hostname of the NFS mount ?"
msgstr "Ime gostitelja vira NFS"
-#: any.pm:236
+#: any.pm:238
#, c-format
msgid "Directory"
msgstr "Mapa"
-#: any.pm:258
+#: any.pm:260
#, c-format
msgid "Supplementary"
msgstr "Dodatno"
-#: any.pm:293
+#: any.pm:295
#, c-format
msgid ""
"Can't find a package list file on this mirror. Make sure the location is "
@@ -161,22 +136,22 @@ msgstr ""
"Na tem zrcalnem strežniku ne najdem seznama paketov. Prepričajte se, da je "
"lokacija prava."
-#: any.pm:328
+#: any.pm:334
#, c-format
msgid "Looking at packages already installed..."
msgstr "Pregledovanje že nameščenih paketov ..."
-#: any.pm:362
+#: any.pm:368
#, c-format
msgid "Finding packages to upgrade..."
msgstr "Iskanje paketov za posodobitev ..."
-#: any.pm:381
+#: any.pm:387
#, c-format
msgid "Removing packages prior to upgrade..."
msgstr "Odstranjevanje paketov pred posodobitvijo ..."
-#: any.pm:402
+#: any.pm:408
#, c-format
msgid ""
"You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -197,18 +172,18 @@ msgstr ""
"zaženite računalnik in opravite posodobitev z uporabo programčka Mandriva "
"Update."
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
#, c-format
msgid "Reboot"
msgstr "Ponovni zagon"
-#: any.pm:407
+#: any.pm:413
#, c-format
msgid "Proceed"
msgstr "Nadaljuj"
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -222,72 +197,72 @@ msgstr ""
"\n"
"Ali naj odstranim navedene pakete?\n"
-#: any.pm:815
+#: any.pm:821
#, c-format
msgid "Error reading file %s"
msgstr "Napaka pri branju datoteke %s"
-#: any.pm:1022
+#: any.pm:1028
#, c-format
msgid "The following disk(s) were renamed:"
msgstr "Preimenovani so bili sledeči diski:"
-#: any.pm:1024
+#: any.pm:1030
#, c-format
msgid "%s (previously named as %s)"
msgstr "%s (prejšnje ime: %s)"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "HTTP"
msgstr "HTTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "FTP"
msgstr "FTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "NFS"
msgstr "NFS"
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
#, c-format
msgid "Network"
msgstr "Omrežje"
-#: any.pm:1104
+#: any.pm:1110
#, c-format
msgid "Please choose a media"
msgstr "Prosim, izberite vir"
-#: any.pm:1120
+#: any.pm:1126
#, c-format
msgid "File already exists. Overwrite it?"
msgstr "Datoteka že obstaja. Ali naj jo nadomestim?"
-#: any.pm:1124
+#: any.pm:1130
#, c-format
msgid "Permission denied"
msgstr "Nimate dovoljenja"
-#: any.pm:1172
+#: any.pm:1178
#, c-format
msgid "Bad NFS name"
msgstr "Napačno ime NFS"
-#: any.pm:1193
+#: any.pm:1199
#, c-format
msgid "Bad media %s"
msgstr "Neustrezen vir %s"
-#: any.pm:1236
+#: any.pm:1242
#, c-format
msgid "Can not make screenshots before partitioning"
msgstr "Posnetkov zaslona ni mogoče zajeti, dokler disk ni razdeljen"
-#: any.pm:1244
+#: any.pm:1250
#, c-format
msgid "Screenshots will be available after install in %s"
msgstr "Posnetki zaslona bodo po namestitvi v %s"
@@ -298,11 +273,15 @@ msgid "Installation"
msgstr "Nameščanje"
#: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
#, c-format
msgid "Configuration"
msgstr "Nastavitev"
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
#: install2.pm:168
#, c-format
msgid "You must also format %s"
@@ -328,22 +307,22 @@ msgstr "Vklapljanje omrežja"
msgid "Bringing down the network"
msgstr "Izklapljanje omrežja"
-#: media.pm:402
+#: media.pm:399
#, c-format
msgid "Please wait, retrieving file"
msgstr "Prosimo počakajte, pridobivanje datoteke ..."
-#: media.pm:734
+#: media.pm:718
#, c-format
-msgid "Downloading file %s..."
-msgstr "Prenos datoteke %s ..."
+msgid "unable to add medium"
+msgstr ""
-#: media.pm:822
+#: media.pm:758
#, c-format
msgid "Copying some packages on disks for future use"
msgstr "Kopiranje nekaterih paketov na disk, za kasnejšo uporabo"
-#: media.pm:875
+#: media.pm:811
#, c-format
msgid "Copying in progress"
msgstr "Kopiranje poteka"
@@ -387,27 +366,27 @@ msgstr ""
msgid "An error occurred:"
msgstr "Prišlo je do napake"
-#: pkgs.pm:776
+#: pkgs.pm:780
#, c-format
msgid "%d installation transactions failed"
msgstr "%d namestitvenih transakcij je spodletelo"
-#: pkgs.pm:777
+#: pkgs.pm:781
#, fuzzy, c-format
msgid "Installation of packages failed:"
msgstr "Nameščanje paketa %s"
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
#, c-format
msgid "Workstation"
msgstr "Delovna postaja"
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
#, c-format
msgid "Office Workstation"
msgstr "Pisarniška delovna postaja"
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
#, c-format
msgid ""
"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -416,7 +395,7 @@ msgstr ""
"Pisarniški programi: urejanje besedila (OpenOffice.org Writer, KWord), "
"preglednice (OpenOffice.org Calc, KSpread), pregledovalniki PDF, itd"
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
#, c-format
msgid ""
"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -425,32 +404,32 @@ msgstr ""
"Pisarniški programi: urejanje besedila (KWord, AbiWord), preglednice "
"(KSpread, Gnumeric), pregledovalniki PDF, itd"
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
#, c-format
msgid "Game station"
msgstr "Igralna postaja"
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
#, c-format
msgid "Amusement programs: arcade, boards, strategy, etc"
msgstr "Programi za zabavo: arkade, deske, strategije, itd"
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
#, c-format
msgid "Multimedia station"
msgstr "Večpredstavnostna postaja"
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
#, c-format
msgid "Sound and video playing/editing programs"
msgstr "Programi za predvajanje in urejanje zvoka in videa"
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
#, c-format
msgid "Internet station"
msgstr "Internetna postaja"
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
#, c-format
msgid ""
"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -459,230 +438,212 @@ msgstr ""
"Zbirka orodij za branje in pošiljanje pošte in pošiljanje v novičarske "
"skupine (mutt, tin ...) ter brskanje po spletu"
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
#, c-format
msgid "Network Computer (client)"
msgstr "Omrežni računalnik (odjemalec)"
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
#, c-format
msgid "Clients for different protocols including ssh"
msgstr "Odjemalci za različne protokole, vključujoč SSH"
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
#, c-format
msgid "Tools to ease the configuration of your computer"
msgstr "Orodja za lažjo nastavitev računalnika"
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
#, c-format
msgid "Console Tools"
msgstr "Konzolna orodja"
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
#, c-format
msgid "Editors, shells, file tools, terminals"
msgstr "Urejevalniki, lupine, datotečna orodja, terminali"
#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
#, c-format
msgid "Development"
msgstr "Razvoj"
#: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
#, c-format
msgid "C and C++ development libraries, programs and include files"
msgstr "Razvojne knjižnice, programi in zaglavne datoteke za C in C++"
#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
#, c-format
msgid "Documentation"
msgstr "Dokumentacija"
#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
#, c-format
msgid "Books and Howto's on Linux and Free Software"
msgstr "Knjige in priročniki o Linuxu in prostem programju"
#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
#, c-format
msgid "LSB"
msgstr "LSB"
#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
#, c-format
msgid "Linux Standard Base. Third party applications support"
msgstr "Standardna osnova Linuxa (LSB). Podpora programom tretjih oseb"
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
#, c-format
msgid "Web Server"
msgstr "Spletni strežnik"
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
#, c-format
msgid "Apache"
msgstr "Apache"
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
#, c-format
msgid "Groupware"
msgstr "Skupinsko delo"
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
#, c-format
msgid "Kolab Server"
msgstr "Strežnik Kolab"
#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
#, c-format
msgid "Firewall/Router"
msgstr "Požarni zid/usmerjevalnik"
#: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
#, c-format
msgid "Internet gateway"
msgstr "Internetni prehod (gateway)"
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
#, c-format
msgid "Mail/News"
msgstr "Pošta/novičarske skupine"
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
#, c-format
msgid "Postfix mail server, Inn news server"
msgstr "Poštni strežnik postfix in novičarski strežnik Inn"
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
#, c-format
msgid "Directory Server"
msgstr "Imeniški strežnik"
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
#, c-format
msgid "FTP Server"
msgstr "Strežnik FTP"
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
#, c-format
msgid "ProFTPd"
msgstr "ProFTPd"
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
#, c-format
msgid "DNS/NIS"
msgstr "DNS/NIS"
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
#, c-format
msgid "Domain Name and Network Information Server"
msgstr "Strežnik imen domen in omrežnih podatkov"
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
#, c-format
msgid "File and Printer Sharing Server"
msgstr "Strežnik za souporabo datotek in tiskalnikov"
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
#, c-format
msgid "NFS Server, Samba server"
msgstr "Strežnik NFS, strežnik Samba"
#: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
#, c-format
msgid "Database"
msgstr "Podatkovna zbirka"
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
#, c-format
msgid "PostgreSQL and MySQL Database Server"
msgstr "Strežnik podatkovnih baz PostgreSQL in MySQL"
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
#, c-format
msgid "Web/FTP"
msgstr "Splet/FTP"
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
#, c-format
msgid "Apache, Pro-ftpd"
msgstr "Apache, Pro-ftpd"
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
#, c-format
msgid "Mail"
msgstr "Pošta"
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
#, c-format
msgid "Postfix mail server"
msgstr "Poštni strežnik Postfix"
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
#, c-format
msgid "PostgreSQL or MySQL database server"
msgstr "Strežnik podatkovnih baz PostgreSQL ali MySQL"
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
#, c-format
msgid "Network Computer server"
msgstr "Omrežni računalnik (strežnik)"
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
#, c-format
msgid "NFS server, SMB server, Proxy server, ssh server"
msgstr "Strežnik NFS, strežnik SMB, posredniški strežnik, strežnik SSH"
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
#, c-format
msgid "Graphical Environment"
msgstr "Grafično okolje"
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
#, c-format
msgid "KDE Workstation"
msgstr "Delovna postaja KDE"
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
#, c-format
msgid ""
"The K Desktop Environment, the basic graphical environment with a collection "
"of accompanying tools"
msgstr "Namizno okolje KDE, osnovno okolje z zbirko pripadajočih orodij"
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
#, c-format
msgid "GNOME Workstation"
msgstr "Delovna postaja GNOME"
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
#, c-format
msgid ""
"A graphical environment with user-friendly set of applications and desktop "
"tools"
msgstr "Grafično okolje z naborom programov in namiznimi orodji"
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
#, c-format
msgid "LXDE Desktop"
msgstr "Namizje LXDE"
@@ -694,54 +655,52 @@ msgid ""
"applications and desktop tools"
msgstr "Grafično okolje z naborom programov in namiznimi orodji"
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
#, c-format
msgid "Other Graphical Desktops"
msgstr "Druga grafična namizja"
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
#, c-format
msgid "Window Maker, Enlightenment, Fvwm, etc"
msgstr "Window Maker, Enlightenment, FVWM ..."
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
#, c-format
msgid "Utilities"
msgstr "Pripomočki"
#: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
#, c-format
msgid "SSH Server"
msgstr "Strežnik SSH"
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
#, c-format
msgid "Webmin"
msgstr "Webmin"
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
#, c-format
msgid "Webmin Remote Configuration Server"
msgstr "Strežnik Webmin za oddaljeno nastavljanje"
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
#, c-format
msgid "Network Utilities/Monitoring"
msgstr "Omrežni pripomočki/nadzorovanje"
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
#, c-format
msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
msgstr "Nadzorna orodja, knjigovodstvo procesov, tcpdump, nmap ..."
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
#, c-format
msgid "Mandriva Wizards"
msgstr "Mandrivini čarovniki"
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
#, c-format
msgid "Wizards to configure server"
msgstr "Čarovniki za nastavitev strežnikov"
@@ -841,17 +800,17 @@ msgstr "To je ogled namizja »%s«."
msgid "Click on images in order to see a bigger preview"
msgstr "Kliknite na sliko, da vidite večji ogled"
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
#, c-format
msgid "Package Group Selection"
msgstr "Izbira skupin paketov"
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
#, c-format
msgid "Individual package selection"
msgstr "Izbira posamičnih paketov"
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
#, c-format
msgid "Total size: %d / %d MB"
msgstr "Skupna velikost: %d / %d MiB"
@@ -970,12 +929,12 @@ msgstr "Minimalna namestitev"
msgid "Software Management"
msgstr "Upravljanje s programi"
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
#, c-format
msgid "Choose the packages you want to install"
msgstr "Izberite pakete, ki jih želite namestiti"
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
#, c-format
msgid "Installing"
msgstr "Nameščanje"
@@ -1004,7 +963,7 @@ msgstr[1] "%d paketa"
msgstr[2] "%d paketi"
msgstr[3] "%d paketov"
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
#, c-format
msgid "Summary"
msgstr "Povzetek"
@@ -1014,7 +973,7 @@ msgstr "Povzetek"
msgid "Configure"
msgstr "Nastavitev"
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
#, c-format
msgid "not configured"
msgstr "ni nastavljeno"
@@ -1024,7 +983,7 @@ msgstr "ni nastavljeno"
msgid "Media Selection"
msgstr "Izbira virov"
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
#, c-format
msgid ""
"The following installation media have been found.\n"
@@ -1033,7 +992,7 @@ msgstr ""
"Na voljo so naslednji viri za namestitev.\n"
"Če želite katerega izmed njih izločiti, to lahko storite sedaj."
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
#, c-format
msgid ""
"You have the option to copy the contents of the CDs onto the hard drive "
@@ -1046,7 +1005,7 @@ msgstr ""
"V tem primeru bo namestitev potekala s trdega diska, paketi pa bodo ostali "
"na voljo tudi po zaključeni namestitvi."
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
#, c-format
msgid "Copy whole CDs"
msgstr "Prekopiraj vsebino nosilcev"
@@ -1066,59 +1025,49 @@ msgstr "Izberite razpored tipkovnice"
msgid "Here is the full list of available keyboards:"
msgstr "Tu je celoten seznam razpoložljivih tipkovnic:"
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
#, c-format
msgid "Install/Upgrade"
msgstr "Namestitev/posodobitev"
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
#, c-format
msgid "Is this an install or an upgrade?"
msgstr "Želite izvesti novo namestitev ali posodobiti nameščeni sistem?"
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
#, c-format
msgid ""
"_: This is a noun:\n"
"Install"
msgstr "Namestitev"
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
#, c-format
msgid "Upgrade %s"
msgstr "Posodobitev %s"
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr "Posodobitev z 32-bitnega na 64-bitni sistem ni podprta"
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr "Posodobitev s 64-bitnega na 32-bitni sistem ni podprta"
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
#, c-format
msgid "Encryption key for %s"
msgstr "Šifrirni ključ za %s"
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
#, c-format
msgid "Cancel installation, reboot system"
msgstr "Prekliči namestitev, znova zaženi računalnik"
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
#, c-format
msgid "New Installation"
msgstr "Nova namestitev"
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
#, c-format
msgid "Upgrade previous installation (not recommended)"
msgstr "Nadgradite obstoječo namestitev (ni priporočeno)"
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
#, c-format
msgid ""
"Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1137,17 +1086,17 @@ msgstr ""
"Opozorilo: Pred nadaljevanjem z novo namestitvijo napravite\n"
"varnostno kopijo vseh osebnih podatkov."
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "IDE"
msgstr "IDE"
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "Configuring IDE"
msgstr "Nastavljanje IDE"
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
#, c-format
msgid ""
"No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1157,7 +1106,7 @@ msgstr ""
"nadaljevala, vendar morate, da bi sistem po namestitvi lahko zagnali, s "
"pomočjo orodja DiskDrake ustvariti razdelek za začetno nalaganje."
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
#, c-format
msgid ""
"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1168,7 +1117,7 @@ msgstr ""
"nadaljevala, vendar boste morali za zagon sistema s pomočjo DiskDrake "
"ustvariti razdelek za začetno nalaganje."
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
#, c-format
msgid ""
"Change your Cd-Rom!\n"
@@ -1182,12 +1131,12 @@ msgstr ""
"Če zahtevanega nosilca nimate, kliknite Prekliči, da ga bo namestitev "
"preskočila."
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
#, c-format
msgid "Looking for available packages..."
msgstr "Iskanje razpoložljivih paketov ..."
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
#, c-format
msgid ""
"Your system does not have enough space left for installation or upgrade (%"
@@ -1195,7 +1144,7 @@ msgid ""
msgstr ""
"Sistem nima dovolj prostora za namestitev ali nadgradnjo (%d MiB > %d MiB)"
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
#, c-format
msgid ""
"Please choose load or save package selection.\n"
@@ -1204,52 +1153,52 @@ msgstr ""
"Prosim, izberite nalaganje ali shranjevanje izbora paketov.\n"
"Format je enak datotekam za samodejno namestitev."
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Load"
msgstr "Naloži"
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Save"
msgstr "Shrani"
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
#, c-format
msgid "Bad file"
msgstr "Neustrezna datoteka"
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
#, c-format
msgid "KDE"
msgstr "KDE"
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
#, c-format
msgid "GNOME"
msgstr "GNOME"
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
#, c-format
msgid "Desktop Selection"
msgstr "Izbira namizja"
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
#, c-format
msgid "You can choose your workstation desktop profile."
msgstr "Tu lahko izberete namizno okolje, ki bo nameščeno."
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
#, c-format
msgid "Selected size is larger than available space"
msgstr "Velikost izbora presega prostor, ki je na razpolago."
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
#, c-format
msgid "Type of install"
msgstr "Vrsta namestitve"
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
#, c-format
msgid ""
"You have not selected any group of packages.\n"
@@ -1258,82 +1207,82 @@ msgstr ""
"Izbrali niste nobene skupine paketov.\n"
"Izbrati morate vsaj minimalno namestitev:"
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
#, c-format
msgid "With X"
msgstr "Z grafičnim okoljem"
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
#, c-format
msgid "With basic documentation (recommended!)"
msgstr "Z osnovno dokumentacijo (priporočeno!)"
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
#, c-format
msgid "Truly minimal install (especially no urpmi)"
msgstr "Zares najmanjša možna namestitev (še posebej brez urpmi)"
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
#, c-format
msgid "Preparing installation"
msgstr "Pripravljanje namestitve"
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
#, c-format
msgid "Installing package %s"
msgstr "Nameščanje paketa %s"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "There was an error ordering packages:"
msgstr "Med razvrščanjem paketov je prišlo do napake:"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "Go on anyway?"
msgstr "Ali naj kljub temu nadaljujem?"
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
#, c-format
msgid "Retry"
msgstr "Poskusi znova"
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
#, c-format
msgid "Skip this package"
msgstr "Spusti ta paket"
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
#, c-format
msgid "Skip all packages from medium \"%s\""
msgstr "Spusti vse pakete z nosilca »%s«"
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
#, c-format
msgid "Go back to media and packages selection"
msgstr "Nazaj na izbiro nosilcev in paketov"
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
#, c-format
msgid "There was an error installing package %s."
msgstr "Prišlo je do napake med nameščanjem paketa %s."
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
#, c-format
msgid "Post-install configuration"
msgstr "Nastavitev po namestitvi"
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
#, c-format
msgid "Please ensure the Update Modules media is in drive %s"
msgstr "Prepričajte se, da je nosilec »Posodobitev modulov« v pogonu %s"
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
#, c-format
msgid "Updates"
msgstr "Posodobitve"
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
#, c-format
msgid ""
"You now have the opportunity to download updated packages. These packages\n"
@@ -1353,28 +1302,28 @@ msgstr ""
"\n"
"Ali želite namestiti posodobitve?"
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
#, c-format
msgid "%s on %s"
msgstr "%s na %s"
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
#, c-format
msgid "Hardware"
msgstr "Strojna oprema"
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
#, c-format
msgid "Sound card"
msgstr "Zvočna kartica"
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
#, c-format
msgid "Do you have an ISA sound card?"
msgstr "Ali imate zvočno kartico na ISA vodilu?"
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
#, c-format
msgid ""
"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1382,69 +1331,69 @@ msgid ""
msgstr ""
"Za nastavitev zvočne kartice po namestitvi zaženite »alsaconf« ali »sndconfig«."
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
#, c-format
msgid "No sound card detected. Try \"harddrake\" after installation"
msgstr ""
"Ne zaznam zvočne kartice. Po namestitvi jo poskusite nastaviti s pomočjo "
"»harddrake«."
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
#, c-format
msgid "Graphical interface"
msgstr "Grafična kartica"
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
#, c-format
msgid "Network & Internet"
msgstr "Omrežje in internet"
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
#, c-format
msgid "Proxies"
msgstr "Posredniški strežniki"
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
#, c-format
msgid "configured"
msgstr "nastavljeno"
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
#, c-format
msgid "Security Level"
msgstr "Raven varnosti"
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
#, c-format
msgid "Firewall"
msgstr "Požarni zid"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "activated"
msgstr "aktivirano"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "disabled"
msgstr "onemogočeno"
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
#, c-format
msgid "You have not configured X. Are you sure you really want this?"
msgstr "Niste nastavili grafičnega strežnika. Ali to zares želite?"
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
#, c-format
msgid "Preparing bootloader..."
msgstr "Pripravljanje zagonskega nalagalnika ..."
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
#, c-format
msgid "Be patient, this may take a while..."
msgstr "Prosimo potrpite, to lahko traja dlje časa ..."
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
#, c-format
msgid ""
"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1457,7 +1406,7 @@ msgstr ""
"računalnik zagnati s pomočjo BootX ali na drug način. Nastavitev jedra za "
"korenski datotečni sistem je: root=%s"
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
#, c-format
msgid ""
"In this security level, access to the files in the Windows partition is "
@@ -1466,17 +1415,17 @@ msgstr ""
"Na tej varnostni stopnji je dostop do datotek na razdelku za Windows "
"dovoljen samo skrbniku sistema (root)."
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr "Vstavite prazno disketo v pogon %s"
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
#, c-format
msgid "Creating auto install floppy..."
msgstr "Ustvarjanje diskete za samodejno namestitev ..."
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
#, c-format
msgid ""
"Some steps are not completed.\n"
@@ -1487,7 +1436,7 @@ msgstr ""
"\n"
"Ali res želite končati?"
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
#, c-format
msgid "Congratulations"
msgstr "Čestitke"
@@ -1631,6 +1580,30 @@ msgid ""
"Exit"
msgstr "Izhod"
+#~ msgid "Your desktop on a USB key"
+#~ msgstr "Vaše namizje na USB ključku"
+
+#~ msgid "The 100%% open source Mandriva Linux distribution"
+#~ msgstr "100%% odprto-kodna distribucija Mandriva Linux"
+
+#~ msgid "Explore Linux easily with Mandriva One"
+#~ msgstr "Z Mandriva One je odkrivanje Linuxa preprosto"
+
+#~ msgid "A full Mandriva Linux desktop, with support"
+#~ msgstr "Popolno namizje Mandriva Linux, s podporo"
+
+#~ msgid "Mandriva: distributions for everybody's needs"
+#~ msgstr "Mandriva: distribucije za potrebe vsakogar"
+
+#~ msgid "Downloading file %s..."
+#~ msgstr "Prenos datoteke %s ..."
+
+#~ msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
+#~ msgstr "Posodobitev z 32-bitnega na 64-bitni sistem ni podprta"
+
+#~ msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
+#~ msgstr "Posodobitev s 64-bitnega na 32-bitni sistem ni podprta"
+
#~ msgid ""
#~ "You have selected the following server(s): %s\n"
#~ "\n"
diff --git a/perl-install/install/share/po/sq.po b/perl-install/install/share/po/sq.po
index d4a43bf0b..bb0ad40db 100644
--- a/perl-install/install/share/po/sq.po
+++ b/perl-install/install/share/po/sq.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: DrakX for MDK 9.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
"PO-Revision-Date: 2004-09-15 13:33+0200\n"
"Last-Translator: Naim Daka <naim70@freesurf.ch>\n"
"Language-Team: Albanian <LL@li.org>\n"
@@ -16,31 +16,6 @@ msgstr ""
"Content-Transfer-Encoding: 8-bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr ""
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr ""
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr ""
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr ""
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr ""
-
#: any.pm:109
#, fuzzy, c-format
msgid "Do you have further supplementary media?"
@@ -76,24 +51,24 @@ msgstr "Rrjeti %s"
msgid "Network (NFS)"
msgstr ""
-#: any.pm:163
+#: any.pm:165
#, c-format
msgid "URL of the mirror?"
msgstr ""
-#: any.pm:169
+#: any.pm:171
#, c-format
msgid "URL must start with ftp:// or http://"
msgstr ""
-#: any.pm:180
+#: any.pm:182
#, c-format
msgid ""
"Contacting Mandriva Linux web site to get the list of available mirrors..."
msgstr ""
"Lidhje në sitin Mandriva Linux për të pranuar listën e lirë të pasqyreve..."
-#: any.pm:185
+#: any.pm:187
#, fuzzy, c-format
msgid ""
"Failed contacting Mandriva Linux web site to get the list of available "
@@ -101,69 +76,69 @@ msgid ""
msgstr ""
"Lidhje në sitin Mandriva Linux për të pranuar listën e lirë të pasqyreve..."
-#: any.pm:195
+#: any.pm:197
#, c-format
msgid "Choose a mirror from which to get the packages"
msgstr "Zgjedheni një pasqyre nga e cila do ti transferoni pakot"
-#: any.pm:225
+#: any.pm:227
#, c-format
msgid "NFS setup"
msgstr ""
-#: any.pm:226
+#: any.pm:228
#, c-format
msgid "Please enter the hostname and directory of your NFS media"
msgstr ""
-#: any.pm:230
+#: any.pm:232
#, c-format
msgid "Hostname missing"
msgstr ""
-#: any.pm:231
+#: any.pm:233
#, c-format
msgid "Directory must begin with \"/\""
msgstr ""
-#: any.pm:235
+#: any.pm:237
#, c-format
msgid "Hostname of the NFS mount ?"
msgstr ""
-#: any.pm:236
+#: any.pm:238
#, c-format
msgid "Directory"
msgstr "Repertori"
-#: any.pm:258
+#: any.pm:260
#, c-format
msgid "Supplementary"
msgstr ""
-#: any.pm:293
+#: any.pm:295
#, fuzzy, c-format
msgid ""
"Can't find a package list file on this mirror. Make sure the location is "
"correct."
msgstr "Nuk mund ta gjejë %s në %s"
-#: any.pm:328
+#: any.pm:334
#, c-format
msgid "Looking at packages already installed..."
msgstr "Kërkimi i pakove veqse të instaluara..."
-#: any.pm:362
+#: any.pm:368
#, c-format
msgid "Finding packages to upgrade..."
msgstr "Gjetja pakove azhurnuese..."
-#: any.pm:381
+#: any.pm:387
#, c-format
msgid "Removing packages prior to upgrade..."
msgstr ""
-#: any.pm:402
+#: any.pm:408
#, c-format
msgid ""
"You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -175,18 +150,18 @@ msgid ""
"please reboot your system and upgrade using the Mandriva update applet."
msgstr ""
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
#, c-format
msgid "Reboot"
msgstr "Rinise (riboot)"
-#: any.pm:407
+#: any.pm:413
#, c-format
msgid "Proceed"
msgstr ""
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -199,72 +174,72 @@ msgstr ""
"\n"
"Me të vërtetë dëshironi ti zhdukni?\n"
-#: any.pm:815
+#: any.pm:821
#, c-format
msgid "Error reading file %s"
msgstr "Gabim gjatë leximit të skedares %s"
-#: any.pm:1022
+#: any.pm:1028
#, fuzzy, c-format
msgid "The following disk(s) were renamed:"
msgstr "Pakot e radhitura duhet të instalohen:\n"
-#: any.pm:1024
+#: any.pm:1030
#, c-format
msgid "%s (previously named as %s)"
msgstr ""
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "HTTP"
msgstr "HTTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "FTP"
msgstr "FTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "NFS"
msgstr "NFS"
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
#, c-format
msgid "Network"
msgstr "Rrjeti"
-#: any.pm:1104
+#: any.pm:1110
#, fuzzy, c-format
msgid "Please choose a media"
msgstr "Ju lutemi zgjedheni"
-#: any.pm:1120
+#: any.pm:1126
#, fuzzy, c-format
msgid "File already exists. Overwrite it?"
msgstr "Skedarje është veqse prezente. Përdoreni atë?"
-#: any.pm:1124
+#: any.pm:1130
#, c-format
msgid "Permission denied"
msgstr "Autorizim i pa pranuar"
-#: any.pm:1172
+#: any.pm:1178
#, c-format
msgid "Bad NFS name"
msgstr ""
-#: any.pm:1193
+#: any.pm:1199
#, fuzzy, c-format
msgid "Bad media %s"
msgstr "shtuarja e burimit %s"
-#: any.pm:1236
+#: any.pm:1242
#, c-format
msgid "Can not make screenshots before partitioning"
msgstr "E pa mundur grabitja e ekranit (screenshots) para ndarjeve"
-#: any.pm:1244
+#: any.pm:1250
#, c-format
msgid "Screenshots will be available after install in %s"
msgstr ""
@@ -276,11 +251,15 @@ msgid "Installation"
msgstr "Instalimi"
#: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
#, c-format
msgid "Configuration"
msgstr "Konfigurimi"
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
#: install2.pm:168
#, c-format
msgid "You must also format %s"
@@ -306,22 +285,22 @@ msgstr "Nisja e rrjetit (network)"
msgid "Bringing down the network"
msgstr "Ndalja e rrjetit (network)"
-#: media.pm:402
+#: media.pm:399
#, c-format
msgid "Please wait, retrieving file"
msgstr ""
-#: media.pm:734
-#, fuzzy, c-format
-msgid "Downloading file %s..."
-msgstr "Dërgimi i skedareve..."
+#: media.pm:718
+#, c-format
+msgid "unable to add medium"
+msgstr ""
-#: media.pm:822
+#: media.pm:758
#, c-format
msgid "Copying some packages on disks for future use"
msgstr ""
-#: media.pm:875
+#: media.pm:811
#, fuzzy, c-format
msgid "Copying in progress"
msgstr "Zbulimi në vazhdim e sipër"
@@ -363,27 +342,27 @@ msgstr ""
msgid "An error occurred:"
msgstr "Një gabim është paraqitur"
-#: pkgs.pm:776
+#: pkgs.pm:780
#, c-format
msgid "%d installation transactions failed"
msgstr "Instalimi i transmetimit të %d dështio"
-#: pkgs.pm:777
+#: pkgs.pm:781
#, fuzzy, c-format
msgid "Installation of packages failed:"
msgstr "Instalimi i pakove %s"
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
#, c-format
msgid "Workstation"
msgstr "Stacion punues"
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
#, c-format
msgid "Office Workstation"
msgstr "Stacioni Punues në Tryezë"
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
#, c-format
msgid ""
"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -392,7 +371,7 @@ msgstr ""
"Programe për tryezë: trajtues të teksteve (OpenOffice.org Writer, Kword), "
"tablues (OpenOffice.org Calc, Kspread), çfaqës pdf, etj."
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
#, c-format
msgid ""
"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -401,32 +380,32 @@ msgstr ""
"Programe për tryezë: trajtues të teksteve (kword, abiword), tablues "
"(kspread, gnumeric), çfaqës pdf, etj."
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
#, c-format
msgid "Game station"
msgstr "Stacion Lojërash"
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
#, c-format
msgid "Amusement programs: arcade, boards, strategy, etc"
msgstr "Programe ahengi: lojë arkade, lojë me stenda, strategji, etj"
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
#, c-format
msgid "Multimedia station"
msgstr "Stacion Multimedia"
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
#, c-format
msgid "Sound and video playing/editing programs"
msgstr "Programe për lojëra/botime të zërit dhe videos"
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
#, c-format
msgid "Internet station"
msgstr "Stacion Interneti"
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
#, fuzzy, c-format
msgid ""
"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -435,211 +414,193 @@ msgstr ""
"Përgjithësia a veglave të leximit, dërgimit të letrave elektronike të "
"lajmeve (pine, mutt, tin...) dhe për të lundruar në internet."
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
#, c-format
msgid "Network Computer (client)"
msgstr "Kompjuter Rrjeti (klient)"
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
#, c-format
msgid "Clients for different protocols including ssh"
msgstr "Klient për protokole të ndryshme me përfshirje në ssh"
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
#, c-format
msgid "Tools to ease the configuration of your computer"
msgstr "Vegla për të konfiguruar kompjuterin tuaj"
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
#, c-format
msgid "Console Tools"
msgstr "Vegla në konsolë"
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
#, c-format
msgid "Editors, shells, file tools, terminals"
msgstr "Botues, interpretues, vegla skedaresh, terminale"
#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
#, c-format
msgid "Development"
msgstr "Zhvillimi"
#: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
#, c-format
msgid "C and C++ development libraries, programs and include files"
msgstr "Bibloteka ndërtuese e C dhe C++, programe dhe skedare me përfshirje"
#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
#, c-format
msgid "Documentation"
msgstr "Dokumentacioni"
#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
#, c-format
msgid "Books and Howto's on Linux and Free Software"
msgstr "Libra dhe Howto's për Linux dhe Softver gratis"
#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
#, c-format
msgid "LSB"
msgstr "LSB"
#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
#, c-format
msgid "Linux Standard Base. Third party applications support"
msgstr "Bazë Standarde e Linux. Përkrahë aplikacione të pjesës së tretë"
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
#, c-format
msgid "Web Server"
msgstr "Server Web"
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
#, c-format
msgid "Apache"
msgstr "Apache"
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
#, fuzzy, c-format
msgid "Groupware"
msgstr "Grupi"
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
#, c-format
msgid "Kolab Server"
msgstr "Server Kolab"
#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
#, c-format
msgid "Firewall/Router"
msgstr "Murë-i-Zjarrtë/Router"
#: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
#, c-format
msgid "Internet gateway"
msgstr "Portë kaluese Interneti"
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
#, fuzzy, c-format
msgid "Mail/News"
msgstr "/Skedare/_E Re"
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
#, fuzzy, c-format
msgid "Postfix mail server, Inn news server"
msgstr "Server i letrave (mail) Postfix"
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
#, fuzzy, c-format
msgid "Directory Server"
msgstr "Riparoje Nga CD"
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
#, c-format
msgid "FTP Server"
msgstr "Server FTP"
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
#, c-format
msgid "ProFTPd"
msgstr ""
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
#, c-format
msgid "DNS/NIS"
msgstr "DNS/NIS"
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
#, c-format
msgid "Domain Name and Network Information Server"
msgstr "Server i Emrit (DNS) dhe Server i Informacionit (NIS)"
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
#, fuzzy, c-format
msgid "File and Printer Sharing Server"
msgstr "Server Stampues"
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
#, fuzzy, c-format
msgid "NFS Server, Samba server"
msgstr "Server Samba"
#: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
#, c-format
msgid "Database"
msgstr "Bazë e të dhënave"
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
#, fuzzy, c-format
msgid "PostgreSQL and MySQL Database Server"
msgstr "Server PostgreSQL apo MySQL i bazës së të dhënave"
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
#, c-format
msgid "Web/FTP"
msgstr "Web/FTP"
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
#, c-format
msgid "Apache, Pro-ftpd"
msgstr "Apache, Pro-ftpd"
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
#, c-format
msgid "Mail"
msgstr "Mail"
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
#, c-format
msgid "Postfix mail server"
msgstr "Server i letrave (mail) Postfix"
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
#, c-format
msgid "PostgreSQL or MySQL database server"
msgstr "Server PostgreSQL apo MySQL i bazës së të dhënave"
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
#, c-format
msgid "Network Computer server"
msgstr "Server Kompjuter Rrjeti"
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
#, c-format
msgid "NFS server, SMB server, Proxy server, ssh server"
msgstr "Server NFS, server SMB, server Proxy, server ssh"
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
#, c-format
msgid "Graphical Environment"
msgstr "Mjedis Grafikë"
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
#, c-format
msgid "KDE Workstation"
msgstr "Stacioni punues KDE"
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
#, c-format
msgid ""
"The K Desktop Environment, the basic graphical environment with a collection "
@@ -647,12 +608,12 @@ msgid ""
msgstr ""
"Mjedisi i Tryezës K, dhe grafiku basic, i mjedisit me koleksionimin e veglave"
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
#, c-format
msgid "GNOME Workstation"
msgstr "Stacioni punues Gnome"
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
#, c-format
msgid ""
"A graphical environment with user-friendly set of applications and desktop "
@@ -661,7 +622,7 @@ msgstr ""
"Një mjedis grafikë me përdorues-miqësie, një përgjithësi e palikacioneve dhe "
"vegla në tryezë"
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
#, fuzzy, c-format
msgid "LXDE Desktop"
msgstr "Tryeza"
@@ -675,54 +636,52 @@ msgstr ""
"Një mjedis grafikë me përdorues-miqësie, një përgjithësi e palikacioneve dhe "
"vegla në tryezë"
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
#, c-format
msgid "Other Graphical Desktops"
msgstr "Mjedise të Tjera Grafike në Tryezë"
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
#, fuzzy, c-format
msgid "Window Maker, Enlightenment, Fvwm, etc"
msgstr "Icewm, Window Maker, Enlightenment, Fvwm, etj."
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
#, fuzzy, c-format
msgid "Utilities"
msgstr "Filipinet"
#: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
#, c-format
msgid "SSH Server"
msgstr "Server SSH"
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
#, fuzzy, c-format
msgid "Webmin"
msgstr "Webcam"
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
#, fuzzy, c-format
msgid "Webmin Remote Configuration Server"
msgstr "Konfigurim i Serverit me Terminale Mandriva"
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
#, fuzzy, c-format
msgid "Network Utilities/Monitoring"
msgstr "Vështrimi i Rrjetit (Network)"
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
#, c-format
msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
msgstr ""
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
#, fuzzy, c-format
msgid "Mandriva Wizards"
msgstr "Qendra Kontrolluese Mandriva Linux"
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
#, fuzzy, c-format
msgid "Wizards to configure server"
msgstr "Dështim gjatë konfigurim të stampuesit %s\"!"
@@ -823,17 +782,17 @@ msgstr ""
msgid "Click on images in order to see a bigger preview"
msgstr ""
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
#, c-format
msgid "Package Group Selection"
msgstr "Zgjedhni Grupet e Pakove"
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
#, c-format
msgid "Individual package selection"
msgstr "Zgjedhni pakot individualisht"
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
#, c-format
msgid "Total size: %d / %d MB"
msgstr "Madhësia totale: %d / %d MB"
@@ -952,12 +911,12 @@ msgstr "Instalim minimal"
msgid "Software Management"
msgstr "Menagjuesi Softver"
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
#, c-format
msgid "Choose the packages you want to install"
msgstr "Zgjedhi pakot të cilat dëshironi t'instaloni"
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
#, c-format
msgid "Installing"
msgstr "Instalimi"
@@ -984,7 +943,7 @@ msgid_plural "%d packages"
msgstr[0] "%d pakot"
msgstr[1] "%d pakot"
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
#, c-format
msgid "Summary"
msgstr "Përmbledhje"
@@ -994,7 +953,7 @@ msgstr "Përmbledhje"
msgid "Configure"
msgstr "Konfiguroje"
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
#, c-format
msgid "not configured"
msgstr "i pa konfiguruar"
@@ -1004,14 +963,14 @@ msgstr "i pa konfiguruar"
msgid "Media Selection"
msgstr "Zgjedhni Grupet e Pakove"
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
#, c-format
msgid ""
"The following installation media have been found.\n"
"If you want to skip some of them, you can unselect them now."
msgstr ""
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
#, c-format
msgid ""
"You have the option to copy the contents of the CDs onto the hard drive "
@@ -1020,7 +979,7 @@ msgid ""
"available once the system is fully installed."
msgstr ""
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
#, c-format
msgid "Copy whole CDs"
msgstr ""
@@ -1040,59 +999,49 @@ msgstr "Ju lutemi zgjedheni tipin tastierës suaj"
msgid "Here is the full list of available keyboards:"
msgstr "Ja ku është lista komplete e shteteve në disponibilitet"
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
#, c-format
msgid "Install/Upgrade"
msgstr "Instalo/Azhurno"
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
#, c-format
msgid "Is this an install or an upgrade?"
msgstr "Është ky një instalim apo një azhurnim?"
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
#, fuzzy, c-format
msgid ""
"_: This is a noun:\n"
"Install"
msgstr "Instalim"
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
#, c-format
msgid "Upgrade %s"
msgstr "Azhurno %s"
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
#, c-format
msgid "Encryption key for %s"
msgstr "Çelës i kriptuar për %s"
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
#, c-format
msgid "Cancel installation, reboot system"
msgstr ""
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
#, fuzzy, c-format
msgid "New Installation"
msgstr "Instalimi"
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
#, c-format
msgid "Upgrade previous installation (not recommended)"
msgstr ""
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
#, c-format
msgid ""
"Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1104,17 +1053,17 @@ msgid ""
"Installation\"."
msgstr ""
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "IDE"
msgstr "IDE"
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "Configuring IDE"
msgstr "Konfigurimi i IDE"
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
#, c-format
msgid ""
"No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1124,7 +1073,7 @@ msgstr ""
"Instalimi do të vazhdoj, ju duhet të krijoni një ndarje me nisje të udhëzuar"
"(bootstrap) në DiskDrake"
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
#, fuzzy, c-format
msgid ""
"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1135,7 +1084,7 @@ msgstr ""
"Instalimi do të vazhdoj, ju duhet të krijoni një ndarje me nisje të udhëzuar"
"(bootstrap) në DiskDrake"
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
#, c-format
msgid ""
"Change your Cd-Rom!\n"
@@ -1149,19 +1098,19 @@ msgstr ""
"Nëse ju nuk e posedoni, shtypni mbi kopsën Anulo që më në fund të mos "
"instaloni asgjë nga ky Cd-Rom."
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
#, c-format
msgid "Looking for available packages..."
msgstr "Hetim mbi pakot e lira..."
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
#, c-format
msgid ""
"Your system does not have enough space left for installation or upgrade (%"
"dMB > %dMB)"
msgstr ""
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
#, fuzzy, c-format
msgid ""
"Please choose load or save package selection.\n"
@@ -1171,52 +1120,52 @@ msgstr ""
"disketë.\n"
"Forma është e njëjtë sikur në disketë me tërheqje të instalimit automatikë."
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Load"
msgstr "Ngarko"
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Save"
msgstr "Shpëtoje"
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
#, fuzzy, c-format
msgid "Bad file"
msgstr "Ngarko file"
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
#, fuzzy, c-format
msgid "KDE"
msgstr "IDE"
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
#, c-format
msgid "GNOME"
msgstr "GNOME"
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
#, fuzzy, c-format
msgid "Desktop Selection"
msgstr "Zgjedhni Grupet e Pakove"
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
#, c-format
msgid "You can choose your workstation desktop profile."
msgstr ""
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
#, c-format
msgid "Selected size is larger than available space"
msgstr "Madhësia e zgjedhur është shumë më e gjatë se sa hapësira e lirë"
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
#, c-format
msgid "Type of install"
msgstr "Tipi i instalimit"
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
#, c-format
msgid ""
"You have not selected any group of packages.\n"
@@ -1225,82 +1174,82 @@ msgstr ""
"Ju nuk e keni zgjedhur asnjë grup të pakove.\n"
"Ju lutemi zgjedheni një instalim minimal të dëshiruar:"
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
#, c-format
msgid "With X"
msgstr "Me X"
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
#, c-format
msgid "With basic documentation (recommended!)"
msgstr "Me dokumentacion bazues (rekomanduar!)"
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
#, c-format
msgid "Truly minimal install (especially no urpmi)"
msgstr "Instalim tejet minimal (në veçanti pa urpmi)"
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
#, c-format
msgid "Preparing installation"
msgstr "Pregatitje për instalim"
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
#, c-format
msgid "Installing package %s"
msgstr "Instalimi i pakove %s"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "There was an error ordering packages:"
msgstr "Një gabim është paraqitur gjatë radhitjes së pakove:"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "Go on anyway?"
msgstr "Vazhdo pa marrë parasysh?"
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
#, c-format
msgid "Retry"
msgstr ""
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
#, c-format
msgid "Skip this package"
msgstr ""
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
#, c-format
msgid "Skip all packages from medium \"%s\""
msgstr ""
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
#, fuzzy, c-format
msgid "Go back to media and packages selection"
msgstr "Regjistroi pakot e zgjedhura"
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
#, fuzzy, c-format
msgid "There was an error installing package %s."
msgstr "Një gabim është paraqitur gjatë instalimit të pakove:"
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
#, c-format
msgid "Post-install configuration"
msgstr "Konfigurimi i postit-instalues"
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
#, c-format
msgid "Please ensure the Update Modules media is in drive %s"
msgstr ""
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
#, fuzzy, c-format
msgid "Updates"
msgstr "Azhurnimi"
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
#, c-format
msgid ""
"You now have the opportunity to download updated packages. These packages\n"
@@ -1321,28 +1270,28 @@ msgstr ""
"\n"
"A dëshironi t'instaloni këto azhurnime ?"
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
#, c-format
msgid "%s on %s"
msgstr "%s mbi %s"
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
#, c-format
msgid "Hardware"
msgstr "Hardver"
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
#, c-format
msgid "Sound card"
msgstr "Kartelë zëri"
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
#, c-format
msgid "Do you have an ISA sound card?"
msgstr "A posedoni një kartelë zëri ISA?"
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
#, fuzzy, c-format
msgid ""
"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1350,68 +1299,68 @@ msgid ""
msgstr ""
"Nise \"sndconfig\" mbasë instalimit për ta konfiguruar kartëlën e zërit"
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
#, c-format
msgid "No sound card detected. Try \"harddrake\" after installation"
msgstr "Asnjë kartelë e zbuluar. Provo \"harddrake\" mbasë instalimit"
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
#, c-format
msgid "Graphical interface"
msgstr "Interfaci grafik"
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
#, c-format
msgid "Network & Internet"
msgstr "Rrjeti & Internet"
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
#, fuzzy, c-format
msgid "Proxies"
msgstr "Profili "
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
#, fuzzy, c-format
msgid "configured"
msgstr "rikonfiguroje"
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
#, c-format
msgid "Security Level"
msgstr "Nivel i Sigurisë"
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
#, c-format
msgid "Firewall"
msgstr "Mur i Zjarrt"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "activated"
msgstr "aktivizuar"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "disabled"
msgstr "i nxënë"
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
#, c-format
msgid "You have not configured X. Are you sure you really want this?"
msgstr ""
"Ju nuk e keni konfiguruar serverin X. A jeni i sigurt, se e dëshironi këtë?"
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
#, c-format
msgid "Preparing bootloader..."
msgstr "Pregatitja e bootloader..."
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
#, c-format
msgid "Be patient, this may take a while..."
msgstr ""
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
#, fuzzy, c-format
msgid ""
"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1424,24 +1373,24 @@ msgstr ""
"Dhe instalimi do të vazhdoj më tutje, mirëpo ju\n"
" duhet të posedoni BootX që ta nisni sistemin tuaj"
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
#, c-format
msgid ""
"In this security level, access to the files in the Windows partition is "
"restricted to the administrator."
msgstr ""
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr "Futni një disketë të zbrazët në lexuesin e disketave %s"
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
#, c-format
msgid "Creating auto install floppy..."
msgstr "Krijimi i një diskete auto instaluese..."
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
#, c-format
msgid ""
"Some steps are not completed.\n"
@@ -1452,7 +1401,7 @@ msgstr ""
"\n"
"A dëshironi me të vërtetë ti braktisni tani?"
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
#, c-format
msgid "Congratulations"
msgstr "Urime"
@@ -1596,6 +1545,10 @@ msgid ""
"Exit"
msgstr "Braktise"
+#, fuzzy
+#~ msgid "Downloading file %s..."
+#~ msgstr "Dërgimi i skedareve..."
+
#~ msgid ""
#~ "You have selected the following server(s): %s\n"
#~ "\n"
diff --git a/perl-install/install/share/po/sr.po b/perl-install/install/share/po/sr.po
index 480d394de..341776e95 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: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+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"
@@ -18,31 +18,6 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr ""
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr ""
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr ""
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr ""
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr ""
-
#: any.pm:109
#, c-format
msgid "Do you have further supplementary media?"
@@ -82,17 +57,17 @@ msgstr "Мрежа (FTP)"
msgid "Network (NFS)"
msgstr "Мрежа (NFS)"
-#: any.pm:163
+#: any.pm:165
#, c-format
msgid "URL of the mirror?"
msgstr "УРЛ мирора?"
-#: any.pm:169
+#: any.pm:171
#, c-format
msgid "URL must start with ftp:// or http://"
msgstr "УРЛ мора почињати са ftp:// или http://"
-#: any.pm:180
+#: any.pm:182
#, c-format
msgid ""
"Contacting Mandriva Linux web site to get the list of available mirrors..."
@@ -100,7 +75,7 @@ msgstr ""
"Контактирајте Mandriva Linux web сајт да би добили листу доступних mirror-"
"а..."
-#: any.pm:185
+#: any.pm:187
#, c-format
msgid ""
"Failed contacting Mandriva Linux web site to get the list of available "
@@ -109,47 +84,47 @@ msgstr ""
"Неуспешно успостављање везе са Mandriva Linux web сајт ради листе доступних "
"mirror-а"
-#: any.pm:195
+#: any.pm:197
#, c-format
msgid "Choose a mirror from which to get the packages"
msgstr "Изаберите mirror са ког ћете скинути пакете"
-#: any.pm:225
+#: any.pm:227
#, c-format
msgid "NFS setup"
msgstr "Подешавање NFS-а"
-#: any.pm:226
+#: any.pm:228
#, c-format
msgid "Please enter the hostname and directory of your NFS media"
msgstr "Унесите име домаћина-hostname и директоријум вашег NFS медија"
-#: any.pm:230
+#: any.pm:232
#, c-format
msgid "Hostname missing"
msgstr "Недостаје име домаћина-hostname"
-#: any.pm:231
+#: any.pm:233
#, c-format
msgid "Directory must begin with \"/\""
msgstr "Директоријум мора почети са \"/\""
-#: any.pm:235
+#: any.pm:237
#, c-format
msgid "Hostname of the NFS mount ?"
msgstr "Име домаћина-hostname за монтирање NFS ?"
-#: any.pm:236
+#: any.pm:238
#, c-format
msgid "Directory"
msgstr "Директоријум"
-#: any.pm:258
+#: any.pm:260
#, c-format
msgid "Supplementary"
msgstr "Додатни"
-#: any.pm:293
+#: any.pm:295
#, c-format
msgid ""
"Can't find a package list file on this mirror. Make sure the location is "
@@ -158,22 +133,22 @@ msgstr ""
"Не могу пронађем листу пакета на овом мирору. проверите да ли локација "
"исправна."
-#: any.pm:328
+#: any.pm:334
#, c-format
msgid "Looking at packages already installed..."
msgstr "Тражим већ инсталиране пакете..."
-#: any.pm:362
+#: any.pm:368
#, c-format
msgid "Finding packages to upgrade..."
msgstr "Тражим пакете за ажурирање..."
-#: any.pm:381
+#: any.pm:387
#, c-format
msgid "Removing packages prior to upgrade..."
msgstr "Уклањам старе пакете..."
-#: any.pm:402
+#: any.pm:408
#, c-format
msgid ""
"You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -185,18 +160,18 @@ msgid ""
"please reboot your system and upgrade using the Mandriva update applet."
msgstr ""
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
#, c-format
msgid "Reboot"
msgstr "Рестарт"
-#: any.pm:407
+#: any.pm:413
#, c-format
msgid "Proceed"
msgstr ""
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -209,72 +184,72 @@ msgstr ""
"\n"
"Да ли заиста желите да уклоните ове пакете?\n"
-#: any.pm:815
+#: any.pm:821
#, c-format
msgid "Error reading file %s"
msgstr "Грешка код отварања датотека %s"
-#: any.pm:1022
+#: any.pm:1028
#, c-format
msgid "The following disk(s) were renamed:"
msgstr "Следећи диск(ови) ће бити преименовани:"
-#: any.pm:1024
+#: any.pm:1030
#, c-format
msgid "%s (previously named as %s)"
msgstr "%s (раније са именом %s)"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "HTTP"
msgstr "HTTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "FTP"
msgstr "FTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "NFS"
msgstr "NFS"
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
#, c-format
msgid "Network"
msgstr "Мрежа"
-#: any.pm:1104
+#: any.pm:1110
#, c-format
msgid "Please choose a media"
msgstr "Изаберите медиј"
-#: any.pm:1120
+#: any.pm:1126
#, c-format
msgid "File already exists. Overwrite it?"
msgstr "Датотека већ постоји. Да ли препишем преко постојеће?"
-#: any.pm:1124
+#: any.pm:1130
#, c-format
msgid "Permission denied"
msgstr "Приступ одбијен"
-#: any.pm:1172
+#: any.pm:1178
#, c-format
msgid "Bad NFS name"
msgstr "Погрешно NFS име"
-#: any.pm:1193
+#: any.pm:1199
#, c-format
msgid "Bad media %s"
msgstr "Лош медиј %s"
-#: any.pm:1236
+#: any.pm:1242
#, c-format
msgid "Can not make screenshots before partitioning"
msgstr "Не могу да направим снимак пре партиционирања"
-#: any.pm:1244
+#: any.pm:1250
#, c-format
msgid "Screenshots will be available after install in %s"
msgstr "Снимци ће бити доступни након инсталације у %s"
@@ -285,11 +260,15 @@ msgid "Installation"
msgstr "Инсталација"
#: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
#, c-format
msgid "Configuration"
msgstr "Конфигурација"
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
#: install2.pm:168
#, c-format
msgid "You must also format %s"
@@ -315,22 +294,22 @@ msgstr "Приступам мрежу"
msgid "Bringing down the network"
msgstr "Одступам од мреже"
-#: media.pm:402
+#: media.pm:399
#, c-format
msgid "Please wait, retrieving file"
msgstr ""
-#: media.pm:734
+#: media.pm:718
#, c-format
-msgid "Downloading file %s..."
-msgstr "Преузимам фајл %s ..."
+msgid "unable to add medium"
+msgstr ""
-#: media.pm:822
+#: media.pm:758
#, c-format
msgid "Copying some packages on disks for future use"
msgstr "Копирање неких поакета на дискове ради касније употребе"
-#: media.pm:875
+#: media.pm:811
#, c-format
msgid "Copying in progress"
msgstr "Копирање у току"
@@ -372,27 +351,27 @@ msgstr ""
msgid "An error occurred:"
msgstr "Хм,појавила се грешка"
-#: pkgs.pm:776
+#: pkgs.pm:780
#, c-format
msgid "%d installation transactions failed"
msgstr "%d инстлациона трансакција није успела"
-#: pkgs.pm:777
+#: pkgs.pm:781
#, fuzzy, c-format
msgid "Installation of packages failed:"
msgstr "Инсталирам пакет %s"
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
#, c-format
msgid "Workstation"
msgstr "Радна станица"
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
#, c-format
msgid "Office Workstation"
msgstr "Радна(Office) станица"
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
#, c-format
msgid ""
"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -401,7 +380,7 @@ msgstr ""
"Office програми: текст процесори (OpenOffice.org Writer, Kword), табеле "
"(OpenOffice.org Calc, Kspread), pdf прегледници, итд"
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
#, c-format
msgid ""
"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -410,32 +389,32 @@ msgstr ""
"Office програми: текст процесори (kword, abiword), табеле (kspread, "
"gnumeric), pdf прегледници, итд"
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
#, c-format
msgid "Game station"
msgstr "Станица за игру"
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
#, c-format
msgid "Amusement programs: arcade, boards, strategy, etc"
msgstr "Забавни програми: аркаде, иге на табли, стратегије, итд"
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
#, c-format
msgid "Multimedia station"
msgstr "Мултимедијална станица"
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
#, c-format
msgid "Sound and video playing/editing programs"
msgstr "Програми за пуштање звука и видеа"
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
#, c-format
msgid "Internet station"
msgstr "Интернет станица"
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
#, c-format
msgid ""
"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -444,211 +423,193 @@ msgstr ""
"Скуп алата за читање и слање ел.поште и вести (mutt, tin..) и за "
"претраживање Интернета"
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
#, c-format
msgid "Network Computer (client)"
msgstr "Мрежни компјутер (клијент)"
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
#, c-format
msgid "Clients for different protocols including ssh"
msgstr "Клијенти за различите протоколе укључујући и ssh"
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
#, c-format
msgid "Tools to ease the configuration of your computer"
msgstr "Алати за лако конфигурисање компјутера"
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
#, c-format
msgid "Console Tools"
msgstr "Конзолни алати"
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
#, c-format
msgid "Editors, shells, file tools, terminals"
msgstr "едитори,шелови, алати за датотеке, терминали"
#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
#, c-format
msgid "Development"
msgstr "Развојна"
#: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
#, c-format
msgid "C and C++ development libraries, programs and include files"
msgstr "C и C++ развојне библиотеке, програми и пропратне датотеке"
#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
#, c-format
msgid "Documentation"
msgstr "Документација"
#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
#, c-format
msgid "Books and Howto's on Linux and Free Software"
msgstr "Књиге и Како? (Howto's) за Linux и Бесплатни Софтвер"
#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
#, c-format
msgid "LSB"
msgstr "LSB"
#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
#, c-format
msgid "Linux Standard Base. Third party applications support"
msgstr "Линуксова Стандардна База. Подршка за Third party апликаицје"
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
#, c-format
msgid "Web Server"
msgstr "Веб Сервер"
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
#, c-format
msgid "Apache"
msgstr "Apache"
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
#, c-format
msgid "Groupware"
msgstr "Софтвер за групни рад"
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
#, c-format
msgid "Kolab Server"
msgstr "Kolab Сервер"
#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
#, c-format
msgid "Firewall/Router"
msgstr "Сервер, Firewall/Router"
#: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
#, c-format
msgid "Internet gateway"
msgstr "Интернет gateway"
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
#, c-format
msgid "Mail/News"
msgstr "Ел.пошта/вести"
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
#, c-format
msgid "Postfix mail server, Inn news server"
msgstr "Postfix сервер за ел.пошту,Inn сервер за вести "
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
#, c-format
msgid "Directory Server"
msgstr "Сервер директоријума"
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
#, c-format
msgid "FTP Server"
msgstr "FTP Сервер"
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
#, c-format
msgid "ProFTPd"
msgstr "ProFTPd"
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
#, c-format
msgid "DNS/NIS"
msgstr "DNS/NIS"
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
#, c-format
msgid "Domain Name and Network Information Server"
msgstr "Име Домена и Мрежни Информациони Сервер"
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
#, c-format
msgid "File and Printer Sharing Server"
msgstr "Фајл Сервер и сервер за дељење штампача"
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
#, c-format
msgid "NFS Server, Samba server"
msgstr "NFS Сервер, Samba Сервер"
#: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
#, c-format
msgid "Database"
msgstr "Сервер,Базе података"
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
#, c-format
msgid "PostgreSQL and MySQL Database Server"
msgstr "PostgreSQL или MySQL сервер за базу података"
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
#, c-format
msgid "Web/FTP"
msgstr "Сервер, Web/FTP"
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
#, c-format
msgid "Apache, Pro-ftpd"
msgstr "Apache, Pro-ftpd"
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
#, c-format
msgid "Mail"
msgstr "Пошта"
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
#, c-format
msgid "Postfix mail server"
msgstr "Postfix mail сервер"
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
#, c-format
msgid "PostgreSQL or MySQL database server"
msgstr "PostgreSQL или MySQL сервер за базу података"
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
#, c-format
msgid "Network Computer server"
msgstr "Мрежни Сервер"
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
#, c-format
msgid "NFS server, SMB server, Proxy server, ssh server"
msgstr "NFS сервер, SMB сервер, Proxy сервер, SSH сервер"
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
#, c-format
msgid "Graphical Environment"
msgstr "Графичко Окружење"
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
#, c-format
msgid "KDE Workstation"
msgstr "KDE падна станица"
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
#, c-format
msgid ""
"The K Desktop Environment, the basic graphical environment with a collection "
@@ -656,12 +617,12 @@ msgid ""
msgstr ""
"K Десктоп окружење, основно графичко окружење са колекцијом пратећих алата"
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
#, c-format
msgid "GNOME Workstation"
msgstr "Gnome радна станица"
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
#, c-format
msgid ""
"A graphical environment with user-friendly set of applications and desktop "
@@ -670,7 +631,7 @@ msgstr ""
"Графичка окружења за сетом корисничк NFS server, SMB server, Proxy server, "
"NFS server, SMB server, Proxy серверих апликација и десктопалата"
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
#, fuzzy, c-format
msgid "LXDE Desktop"
msgstr "IceWm Десктоп"
@@ -684,54 +645,52 @@ msgstr ""
"Графичка окружења за сетом корисничк NFS server, SMB server, Proxy server, "
"NFS server, SMB server, Proxy серверих апликација и десктопалата"
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
#, c-format
msgid "Other Graphical Desktops"
msgstr "Други графички десктопови"
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
#, c-format
msgid "Window Maker, Enlightenment, Fvwm, etc"
msgstr " Window Maker, Enlightenment, Fvwm, итд"
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
#, c-format
msgid "Utilities"
msgstr "Алати"
#: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
#, c-format
msgid "SSH Server"
msgstr "SSH Сервер"
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
#, c-format
msgid "Webmin"
msgstr "Webmin"
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
#, c-format
msgid "Webmin Remote Configuration Server"
msgstr "Webmin сервер за даљинску контролу"
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
#, c-format
msgid "Network Utilities/Monitoring"
msgstr "Мрежни алати/Мониторинг"
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
#, c-format
msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
msgstr "Алати за мониторинг, управљање процесима, tcpdump, nmap, ..."
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
#, c-format
msgid "Mandriva Wizards"
msgstr "Mandriva Чаробњаци"
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
#, c-format
msgid "Wizards to configure server"
msgstr "Чаробњаци за подешавање сервера"
@@ -832,17 +791,17 @@ msgstr ""
msgid "Click on images in order to see a bigger preview"
msgstr ""
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
#, c-format
msgid "Package Group Selection"
msgstr "Одабир група пакета"
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
#, c-format
msgid "Individual package selection"
msgstr "Појединачно бирање пакета"
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
#, c-format
msgid "Total size: %d / %d MB"
msgstr "Укупна величина: %d / %d MB"
@@ -959,12 +918,12 @@ msgstr "Минимално инсталирај"
msgid "Software Management"
msgstr "Подешавање Софтвера"
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
#, c-format
msgid "Choose the packages you want to install"
msgstr "Изабери пакете за инсталацију"
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
#, c-format
msgid "Installing"
msgstr "Инсталирам"
@@ -992,7 +951,7 @@ msgstr[0] "%d пакета"
msgstr[1] "%d пакета"
msgstr[2] "%d пакета"
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
#, c-format
msgid "Summary"
msgstr "Сажетак"
@@ -1002,7 +961,7 @@ msgstr "Сажетак"
msgid "Configure"
msgstr "Подеси"
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
#, c-format
msgid "not configured"
msgstr "није подешено"
@@ -1012,7 +971,7 @@ msgstr "није подешено"
msgid "Media Selection"
msgstr "Одабир група пакета"
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
#, c-format
msgid ""
"The following installation media have been found.\n"
@@ -1021,7 +980,7 @@ msgstr ""
"Пронађени су следећи инсталациони медији.\n"
"Уколико желите да прескочите неке од њих, деселектујте их сада."
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
#, c-format
msgid ""
"You have the option to copy the contents of the CDs onto the hard drive "
@@ -1033,7 +992,7 @@ msgstr ""
"Након тога ће инсталција наставити са хард диска а пакети ће остати доступни "
"и када се заврши инсталација."
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
#, c-format
msgid "Copy whole CDs"
msgstr "Копирање целог CDа"
@@ -1053,59 +1012,49 @@ msgstr "Изаберите распоред тастатуре"
msgid "Here is the full list of available keyboards:"
msgstr "Овде је представљена цела листа доступних распореда за тастатуре"
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
#, c-format
msgid "Install/Upgrade"
msgstr "Инсталација/Ажурирање"
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
#, c-format
msgid "Is this an install or an upgrade?"
msgstr "Да ли је ово инсталација или ажурирање?"
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
#, fuzzy, c-format
msgid ""
"_: This is a noun:\n"
"Install"
msgstr "Инсталирај"
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
#, c-format
msgid "Upgrade %s"
msgstr "Ажурирање %s"
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
#, c-format
msgid "Encryption key for %s"
msgstr "Кључ за енкрипцију за %s"
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
#, c-format
msgid "Cancel installation, reboot system"
msgstr ""
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
#, fuzzy, c-format
msgid "New Installation"
msgstr "Инсталација"
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
#, c-format
msgid "Upgrade previous installation (not recommended)"
msgstr ""
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
#, c-format
msgid ""
"Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1117,17 +1066,17 @@ msgid ""
"Installation\"."
msgstr ""
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "IDE"
msgstr "IDE"
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "Configuring IDE"
msgstr "Конфигурација IDE"
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
#, c-format
msgid ""
"No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1137,7 +1086,7 @@ msgstr ""
"да би подигли вашсистем, морађете да креирате bootstrap партицију у "
"DiskDrake-у"
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
#, c-format
msgid ""
"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1147,7 +1096,7 @@ msgstr ""
"Морате креирати PPC PReP bootstrap! Инсталација ђе се наставити, али да би "
"подигли ваш систем, морађете да креирате bootstrap партицију у DiskDrake-у"
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
#, c-format
msgid ""
"Change your Cd-Rom!\n"
@@ -1161,12 +1110,12 @@ msgstr ""
"спремни.\n"
"Уколико га немате притисните Поништи."
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
#, c-format
msgid "Looking for available packages..."
msgstr "Тражим пакете"
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
#, c-format
msgid ""
"Your system does not have enough space left for installation or upgrade (%"
@@ -1175,7 +1124,7 @@ msgstr ""
"Ваш систем нема довољно слободног простора за инсталацију или ажурирање "
"система (%dMB > %dMB)"
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
#, c-format
msgid ""
"Please choose load or save package selection.\n"
@@ -1184,52 +1133,52 @@ msgstr ""
"Молим Вас да изаберете учитавање или снимање селекције пакета.\n"
"Формат који се користи је исти као и код auto_install генерисаних фајлова."
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Load"
msgstr "Учитај"
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Save"
msgstr "Сачувај"
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
#, c-format
msgid "Bad file"
msgstr "Лош фајл"
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
#, fuzzy, c-format
msgid "KDE"
msgstr "IDE"
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
#, c-format
msgid "GNOME"
msgstr "GNOME"
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
#, fuzzy, c-format
msgid "Desktop Selection"
msgstr "Одабир група пакета"
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
#, c-format
msgid "You can choose your workstation desktop profile."
msgstr ""
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
#, c-format
msgid "Selected size is larger than available space"
msgstr "Селектована величина је веђа од слободног простора"
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
#, c-format
msgid "Type of install"
msgstr "Тип инсталације"
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
#, c-format
msgid ""
"You have not selected any group of packages.\n"
@@ -1238,82 +1187,82 @@ msgstr ""
"Нисте селектовали ниједну групу пакета.\n"
"Изаберите минималну инсталацију коју желите:"
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
#, c-format
msgid "With X"
msgstr "Са X-овима"
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
#, c-format
msgid "With basic documentation (recommended!)"
msgstr "Са основном документацијом (препорука!)"
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
#, c-format
msgid "Truly minimal install (especially no urpmi)"
msgstr "Стварно минимална инсталација (посебно без urpmi)"
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
#, c-format
msgid "Preparing installation"
msgstr "Припремам инсталацију"
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
#, c-format
msgid "Installing package %s"
msgstr "Инсталирам пакет %s"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "There was an error ordering packages:"
msgstr "Грешка у листи пакета:"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "Go on anyway?"
msgstr "Свеједно наставити даље ?"
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
#, c-format
msgid "Retry"
msgstr ""
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
#, c-format
msgid "Skip this package"
msgstr ""
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
#, c-format
msgid "Skip all packages from medium \"%s\""
msgstr ""
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
#, fuzzy, c-format
msgid "Go back to media and packages selection"
msgstr "Сачувај селекцију пакета"
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
#, fuzzy, c-format
msgid "There was an error installing package %s."
msgstr "Грешка при инсталацији пакета:"
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
#, c-format
msgid "Post-install configuration"
msgstr "Постинсталациона конфигурација"
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
#, c-format
msgid "Please ensure the Update Modules media is in drive %s"
msgstr "Проверите да ли се у уређају %s налази медиј за ажурирање модула"
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
#, c-format
msgid "Updates"
msgstr "Ажурирање"
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
#, c-format
msgid ""
"You now have the opportunity to download updated packages. These packages\n"
@@ -1333,28 +1282,28 @@ msgstr ""
"\n"
"да ли желите да инсталирате update-ове ?"
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
#, c-format
msgid "%s on %s"
msgstr "%s на %s"
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
#, c-format
msgid "Hardware"
msgstr "Хардвер"
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
#, c-format
msgid "Sound card"
msgstr "Звучна картица"
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
#, c-format
msgid "Do you have an ISA sound card?"
msgstr "Да ли имате ISA звучну картицу?"
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
#, c-format
msgid ""
"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1363,68 +1312,68 @@ msgstr ""
"Покрените \"alsaconf\" или \"sndconfig\" након иснталације да би подесили "
"своју звучну картицу"
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
#, c-format
msgid "No sound card detected. Try \"harddrake\" after installation"
msgstr ""
"Није детектована звучна картица. Покрените \"harddrake\" након инсталације"
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
#, c-format
msgid "Graphical interface"
msgstr "Графички интерфејс"
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
#, c-format
msgid "Network & Internet"
msgstr "Мрежа и Интернет"
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
#, c-format
msgid "Proxies"
msgstr "Проксији"
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
#, c-format
msgid "configured"
msgstr "подешено"
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
#, c-format
msgid "Security Level"
msgstr "Ниво сигурности"
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
#, c-format
msgid "Firewall"
msgstr "Заштитни зид (Firewall)"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "activated"
msgstr "Активирано"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "disabled"
msgstr "онемогућено"
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
#, c-format
msgid "You have not configured X. Are you sure you really want this?"
msgstr "Нисте подесили X. Да ли сте сигурни да желите то?"
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
#, c-format
msgid "Preparing bootloader..."
msgstr "Припремам стартер..."
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
#, c-format
msgid "Be patient, this may take a while..."
msgstr ""
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
#, c-format
msgid ""
"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1437,7 +1386,7 @@ msgstr ""
"BootX или нешто друго да би подигли систем. Аргумент кернела заroot fs je: "
"root=%s"
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
#, c-format
msgid ""
"In this security level, access to the files in the Windows partition is "
@@ -1446,17 +1395,17 @@ msgstr ""
"У овом сугурносном нивоу приступ фајловима на Windows партицији је дозвољен "
"само администраторима."
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr "Убаците празну дискету у уређај %s"
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
#, c-format
msgid "Creating auto install floppy..."
msgstr "Креирам ауто инсталациони флопи"
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
#, c-format
msgid ""
"Some steps are not completed.\n"
@@ -1467,7 +1416,7 @@ msgstr ""
"\n"
"Да ли стварно желите да завршите ?"
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
#, c-format
msgid "Congratulations"
msgstr "Честитке"
@@ -1611,6 +1560,9 @@ msgid ""
"Exit"
msgstr ""
+#~ msgid "Downloading file %s..."
+#~ msgstr "Преузимам фајл %s ..."
+
#~ msgid ""
#~ "You have selected the following server(s): %s\n"
#~ "\n"
diff --git a/perl-install/install/share/po/sr@Latn.po b/perl-install/install/share/po/sr@Latn.po
index e6a1c074d..c0140cf57 100644
--- a/perl-install/install/share/po/sr@Latn.po
+++ b/perl-install/install/share/po/sr@Latn.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: DrakX\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+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"
@@ -18,31 +18,6 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr ""
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr ""
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr ""
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr ""
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr ""
-
#: any.pm:109
#, c-format
msgid "Do you have further supplementary media?"
@@ -82,17 +57,17 @@ msgstr "Mreža (FTP)"
msgid "Network (NFS)"
msgstr "Mreža (NFS)"
-#: any.pm:163
+#: any.pm:165
#, c-format
msgid "URL of the mirror?"
msgstr "URL mirora?"
-#: any.pm:169
+#: any.pm:171
#, c-format
msgid "URL must start with ftp:// or http://"
msgstr "URL mora počinjati sa ftp:// ili http://"
-#: any.pm:180
+#: any.pm:182
#, c-format
msgid ""
"Contacting Mandriva Linux web site to get the list of available mirrors..."
@@ -100,7 +75,7 @@ msgstr ""
"Kontaktirajte Mandriva Linux web sajt da bi dobili listu dostupnih mirror-"
"a..."
-#: any.pm:185
+#: any.pm:187
#, c-format
msgid ""
"Failed contacting Mandriva Linux web site to get the list of available "
@@ -109,47 +84,47 @@ msgstr ""
"Neuspešno uspostavljanje veze sa Mandriva Linux web sajt radi liste "
"dostupnih mirror-a"
-#: any.pm:195
+#: any.pm:197
#, c-format
msgid "Choose a mirror from which to get the packages"
msgstr "Izaberite mirror sa kog ćete skinuti pakete"
-#: any.pm:225
+#: any.pm:227
#, c-format
msgid "NFS setup"
msgstr "Podešavanje NFS-a"
-#: any.pm:226
+#: any.pm:228
#, c-format
msgid "Please enter the hostname and directory of your NFS media"
msgstr "Unesite ime domaćina-hostname i direktorijum vašeg NFS medija"
-#: any.pm:230
+#: any.pm:232
#, c-format
msgid "Hostname missing"
msgstr "Nedostaje ime domaćina-hostname"
-#: any.pm:231
+#: any.pm:233
#, c-format
msgid "Directory must begin with \"/\""
msgstr "Direktorijum mora početi sa \"/\""
-#: any.pm:235
+#: any.pm:237
#, c-format
msgid "Hostname of the NFS mount ?"
msgstr "Ime domaćina-hostname za montiranje NFS ?"
-#: any.pm:236
+#: any.pm:238
#, c-format
msgid "Directory"
msgstr "Direktorijum"
-#: any.pm:258
+#: any.pm:260
#, c-format
msgid "Supplementary"
msgstr "Dodatni"
-#: any.pm:293
+#: any.pm:295
#, c-format
msgid ""
"Can't find a package list file on this mirror. Make sure the location is "
@@ -158,22 +133,22 @@ msgstr ""
"Ne mogu pronađem listu paketa na ovom miroru. proverite da li lokacija "
"ispravna."
-#: any.pm:328
+#: any.pm:334
#, c-format
msgid "Looking at packages already installed..."
msgstr "Tražim već instalirane pakete..."
-#: any.pm:362
+#: any.pm:368
#, c-format
msgid "Finding packages to upgrade..."
msgstr "Tražim pakete za ažuriranje..."
-#: any.pm:381
+#: any.pm:387
#, c-format
msgid "Removing packages prior to upgrade..."
msgstr "Uklanjam stare pakete..."
-#: any.pm:402
+#: any.pm:408
#, c-format
msgid ""
"You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -185,18 +160,18 @@ msgid ""
"please reboot your system and upgrade using the Mandriva update applet."
msgstr ""
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
#, c-format
msgid "Reboot"
msgstr "Restart"
-#: any.pm:407
+#: any.pm:413
#, c-format
msgid "Proceed"
msgstr ""
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -209,72 +184,72 @@ msgstr ""
"\n"
"Da li zaista želite da uklonite ove pakete?\n"
-#: any.pm:815
+#: any.pm:821
#, c-format
msgid "Error reading file %s"
msgstr "Greška kod otvaranja datoteka %s"
-#: any.pm:1022
+#: any.pm:1028
#, c-format
msgid "The following disk(s) were renamed:"
msgstr "Sledeći disk(ovi) će biti preimenovani:"
-#: any.pm:1024
+#: any.pm:1030
#, c-format
msgid "%s (previously named as %s)"
msgstr "%s (ranije sa imenom %s)"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "HTTP"
msgstr "HTTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "FTP"
msgstr "FTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "NFS"
msgstr "NFS"
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
#, c-format
msgid "Network"
msgstr "Mreža"
-#: any.pm:1104
+#: any.pm:1110
#, c-format
msgid "Please choose a media"
msgstr "Izaberite medij"
-#: any.pm:1120
+#: any.pm:1126
#, c-format
msgid "File already exists. Overwrite it?"
msgstr "Datoteka već postoji. Da li prepišem preko postojeće?"
-#: any.pm:1124
+#: any.pm:1130
#, c-format
msgid "Permission denied"
msgstr "Pristup odbijen"
-#: any.pm:1172
+#: any.pm:1178
#, c-format
msgid "Bad NFS name"
msgstr "Pogrešno NFS ime"
-#: any.pm:1193
+#: any.pm:1199
#, c-format
msgid "Bad media %s"
msgstr "Loš medij %s"
-#: any.pm:1236
+#: any.pm:1242
#, c-format
msgid "Can not make screenshots before partitioning"
msgstr "Ne mogu da napravim snimak pre particioniranja"
-#: any.pm:1244
+#: any.pm:1250
#, c-format
msgid "Screenshots will be available after install in %s"
msgstr "Snimci će biti dostupni nakon instalacije u %s"
@@ -285,11 +260,15 @@ msgid "Installation"
msgstr "Instalacija"
#: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
#, c-format
msgid "Configuration"
msgstr "Konfiguracija"
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
#: install2.pm:168
#, c-format
msgid "You must also format %s"
@@ -315,22 +294,22 @@ msgstr "Pristupam mrežu"
msgid "Bringing down the network"
msgstr "Odstupam od mreže"
-#: media.pm:402
+#: media.pm:399
#, c-format
msgid "Please wait, retrieving file"
msgstr ""
-#: media.pm:734
+#: media.pm:718
#, c-format
-msgid "Downloading file %s..."
-msgstr "Preuzimam fajl %s ..."
+msgid "unable to add medium"
+msgstr ""
-#: media.pm:822
+#: media.pm:758
#, c-format
msgid "Copying some packages on disks for future use"
msgstr "Kopiranje nekih poaketa na diskove radi kasnije upotrebe"
-#: media.pm:875
+#: media.pm:811
#, c-format
msgid "Copying in progress"
msgstr "Kopiranje u toku"
@@ -372,27 +351,27 @@ msgstr ""
msgid "An error occurred:"
msgstr "Hm,pojavila se greška"
-#: pkgs.pm:776
+#: pkgs.pm:780
#, c-format
msgid "%d installation transactions failed"
msgstr "%d instlaciona transakcija nije uspela"
-#: pkgs.pm:777
+#: pkgs.pm:781
#, fuzzy, c-format
msgid "Installation of packages failed:"
msgstr "Instaliram paket %s"
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
#, c-format
msgid "Workstation"
msgstr "Radna stanica"
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
#, c-format
msgid "Office Workstation"
msgstr "Radna(Office) stanica"
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
#, c-format
msgid ""
"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -401,7 +380,7 @@ msgstr ""
"Office programi: tekst procesori (OpenOffice.org Writer, Kword), tabele "
"(OpenOffice.org Calc, Kspread), pdf preglednici, itd"
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
#, c-format
msgid ""
"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -410,32 +389,32 @@ msgstr ""
"Office programi: tekst procesori (kword, abiword), tabele (kspread, "
"gnumeric), pdf preglednici, itd"
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
#, c-format
msgid "Game station"
msgstr "Stanica za igru"
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
#, c-format
msgid "Amusement programs: arcade, boards, strategy, etc"
msgstr "Zabavni programi: arkade, ige na tabli, strategije, itd"
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
#, c-format
msgid "Multimedia station"
msgstr "Multimedijalna stanica"
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
#, c-format
msgid "Sound and video playing/editing programs"
msgstr "Programi za puštanje zvuka i videa"
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
#, c-format
msgid "Internet station"
msgstr "Internet stanica"
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
#, c-format
msgid ""
"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -444,211 +423,193 @@ msgstr ""
"Skup alata za čitanje i slanje el.pošte i vesti (mutt, tin..) i za "
"pretraživanje Interneta"
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
#, c-format
msgid "Network Computer (client)"
msgstr "Mrežni kompjuter (klijent)"
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
#, c-format
msgid "Clients for different protocols including ssh"
msgstr "Klijenti za različite protokole uključujući i ssh"
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
#, c-format
msgid "Tools to ease the configuration of your computer"
msgstr "Alati za lako konfigurisanje kompjutera"
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
#, c-format
msgid "Console Tools"
msgstr "Konzolni alati"
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
#, c-format
msgid "Editors, shells, file tools, terminals"
msgstr "editori,šelovi, alati za datoteke, terminali"
#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
#, c-format
msgid "Development"
msgstr "Razvojna"
#: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
#, c-format
msgid "C and C++ development libraries, programs and include files"
msgstr "C i C++ razvojne biblioteke, programi i propratne datoteke"
#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
#, c-format
msgid "Documentation"
msgstr "Dokumentacija"
#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
#, c-format
msgid "Books and Howto's on Linux and Free Software"
msgstr "Knjige i Kako? (Howto's) za Linux i Besplatni Softver"
#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
#, c-format
msgid "LSB"
msgstr "LSB"
#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
#, c-format
msgid "Linux Standard Base. Third party applications support"
msgstr "Linux-ova Standardna Baza. Podrška za Third party aplikaicje"
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
#, c-format
msgid "Web Server"
msgstr "Veb Server"
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
#, c-format
msgid "Apache"
msgstr "Apache"
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
#, c-format
msgid "Groupware"
msgstr "Softver za grupni rad"
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
#, c-format
msgid "Kolab Server"
msgstr "Kolab Server"
#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
#, c-format
msgid "Firewall/Router"
msgstr "Server, Firewall/Router"
#: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
#, c-format
msgid "Internet gateway"
msgstr "Internet gateway"
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
#, c-format
msgid "Mail/News"
msgstr "El.pošta/vesti"
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
#, c-format
msgid "Postfix mail server, Inn news server"
msgstr "Postfix server za el.poštu,Inn server za vesti "
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
#, c-format
msgid "Directory Server"
msgstr "Server direktorijuma"
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
#, c-format
msgid "FTP Server"
msgstr "FTP Server"
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
#, c-format
msgid "ProFTPd"
msgstr "ProFTPd"
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
#, c-format
msgid "DNS/NIS"
msgstr "DNS/NIS"
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
#, c-format
msgid "Domain Name and Network Information Server"
msgstr "Ime Domena i Mrežni Informacioni Server"
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
#, c-format
msgid "File and Printer Sharing Server"
msgstr "Fajl Server i server za deljenje štampača"
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
#, c-format
msgid "NFS Server, Samba server"
msgstr "NFS Server, Samba Server"
#: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
#, c-format
msgid "Database"
msgstr "Server,Baze podataka"
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
#, c-format
msgid "PostgreSQL and MySQL Database Server"
msgstr "PostgreSQL ili MySQL server za bazu podataka"
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
#, c-format
msgid "Web/FTP"
msgstr "Server, Web/FTP"
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
#, c-format
msgid "Apache, Pro-ftpd"
msgstr "Apache, Pro-ftpd"
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
#, c-format
msgid "Mail"
msgstr "Pošta"
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
#, c-format
msgid "Postfix mail server"
msgstr "Postfix mail server"
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
#, c-format
msgid "PostgreSQL or MySQL database server"
msgstr "PostgreSQL ili MySQL server za bazu podataka"
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
#, c-format
msgid "Network Computer server"
msgstr "Mrežni Server"
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
#, c-format
msgid "NFS server, SMB server, Proxy server, ssh server"
msgstr "NFS server, SMB server, Proxy server, SSH server"
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
#, c-format
msgid "Graphical Environment"
msgstr "Grafičko Okruženje"
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
#, c-format
msgid "KDE Workstation"
msgstr "KDE padna stanica"
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
#, c-format
msgid ""
"The K Desktop Environment, the basic graphical environment with a collection "
@@ -656,12 +617,12 @@ msgid ""
msgstr ""
"K Desktop okruženje, osnovno grafičko okruženje sa kolekcijom pratećih alata"
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
#, c-format
msgid "GNOME Workstation"
msgstr "Gnome radna stanica"
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
#, c-format
msgid ""
"A graphical environment with user-friendly set of applications and desktop "
@@ -670,7 +631,7 @@ msgstr ""
"Grafička okruženja za setom korisničk NFS server, SMB server, Proxy server, "
"NFS server, SMB server, Proxy serverih aplikacija i desktopalata"
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
#, fuzzy, c-format
msgid "LXDE Desktop"
msgstr "IceWm Desktop"
@@ -684,54 +645,52 @@ msgstr ""
"Grafička okruženja za setom korisničk NFS server, SMB server, Proxy server, "
"NFS server, SMB server, Proxy serverih aplikacija i desktopalata"
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
#, c-format
msgid "Other Graphical Desktops"
msgstr "Drugi grafički desktopovi"
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
#, c-format
msgid "Window Maker, Enlightenment, Fvwm, etc"
msgstr " Window Maker, Enlightenment, Fvwm, itd"
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
#, c-format
msgid "Utilities"
msgstr "Alati"
#: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
#, c-format
msgid "SSH Server"
msgstr "SSH Server"
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
#, c-format
msgid "Webmin"
msgstr "Webmin"
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
#, c-format
msgid "Webmin Remote Configuration Server"
msgstr "Webmin server za daljinsku kontrolu"
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
#, c-format
msgid "Network Utilities/Monitoring"
msgstr "Mrežni alati/Monitoring"
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
#, c-format
msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
msgstr "Alati za monitoring, upravljanje procesima, tcpdump, nmap, ..."
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
#, c-format
msgid "Mandriva Wizards"
msgstr "Mandriva Čarobnjaci"
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
#, c-format
msgid "Wizards to configure server"
msgstr "Čarobnjaci za podešavanje servera"
@@ -832,17 +791,17 @@ msgstr ""
msgid "Click on images in order to see a bigger preview"
msgstr ""
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
#, c-format
msgid "Package Group Selection"
msgstr "Odabir grupa paketa"
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
#, c-format
msgid "Individual package selection"
msgstr "Pojedinačno biranje paketa"
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
#, c-format
msgid "Total size: %d / %d MB"
msgstr "Ukupna veličina: %d / %d MB"
@@ -959,12 +918,12 @@ msgstr "Minimalno instaliraj"
msgid "Software Management"
msgstr "Podešavanje Softvera"
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
#, c-format
msgid "Choose the packages you want to install"
msgstr "Izaberi pakete za instalaciju"
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
#, c-format
msgid "Installing"
msgstr "Instaliram"
@@ -992,7 +951,7 @@ msgstr[0] "%d paketa"
msgstr[1] "%d paketa"
msgstr[2] "%d paketa"
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
#, c-format
msgid "Summary"
msgstr "Sažetak"
@@ -1002,7 +961,7 @@ msgstr "Sažetak"
msgid "Configure"
msgstr "Podesi"
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
#, c-format
msgid "not configured"
msgstr "nije podešeno"
@@ -1012,7 +971,7 @@ msgstr "nije podešeno"
msgid "Media Selection"
msgstr "Odabir grupa paketa"
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
#, c-format
msgid ""
"The following installation media have been found.\n"
@@ -1021,7 +980,7 @@ msgstr ""
"Pronađeni su sledeći instalacioni mediji.\n"
"Ukoliko želite da preskočite neke od njih, deselektujte ih sada."
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
#, c-format
msgid ""
"You have the option to copy the contents of the CDs onto the hard drive "
@@ -1033,7 +992,7 @@ msgstr ""
"Nakon toga će instalcija nastaviti sa hard diska a paketi će ostati dostupni "
"i kada se završi instalacija."
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
#, c-format
msgid "Copy whole CDs"
msgstr "Kopiranje celog CDa"
@@ -1053,59 +1012,49 @@ msgstr "Izaberite raspored tastature"
msgid "Here is the full list of available keyboards:"
msgstr "Ovde je predstavljena cela lista dostupnih rasporeda za tastature"
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
#, c-format
msgid "Install/Upgrade"
msgstr "Instalacija/Ažuriranje"
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
#, c-format
msgid "Is this an install or an upgrade?"
msgstr "Da li je ovo instalacija ili ažuriranje?"
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
#, fuzzy, c-format
msgid ""
"_: This is a noun:\n"
"Install"
msgstr "Instaliraj"
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
#, c-format
msgid "Upgrade %s"
msgstr "Ažuriranje %s"
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
#, c-format
msgid "Encryption key for %s"
msgstr "Ključ za enkripciju za %s"
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
#, c-format
msgid "Cancel installation, reboot system"
msgstr ""
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
#, fuzzy, c-format
msgid "New Installation"
msgstr "Instalacija"
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
#, c-format
msgid "Upgrade previous installation (not recommended)"
msgstr ""
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
#, c-format
msgid ""
"Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1117,17 +1066,17 @@ msgid ""
"Installation\"."
msgstr ""
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "IDE"
msgstr "IDE"
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "Configuring IDE"
msgstr "Konfiguracija IDE"
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
#, c-format
msgid ""
"No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1137,7 +1086,7 @@ msgstr ""
"da bi podigli vašsistem, morađete da kreirate bootstrap particiju u "
"DiskDrake-u"
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
#, c-format
msgid ""
"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1147,7 +1096,7 @@ msgstr ""
"Morate kreirati PPC PReP bootstrap! Instalacija đe se nastaviti, ali da bi "
"podigli vaš sistem, morađete da kreirate bootstrap particiju u DiskDrake-u"
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
#, c-format
msgid ""
"Change your Cd-Rom!\n"
@@ -1161,12 +1110,12 @@ msgstr ""
"spremni.\n"
"Ukoliko ga nemate pritisnite Poništi."
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
#, c-format
msgid "Looking for available packages..."
msgstr "Tražim pakete"
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
#, c-format
msgid ""
"Your system does not have enough space left for installation or upgrade (%"
@@ -1175,7 +1124,7 @@ msgstr ""
"Vaš sistem nema dovoljno slobodnog prostora za instalaciju ili ažuriranje "
"sistema (%dMB > %dMB)"
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
#, c-format
msgid ""
"Please choose load or save package selection.\n"
@@ -1184,52 +1133,52 @@ msgstr ""
"Molim Vas da izaberete učitavanje ili snimanje selekcije paketa.\n"
"Format koji se koristi je isti kao i kod auto_install generisanih fajlova."
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Load"
msgstr "Učitaj"
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Save"
msgstr "Sačuvaj"
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
#, c-format
msgid "Bad file"
msgstr "Loš fajl"
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
#, fuzzy, c-format
msgid "KDE"
msgstr "IDE"
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
#, c-format
msgid "GNOME"
msgstr "GNOME"
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
#, fuzzy, c-format
msgid "Desktop Selection"
msgstr "Odabir grupa paketa"
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
#, c-format
msgid "You can choose your workstation desktop profile."
msgstr ""
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
#, c-format
msgid "Selected size is larger than available space"
msgstr "Selektovana veličina je veđa od slobodnog prostora"
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
#, c-format
msgid "Type of install"
msgstr "Tip instalacije"
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
#, c-format
msgid ""
"You have not selected any group of packages.\n"
@@ -1238,82 +1187,82 @@ msgstr ""
"Niste selektovali nijednu grupu paketa.\n"
"Izaberite minimalnu instalaciju koju želite:"
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
#, c-format
msgid "With X"
msgstr "Sa X-ovima"
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
#, c-format
msgid "With basic documentation (recommended!)"
msgstr "Sa osnovnom dokumentacijom (preporuka!)"
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
#, c-format
msgid "Truly minimal install (especially no urpmi)"
msgstr "Stvarno minimalna instalacija (posebno bez urpmi)"
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
#, c-format
msgid "Preparing installation"
msgstr "Pripremam instalaciju"
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
#, c-format
msgid "Installing package %s"
msgstr "Instaliram paket %s"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "There was an error ordering packages:"
msgstr "Greška u listi paketa:"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "Go on anyway?"
msgstr "Svejedno nastaviti dalje ?"
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
#, c-format
msgid "Retry"
msgstr ""
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
#, c-format
msgid "Skip this package"
msgstr ""
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
#, c-format
msgid "Skip all packages from medium \"%s\""
msgstr ""
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
#, fuzzy, c-format
msgid "Go back to media and packages selection"
msgstr "Sačuvaj selekciju paketa"
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
#, fuzzy, c-format
msgid "There was an error installing package %s."
msgstr "Greška pri instalaciji paketa:"
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
#, c-format
msgid "Post-install configuration"
msgstr "Postinstalaciona konfiguracija"
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
#, c-format
msgid "Please ensure the Update Modules media is in drive %s"
msgstr "Proverite da li se u uređaju %s nalazi medij za ažuriranje modula"
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
#, c-format
msgid "Updates"
msgstr "Ažuriranje"
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
#, c-format
msgid ""
"You now have the opportunity to download updated packages. These packages\n"
@@ -1333,28 +1282,28 @@ msgstr ""
"\n"
"da li želite da instalirate update-ove ?"
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
#, c-format
msgid "%s on %s"
msgstr "%s na %s"
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
#, c-format
msgid "Hardware"
msgstr "Hardver"
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
#, c-format
msgid "Sound card"
msgstr "Zvučna kartica"
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
#, c-format
msgid "Do you have an ISA sound card?"
msgstr "Da li imate ISA zvučnu karticu?"
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
#, c-format
msgid ""
"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1363,68 +1312,68 @@ msgstr ""
"Pokrenite \"alsaconf\" ili \"sndconfig\" nakon isntalacije da bi podesili "
"svoju zvučnu karticu"
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
#, c-format
msgid "No sound card detected. Try \"harddrake\" after installation"
msgstr ""
"Nije detektovana zvučna kartica. Pokrenite \"harddrake\" nakon instalacije"
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
#, c-format
msgid "Graphical interface"
msgstr "Grafički interfejs"
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
#, c-format
msgid "Network & Internet"
msgstr "Mreža i Internet"
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
#, c-format
msgid "Proxies"
msgstr "Proksiji"
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
#, c-format
msgid "configured"
msgstr "podešeno"
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
#, c-format
msgid "Security Level"
msgstr "Nivo sigurnosti"
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
#, c-format
msgid "Firewall"
msgstr "Zaštitni zid (Firewall)"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "activated"
msgstr "Aktivirano"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "disabled"
msgstr "onemogućeno"
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
#, c-format
msgid "You have not configured X. Are you sure you really want this?"
msgstr "Niste podesili X. Da li ste sigurni da želite to?"
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
#, c-format
msgid "Preparing bootloader..."
msgstr "Pripremam starter..."
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
#, c-format
msgid "Be patient, this may take a while..."
msgstr ""
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
#, c-format
msgid ""
"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1437,7 +1386,7 @@ msgstr ""
"BootX ili nešto drugo da bi podigli sistem. Argument kernela zaroot fs je: "
"root=%s"
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
#, c-format
msgid ""
"In this security level, access to the files in the Windows partition is "
@@ -1446,17 +1395,17 @@ msgstr ""
"U ovom sugurnosnom nivou pristup fajlovima na Windows particiji je dozvoljen "
"samo administratorima."
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr "Ubacite praznu disketu u uređaj %s"
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
#, c-format
msgid "Creating auto install floppy..."
msgstr "Kreiram auto instalacioni flopi"
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
#, c-format
msgid ""
"Some steps are not completed.\n"
@@ -1467,7 +1416,7 @@ msgstr ""
"\n"
"Da li stvarno želite da završite ?"
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
#, c-format
msgid "Congratulations"
msgstr "Čestitke"
@@ -1611,6 +1560,9 @@ msgid ""
"Exit"
msgstr "Izlaz"
+#~ msgid "Downloading file %s..."
+#~ msgstr "Preuzimam fajl %s ..."
+
#~ msgid ""
#~ "You have selected the following server(s): %s\n"
#~ "\n"
diff --git a/perl-install/install/share/po/sv.po b/perl-install/install/share/po/sv.po
index 5f1709e82..f792c0844 100644
--- a/perl-install/install/share/po/sv.po
+++ b/perl-install/install/share/po/sv.po
@@ -15,7 +15,7 @@ msgid ""
msgstr ""
"Project-Id-Version: DrakX-sv\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
"PO-Revision-Date: 2008-10-02 21:16+0300\n"
"Last-Translator: Thomas Backlund <tmb@mandriva.org>\n"
"Language-Team: Swedish <sv@li.org>\n"
@@ -25,31 +25,6 @@ msgstr ""
"X-Generator: KBabel 1.11.4\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr "Ditt skrivbord på ett USB-minne"
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr "Den 100%% öppen källkod baserade Mandriva Linux distributionen"
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr "Utforska Linux enkelt med Mandriva One"
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr "En komplett Mandriva Linux skrivbordsmiljö, med support"
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr "Mandriva: distributioner för allas behov"
-
#: any.pm:109
#, c-format
msgid "Do you have further supplementary media?"
@@ -90,17 +65,17 @@ msgstr "Nätverk (FTP)"
msgid "Network (NFS)"
msgstr "Nätverk (NFS)"
-#: any.pm:163
+#: any.pm:165
#, c-format
msgid "URL of the mirror?"
msgstr "Spegelns URL?"
-#: any.pm:169
+#: any.pm:171
#, c-format
msgid "URL must start with ftp:// or http://"
msgstr "URL måste starta med ftp:// eller http://"
-#: any.pm:180
+#: any.pm:182
#, c-format
msgid ""
"Contacting Mandriva Linux web site to get the list of available mirrors..."
@@ -108,7 +83,7 @@ msgstr ""
"Kontaktar Mandriva Linux webbplats för att hämta listan över tillgängliga "
"speglar..."
-#: any.pm:185
+#: any.pm:187
#, c-format
msgid ""
"Failed contacting Mandriva Linux web site to get the list of available "
@@ -117,69 +92,69 @@ msgstr ""
"Misslyckades kontakta Mandriva Linux webbplats för att hämta listan över "
"tillgängliga speglar"
-#: any.pm:195
+#: any.pm:197
#, c-format
msgid "Choose a mirror from which to get the packages"
msgstr "Välj en webbplats från vilken du vill hämta paketen"
-#: any.pm:225
+#: any.pm:227
#, c-format
msgid "NFS setup"
msgstr "NFS konfigurering"
-#: any.pm:226
+#: any.pm:228
#, c-format
msgid "Please enter the hostname and directory of your NFS media"
msgstr "Ange namn och katalog för ditt NFS medium"
-#: any.pm:230
+#: any.pm:232
#, c-format
msgid "Hostname missing"
msgstr "Värdnamn saknas"
-#: any.pm:231
+#: any.pm:233
#, c-format
msgid "Directory must begin with \"/\""
msgstr "Katalogen måste börja med \"/\""
-#: any.pm:235
+#: any.pm:237
#, c-format
msgid "Hostname of the NFS mount ?"
msgstr "Maskinnamn för NFS anslutning ?"
-#: any.pm:236
+#: any.pm:238
#, c-format
msgid "Directory"
msgstr "Katalog"
-#: any.pm:258
+#: any.pm:260
#, c-format
msgid "Supplementary"
msgstr "Tillägg"
-#: any.pm:293
+#: any.pm:295
#, c-format
msgid ""
"Can't find a package list file on this mirror. Make sure the location is "
"correct."
msgstr "Kan inte hitta hdlist filen på denna spegel"
-#: any.pm:328
+#: any.pm:334
#, c-format
msgid "Looking at packages already installed..."
msgstr "Söker efter paket som redan är installerade..."
-#: any.pm:362
+#: any.pm:368
#, c-format
msgid "Finding packages to upgrade..."
msgstr "Söker efter paket att uppdatera..."
-#: any.pm:381
+#: any.pm:387
#, c-format
msgid "Removing packages prior to upgrade..."
msgstr "Tar bort paket före uppgradering..."
-#: any.pm:402
+#: any.pm:408
#, c-format
msgid ""
"You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -201,18 +176,18 @@ msgstr ""
"vänlig och starta om ditt system och uppgradera med Mandriva "
"uppdateringsprogram."
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
#, c-format
msgid "Reboot"
msgstr "Starta om"
-#: any.pm:407
+#: any.pm:413
#, c-format
msgid "Proceed"
msgstr ""
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -225,72 +200,72 @@ msgstr ""
"\n"
"Vill du verkligen ta bort dessa paket?\n"
-#: any.pm:815
+#: any.pm:821
#, c-format
msgid "Error reading file %s"
msgstr "Fel vid läsning av fil %s"
-#: any.pm:1022
+#: any.pm:1028
#, c-format
msgid "The following disk(s) were renamed:"
msgstr "Följande disk(ar) har döpts om:"
-#: any.pm:1024
+#: any.pm:1030
#, c-format
msgid "%s (previously named as %s)"
msgstr "%s (gamla namnet %s)"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "HTTP"
msgstr "HTTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "FTP"
msgstr "FTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "NFS"
msgstr "NFS"
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
#, c-format
msgid "Network"
msgstr "Nätverk"
-#: any.pm:1104
+#: any.pm:1110
#, c-format
msgid "Please choose a media"
msgstr "Välj media"
-#: any.pm:1120
+#: any.pm:1126
#, c-format
msgid "File already exists. Overwrite it?"
msgstr "Filen finns redan. Skriv över?"
-#: any.pm:1124
+#: any.pm:1130
#, c-format
msgid "Permission denied"
msgstr "Åtkomst nekad"
-#: any.pm:1172
+#: any.pm:1178
#, c-format
msgid "Bad NFS name"
msgstr "Felaktigt NFS namn"
-#: any.pm:1193
+#: any.pm:1199
#, c-format
msgid "Bad media %s"
msgstr "Oanvändbart media %s"
-#: any.pm:1236
+#: any.pm:1242
#, c-format
msgid "Can not make screenshots before partitioning"
msgstr "Kan inte ta skärmdumpar före partitionering"
-#: any.pm:1244
+#: any.pm:1250
#, c-format
msgid "Screenshots will be available after install in %s"
msgstr "Skärmdumpar kommer att finnas tillgängliga efter installationen i %s"
@@ -301,11 +276,15 @@ msgid "Installation"
msgstr "Installation"
#: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
#, c-format
msgid "Configuration"
msgstr "Konfiguration"
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
#: install2.pm:168
#, c-format
msgid "You must also format %s"
@@ -330,22 +309,22 @@ msgstr "Startar nätverket"
msgid "Bringing down the network"
msgstr "Stoppar nätverket"
-#: media.pm:402
+#: media.pm:399
#, c-format
msgid "Please wait, retrieving file"
msgstr "Var god vänta, hämtar filen"
-#: media.pm:734
+#: media.pm:718
#, c-format
-msgid "Downloading file %s..."
-msgstr "Laddar ner filen %s..."
+msgid "unable to add medium"
+msgstr ""
-#: media.pm:822
+#: media.pm:758
#, c-format
msgid "Copying some packages on disks for future use"
msgstr "Kopierar några paket till hårddisken för senare användning"
-#: media.pm:875
+#: media.pm:811
#, c-format
msgid "Copying in progress"
msgstr "Kopiering pågår"
@@ -389,27 +368,27 @@ msgstr ""
msgid "An error occurred:"
msgstr "Ett fel inträffade"
-#: pkgs.pm:776
+#: pkgs.pm:780
#, c-format
msgid "%d installation transactions failed"
msgstr "%d installationstransaktioner misslyckades"
-#: pkgs.pm:777
+#: pkgs.pm:781
#, fuzzy, c-format
msgid "Installation of packages failed:"
msgstr "Installerar paket %s"
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
#, c-format
msgid "Workstation"
msgstr "Arbetsstation"
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
#, c-format
msgid "Office Workstation"
msgstr "Kontorsarbetsstation"
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
#, c-format
msgid ""
"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -418,7 +397,7 @@ msgstr ""
"Kontorsprogram: ordbehandlare (OpenOffice.org Writer, Kword), kalkylprogram "
"(OpenOffice.org Calc, Kspread), PDF-visare, etc"
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
#, c-format
msgid ""
"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -427,32 +406,32 @@ msgstr ""
"Kontorsprogram: ordbehandlare (Kword, Abiword), kalkylprogram (Kspread, "
"Gnumeric), PDF-visare, etc"
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
#, c-format
msgid "Game station"
msgstr "Spelstation"
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
#, c-format
msgid "Amusement programs: arcade, boards, strategy, etc"
msgstr "Underhållande program: arkad, brädspel, strategi, etc"
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
#, c-format
msgid "Multimedia station"
msgstr "Multimediastation"
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
#, c-format
msgid "Sound and video playing/editing programs"
msgstr "Redigerings- och uppspelningsprogram för video och ljud"
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
#, c-format
msgid "Internet station"
msgstr "Internetstation"
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
#, c-format
msgid ""
"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -461,211 +440,193 @@ msgstr ""
"En samling verktyg för att läsa och skicka e-post och nyheter (mutt, tin...) "
"och för att utforska Internet"
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
#, c-format
msgid "Network Computer (client)"
msgstr "Nätverksdator (klient)"
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
#, c-format
msgid "Clients for different protocols including ssh"
msgstr "Klienter för olika protokoll inkluderande SSH"
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
#, c-format
msgid "Tools to ease the configuration of your computer"
msgstr "Verktyg för att underlätta konfigurationen av datorn"
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
#, c-format
msgid "Console Tools"
msgstr "Konsollverktyg"
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
#, c-format
msgid "Editors, shells, file tools, terminals"
msgstr "Editorer, skal, filverktyg, terminaler"
#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
#, c-format
msgid "Development"
msgstr "Utveckling"
#: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
#, c-format
msgid "C and C++ development libraries, programs and include files"
msgstr "Utvecklingsbibliotek, program och include-filer för C och C++"
#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
#, c-format
msgid "Documentation"
msgstr "Dokumentation"
#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
#, c-format
msgid "Books and Howto's on Linux and Free Software"
msgstr "Böcker och \"Howto's\" om Linux och fri mjukvara"
#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
#, c-format
msgid "LSB"
msgstr "LSB"
#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
#, c-format
msgid "Linux Standard Base. Third party applications support"
msgstr "Linux Standard Base. Stöd för tredjepartsprogram"
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
#, c-format
msgid "Web Server"
msgstr "Webbserver"
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
#, c-format
msgid "Apache"
msgstr "Apache"
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
#, c-format
msgid "Groupware"
msgstr "Groupware"
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
#, c-format
msgid "Kolab Server"
msgstr "Kolab-server"
#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
#, c-format
msgid "Firewall/Router"
msgstr "Brandvägg/Router"
#: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
#, c-format
msgid "Internet gateway"
msgstr "Internet-gateway"
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
#, c-format
msgid "Mail/News"
msgstr "E-post/Nyheter"
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
#, c-format
msgid "Postfix mail server, Inn news server"
msgstr "E-postservern Postfix, Nyhetsgruppservern Inn"
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
#, c-format
msgid "Directory Server"
msgstr "Katalog-server"
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
#, c-format
msgid "FTP Server"
msgstr "FTP-server"
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
#, c-format
msgid "ProFTPd"
msgstr "ProFTPd"
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
#, c-format
msgid "DNS/NIS"
msgstr "DNS/NIS"
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
#, c-format
msgid "Domain Name and Network Information Server"
msgstr "Domännamnserver och Nätverksinformationsserver"
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
#, c-format
msgid "File and Printer Sharing Server"
msgstr "Fil och Skrivarserver"
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
#, c-format
msgid "NFS Server, Samba server"
msgstr "NFS-server, Samba-server"
#: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
#, c-format
msgid "Database"
msgstr "Databas"
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
#, c-format
msgid "PostgreSQL and MySQL Database Server"
msgstr "PostgreSQL- och MySQL-databasserver"
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
#, c-format
msgid "Web/FTP"
msgstr "Webb/FTP"
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
#, c-format
msgid "Apache, Pro-ftpd"
msgstr "Apache, Pro-ftpd"
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
#, c-format
msgid "Mail"
msgstr "E-post"
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
#, c-format
msgid "Postfix mail server"
msgstr "E-postservern Postfix"
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
#, c-format
msgid "PostgreSQL or MySQL database server"
msgstr "PostgreSQL- eller MySQL-databasserver"
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
#, c-format
msgid "Network Computer server"
msgstr "Nätverksserver"
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
#, c-format
msgid "NFS server, SMB server, Proxy server, ssh server"
msgstr "NFS-server, SMB-server, Proxyserver, SSH-server"
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
#, c-format
msgid "Graphical Environment"
msgstr "Grafisk miljö"
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
#, c-format
msgid "KDE Workstation"
msgstr "KDE-arbetsstation"
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
#, c-format
msgid ""
"The K Desktop Environment, the basic graphical environment with a collection "
@@ -674,12 +635,12 @@ msgstr ""
"K Desktop Environment, den grundläggande grafiska miljön med en samling "
"tillhörande verktyg"
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
#, c-format
msgid "GNOME Workstation"
msgstr "Gnome-arbetsstation"
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
#, c-format
msgid ""
"A graphical environment with user-friendly set of applications and desktop "
@@ -687,7 +648,7 @@ msgid ""
msgstr ""
"Grafisk miljö med en samling användarvänliga program och skrivbordsverktyg"
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
#, fuzzy, c-format
msgid "LXDE Desktop"
msgstr "KDE Skrivborsmiljö"
@@ -700,54 +661,52 @@ msgid ""
msgstr ""
"Grafisk miljö med en samling användarvänliga program och skrivbordsverktyg"
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
#, c-format
msgid "Other Graphical Desktops"
msgstr "Andra grafiska skrivbordsmiljöer"
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
#, c-format
msgid "Window Maker, Enlightenment, Fvwm, etc"
msgstr "Window Maker, Enlightenment, Fvwm, etc"
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
#, c-format
msgid "Utilities"
msgstr "Verktyg"
#: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
#, c-format
msgid "SSH Server"
msgstr "SSH-server"
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
#, c-format
msgid "Webmin"
msgstr "Webmin"
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
#, c-format
msgid "Webmin Remote Configuration Server"
msgstr "Fjärrkonfigurationsserver"
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
#, c-format
msgid "Network Utilities/Monitoring"
msgstr "Nätverksverktyg/Övervakning"
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
#, c-format
msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
msgstr "Övervakningsverkty, processhantering, tcpdump, nmap, ..."
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
#, c-format
msgid "Mandriva Wizards"
msgstr "Mandriva Guider"
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
#, c-format
msgid "Wizards to configure server"
msgstr "Guider för att konfigurera servern"
@@ -847,17 +806,17 @@ msgstr "Här är en demo av '%s' skrivbord."
msgid "Click on images in order to see a bigger preview"
msgstr "Klicka på bilderna för att se en större demo"
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
#, c-format
msgid "Package Group Selection"
msgstr "Val av paketgrupper"
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
#, c-format
msgid "Individual package selection"
msgstr "Välj enskilda paket"
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
#, c-format
msgid "Total size: %d / %d MB"
msgstr "Total storlek: %d / %d MB"
@@ -976,12 +935,12 @@ msgstr "Minimal installation"
msgid "Software Management"
msgstr "Programhantering"
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
#, c-format
msgid "Choose the packages you want to install"
msgstr "Välj paketen som du vill installera"
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
#, c-format
msgid "Installing"
msgstr "Installerar"
@@ -1008,7 +967,7 @@ msgid_plural "%d packages"
msgstr[0] "%d paketet"
msgstr[1] "%d paket"
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
#, c-format
msgid "Summary"
msgstr "Sammanfattning"
@@ -1018,7 +977,7 @@ msgstr "Sammanfattning"
msgid "Configure"
msgstr "Konfigurera"
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
#, c-format
msgid "not configured"
msgstr "Inte inställt"
@@ -1028,7 +987,7 @@ msgstr "Inte inställt"
msgid "Media Selection"
msgstr "Val av medium"
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
#, c-format
msgid ""
"The following installation media have been found.\n"
@@ -1037,7 +996,7 @@ msgstr ""
"Följande installationskällor har hittats.\n"
"Du kan välja bort dom du inte önskar använda dig av."
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
#, c-format
msgid ""
"You have the option to copy the contents of the CDs onto the hard drive "
@@ -1050,7 +1009,7 @@ msgstr ""
"Installationen kommer att fortsätta från hårddisken och paketen kommer att "
"fortsätta vara tillgängliga när systemet är färdiginstallerat."
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
#, c-format
msgid "Copy whole CDs"
msgstr "Kopiera hela CD skivor"
@@ -1070,59 +1029,49 @@ msgstr "Välj tangentbordslayout"
msgid "Here is the full list of available keyboards:"
msgstr "Här är hela listan med tillgängliga tangentbord:"
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
#, c-format
msgid "Install/Upgrade"
msgstr "Installera/Uppdatera"
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
#, c-format
msgid "Is this an install or an upgrade?"
msgstr "Är detta en installation eller en uppdatering?"
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
#, c-format
msgid ""
"_: This is a noun:\n"
"Install"
msgstr "Installera"
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
#, c-format
msgid "Upgrade %s"
msgstr "Uppdatera %s"
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr "Uppgradering från en 32bit till en 64bit distribution stöds inte."
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr "Uppgradering från en 64bit till en 32bit distribution stöds inte."
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
#, c-format
msgid "Encryption key for %s"
msgstr "Krypteringsnyckel för %s"
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
#, c-format
msgid "Cancel installation, reboot system"
msgstr "Avbryt installation, starta om systemet"
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
#, c-format
msgid "New Installation"
msgstr "Ny installation"
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
#, c-format
msgid "Upgrade previous installation (not recommended)"
msgstr "Uppgradera tidigare installation (rekommenderas ej)"
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
#, c-format
msgid ""
"Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1141,17 +1090,17 @@ msgstr ""
"Varning: du bör säkerhetskopiera alla dina personliga filer förrän du\n"
"väljer \"Ny installation\"."
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "IDE"
msgstr "IDE"
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "Configuring IDE"
msgstr "Konfigurerar IDE"
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
#, c-format
msgid ""
"No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1160,7 +1109,7 @@ msgstr ""
"Inget ledigt utrymme för 1MB bootstrap. Installationen fortsätter, men för "
"att starta systemet måste du skapa en \"bootstrap\"-partition i Diskdrake."
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
#, c-format
msgid ""
"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1170,7 +1119,7 @@ msgstr ""
"Du måste skapa en PPC PRep Bootstrap. Installationen fortsätter, men för att "
"starta systemet måste du skapa \"bootstrap\"-partitionen i Diskdrake."
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
#, c-format
msgid ""
"Change your Cd-Rom!\n"
@@ -1184,12 +1133,12 @@ msgstr ""
"Om du inte har den, klicka på Avbryt för att hoppa över\n"
"den delen av installationen."
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
#, c-format
msgid "Looking for available packages..."
msgstr "Söker efter tillgängliga paket..."
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
#, c-format
msgid ""
"Your system does not have enough space left for installation or upgrade (%"
@@ -1198,7 +1147,7 @@ msgstr ""
"Ditt system har inte tillräckligt med utrymme kvar för installation eller "
"uppgradering (%dMB > %dMB)"
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
#, c-format
msgid ""
"Please choose load or save package selection.\n"
@@ -1207,52 +1156,52 @@ msgstr ""
"Välj ladda eller spara paketval.\n"
"Formatet är detsamma som för auto_install-genererade filer."
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Load"
msgstr "Inläsning"
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Save"
msgstr "Spara"
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
#, c-format
msgid "Bad file"
msgstr "Oanvändbar fil"
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
#, c-format
msgid "KDE"
msgstr "KDE"
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
#, c-format
msgid "GNOME"
msgstr "GNOME"
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
#, c-format
msgid "Desktop Selection"
msgstr "Val av skrivbord"
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
#, c-format
msgid "You can choose your workstation desktop profile."
msgstr "Du kan väja din arbetsstationsprofil."
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
#, c-format
msgid "Selected size is larger than available space"
msgstr "Vald storlek är större än tillgängligt utrymme."
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
#, c-format
msgid "Type of install"
msgstr "Installationstyp"
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
#, c-format
msgid ""
"You have not selected any group of packages.\n"
@@ -1261,82 +1210,82 @@ msgstr ""
"Du har inte valt några gruppaket.\n"
"Välj den minimala installationen du vill ha:"
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
#, c-format
msgid "With X"
msgstr "Med X"
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
#, c-format
msgid "With basic documentation (recommended!)"
msgstr "Med grundläggande dokumentation (rekommenderas)"
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
#, c-format
msgid "Truly minimal install (especially no urpmi)"
msgstr "Minimal installation (ingen urpmi)"
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
#, c-format
msgid "Preparing installation"
msgstr "Förbereder installation"
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
#, c-format
msgid "Installing package %s"
msgstr "Installerar paket %s"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "There was an error ordering packages:"
msgstr "Det uppstod ett fel vid sortering av paket:"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "Go on anyway?"
msgstr "Fortsätta ändå?"
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
#, c-format
msgid "Retry"
msgstr "Försök igen"
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
#, c-format
msgid "Skip this package"
msgstr "Hoppa över detta paket"
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
#, c-format
msgid "Skip all packages from medium \"%s\""
msgstr "Hoppa över alla paket från mediet \"%s\""
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
#, c-format
msgid "Go back to media and packages selection"
msgstr "Gå tillbaka till media och paketval"
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
#, c-format
msgid "There was an error installing package %s."
msgstr "Det uppstod ett fel vid installation av paketet %s."
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
#, c-format
msgid "Post-install configuration"
msgstr "Bearbetar installerade paket"
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
#, c-format
msgid "Please ensure the Update Modules media is in drive %s"
msgstr "Kontrollera att media för uppdateringsmoduler finns i enhet %s"
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
#, c-format
msgid "Updates"
msgstr "Uppdateringar"
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
#, c-format
msgid ""
"You now have the opportunity to download updated packages. These packages\n"
@@ -1357,28 +1306,28 @@ msgstr ""
"\n"
"Vill du installera uppdateringarna?"
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
#, c-format
msgid "%s on %s"
msgstr "%s på %s"
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
#, c-format
msgid "Hardware"
msgstr "Hårdvara"
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
#, c-format
msgid "Sound card"
msgstr "Ljudkort"
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
#, c-format
msgid "Do you have an ISA sound card?"
msgstr "Har du ett ISA-ljudkort?"
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
#, c-format
msgid ""
"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1387,67 +1336,67 @@ msgstr ""
"Kör \"alsaconf\" eller \"sndconfig\" efter installationen för att "
"konfigurera ljudkortet."
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
#, c-format
msgid "No sound card detected. Try \"harddrake\" after installation"
msgstr "Inget ljudkort hittades. Prova \"harddrake\" efter installationen."
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
#, c-format
msgid "Graphical interface"
msgstr "Grafiskt gränssnitt"
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
#, c-format
msgid "Network & Internet"
msgstr "Nätverk & Internet"
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
#, c-format
msgid "Proxies"
msgstr "Proxyservrar"
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
#, c-format
msgid "configured"
msgstr "konfigurerad"
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
#, c-format
msgid "Security Level"
msgstr "Säkerhetsnivå:"
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
#, c-format
msgid "Firewall"
msgstr "Brandvägg"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "activated"
msgstr "aktiverad"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "disabled"
msgstr "inaktiverad"
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
#, c-format
msgid "You have not configured X. Are you sure you really want this?"
msgstr "Du har inte konfigurerat X. Är du säker på att du vill göra detta?"
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
#, c-format
msgid "Preparing bootloader..."
msgstr "Förbereder starthanterare..."
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
#, c-format
msgid "Be patient, this may take a while..."
msgstr ""
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
#, c-format
msgid ""
"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1460,7 +1409,7 @@ msgstr ""
"eller något liknande för att starta datorn. Kernelargumentet för roten är "
"root=%s"
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
#, c-format
msgid ""
"In this security level, access to the files in the Windows partition is "
@@ -1469,17 +1418,17 @@ msgstr ""
"På den här säkerhetsnivån är tillgång till Windowspartitionen förbehållen "
"administratören."
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr "Sätt in en tom diskett i diskettenhet %s"
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
#, c-format
msgid "Creating auto install floppy..."
msgstr "Skapar automatisk installationsdiskett"
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
#, c-format
msgid ""
"Some steps are not completed.\n"
@@ -1490,7 +1439,7 @@ msgstr ""
"\n"
"Vill du verkligen avbryta nu?"
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
#, c-format
msgid "Congratulations"
msgstr "Gratulerar"
@@ -1634,6 +1583,30 @@ msgid ""
"Exit"
msgstr "Avsluta"
+#~ msgid "Your desktop on a USB key"
+#~ msgstr "Ditt skrivbord på ett USB-minne"
+
+#~ msgid "The 100%% open source Mandriva Linux distribution"
+#~ msgstr "Den 100%% öppen källkod baserade Mandriva Linux distributionen"
+
+#~ msgid "Explore Linux easily with Mandriva One"
+#~ msgstr "Utforska Linux enkelt med Mandriva One"
+
+#~ msgid "A full Mandriva Linux desktop, with support"
+#~ msgstr "En komplett Mandriva Linux skrivbordsmiljö, med support"
+
+#~ msgid "Mandriva: distributions for everybody's needs"
+#~ msgstr "Mandriva: distributioner för allas behov"
+
+#~ msgid "Downloading file %s..."
+#~ msgstr "Laddar ner filen %s..."
+
+#~ msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
+#~ msgstr "Uppgradering från en 32bit till en 64bit distribution stöds inte."
+
+#~ msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
+#~ msgstr "Uppgradering från en 64bit till en 32bit distribution stöds inte."
+
#~ msgid ""
#~ "You have selected the following server(s): %s\n"
#~ "\n"
diff --git a/perl-install/install/share/po/ta.po b/perl-install/install/share/po/ta.po
index ccf84cefe..e51cf3635 100644
--- a/perl-install/install/share/po/ta.po
+++ b/perl-install/install/share/po/ta.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: DrakX 1.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
"PO-Revision-Date: 2002-09-06 00:35+0800\n"
"Last-Translator: prabu anand <prabu_anand2000@yahoo.com>\n"
"Language-Team: Tamil <tamilinix@yahoogroups.com>\n"
@@ -19,31 +19,6 @@ msgstr ""
"X-Generator: KBabel 0.9.6\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr ""
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr ""
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr ""
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr ""
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr ""
-
#: any.pm:109
#, fuzzy, c-format
msgid "Do you have further supplementary media?"
@@ -79,92 +54,92 @@ msgstr "வலையமைப்பு %s"
msgid "Network (NFS)"
msgstr ""
-#: any.pm:163
+#: any.pm:165
#, c-format
msgid "URL of the mirror?"
msgstr ""
-#: any.pm:169
+#: any.pm:171
#, c-format
msgid "URL must start with ftp:// or http://"
msgstr ""
-#: any.pm:180
+#: any.pm:182
#, c-format
msgid ""
"Contacting Mandriva Linux web site to get the list of available mirrors..."
msgstr "தற்ேபாதுள்ள இணைப் பதிப்புதளங்களை அறிய மாண்ட்ேரக் இணையதளம் தொடர்புகொள்ளப்படுகிறது"
-#: any.pm:185
+#: any.pm:187
#, fuzzy, c-format
msgid ""
"Failed contacting Mandriva Linux web site to get the list of available "
"mirrors"
msgstr "தற்ேபாதுள்ள இணைப் பதிப்புதளங்களை அறிய மாண்ட்ேரக் இணையதளம் தொடர்புகொள்ளப்படுகிறது"
-#: any.pm:195
+#: any.pm:197
#, c-format
msgid "Choose a mirror from which to get the packages"
msgstr "பொதிகளை எங்கிருந்து இறக்க விரும்புகிறீர்கள்"
-#: any.pm:225
+#: any.pm:227
#, c-format
msgid "NFS setup"
msgstr ""
-#: any.pm:226
+#: any.pm:228
#, c-format
msgid "Please enter the hostname and directory of your NFS media"
msgstr ""
-#: any.pm:230
+#: any.pm:232
#, c-format
msgid "Hostname missing"
msgstr ""
-#: any.pm:231
+#: any.pm:233
#, c-format
msgid "Directory must begin with \"/\""
msgstr ""
-#: any.pm:235
+#: any.pm:237
#, c-format
msgid "Hostname of the NFS mount ?"
msgstr ""
-#: any.pm:236
+#: any.pm:238
#, c-format
msgid "Directory"
msgstr "அடைவு"
-#: any.pm:258
+#: any.pm:260
#, c-format
msgid "Supplementary"
msgstr ""
-#: any.pm:293
+#: any.pm:295
#, fuzzy, c-format
msgid ""
"Can't find a package list file on this mirror. Make sure the location is "
"correct."
msgstr "இதை திறக்க முடியவில்ைல%s: %s\n"
-#: any.pm:328
+#: any.pm:334
#, c-format
msgid "Looking at packages already installed..."
msgstr "ஏற்கனவே நிறுவப்பட்டுள்ள பொதிகள் பார்ைவயிடப்படுகின்றன"
-#: any.pm:362
+#: any.pm:368
#, c-format
msgid "Finding packages to upgrade..."
msgstr "மேம்படுத்தப்பட வேண்டிய பொதிகள் அறியப்படுகின்றன"
-#: any.pm:381
+#: any.pm:387
#, c-format
msgid "Removing packages prior to upgrade..."
msgstr ""
-#: any.pm:402
+#: any.pm:408
#, c-format
msgid ""
"You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -176,18 +151,18 @@ msgid ""
"please reboot your system and upgrade using the Mandriva update applet."
msgstr ""
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
#, c-format
msgid "Reboot"
msgstr "மறுெதாடக்கம்"
-#: any.pm:407
+#: any.pm:413
#, c-format
msgid "Proceed"
msgstr ""
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -196,72 +171,72 @@ msgid ""
"Do you really want to remove these packages?\n"
msgstr ""
-#: any.pm:815
+#: any.pm:821
#, c-format
msgid "Error reading file %s"
msgstr "%s என்ற கோப்ேபா படிப்பதில் பிழை நேர்ந்துள்ளது"
-#: any.pm:1022
+#: any.pm:1028
#, fuzzy, c-format
msgid "The following disk(s) were renamed:"
msgstr "கிழ்கானும் பொதிகள் நிறுவுவதற்கு தேர்வுச் செய்யப்பட்டுள்ளது"
-#: any.pm:1024
+#: any.pm:1030
#, c-format
msgid "%s (previously named as %s)"
msgstr ""
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "HTTP"
msgstr "HTTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "FTP"
msgstr "FTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "NFS"
msgstr "NFS"
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
#, c-format
msgid "Network"
msgstr "வலையமைப்பு"
-#: any.pm:1104
+#: any.pm:1110
#, fuzzy, c-format
msgid "Please choose a media"
msgstr "தயவுசெய்து ேதர்ந்ெதடுக்கவும்"
-#: any.pm:1120
+#: any.pm:1126
#, fuzzy, c-format
msgid "File already exists. Overwrite it?"
msgstr "இந்த கோப்பு ஏற்கனவே உள்ளது. பயன்பாடுத்தி கொள்ளலாமா?"
-#: any.pm:1124
+#: any.pm:1130
#, fuzzy, c-format
msgid "Permission denied"
msgstr "அனுமதிகள்"
-#: any.pm:1172
+#: any.pm:1178
#, c-format
msgid "Bad NFS name"
msgstr ""
-#: any.pm:1193
+#: any.pm:1199
#, fuzzy, c-format
msgid "Bad media %s"
msgstr "கெட்ட தகவல்"
-#: any.pm:1236
+#: any.pm:1242
#, c-format
msgid "Can not make screenshots before partitioning"
msgstr "வகிர்தல் முடிவதற்கு முன் திரைவேட்டு எடுக்க முடியாது"
-#: any.pm:1244
+#: any.pm:1250
#, c-format
msgid "Screenshots will be available after install in %s"
msgstr "நிறுவி முடித்தவுடன் திரைவேட்டுகள் %s என்ற அடைவில் கிடைக்கும்"
@@ -272,11 +247,15 @@ msgid "Installation"
msgstr "நிறுவப்படுகிறது"
#: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
#, c-format
msgid "Configuration"
msgstr "வடிவமைப்புகள்"
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
#: install2.pm:168
#, c-format
msgid "You must also format %s"
@@ -301,22 +280,22 @@ msgstr "வலையமைப்பாக்கங்கள் ஏற்றப
msgid "Bringing down the network"
msgstr "வலையமைப்பாக்கங்கள் முடக்கப்படுகிறது"
-#: media.pm:402
+#: media.pm:399
#, c-format
msgid "Please wait, retrieving file"
msgstr ""
-#: media.pm:734
-#, fuzzy, c-format
-msgid "Downloading file %s..."
-msgstr "கோப்புகளைக் கண்டுபிடி "
+#: media.pm:718
+#, c-format
+msgid "unable to add medium"
+msgstr ""
-#: media.pm:822
+#: media.pm:758
#, c-format
msgid "Copying some packages on disks for future use"
msgstr ""
-#: media.pm:875
+#: media.pm:811
#, fuzzy, c-format
msgid "Copying in progress"
msgstr "இன்னும் தேடுதல் நடைபெறுகிறது"
@@ -358,296 +337,278 @@ msgstr ""
msgid "An error occurred:"
msgstr "பிழை நேர்ந்துள்ளது மன்னிக்கவும்"
-#: pkgs.pm:776
+#: pkgs.pm:780
#, fuzzy, c-format
msgid "%d installation transactions failed"
msgstr "நிறுவுதலில் பிழை நேர்ந்துள்ளது"
-#: pkgs.pm:777
+#: pkgs.pm:781
#, fuzzy, c-format
msgid "Installation of packages failed:"
msgstr "%s பொதி நிறுவப்படுகிறது"
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
#, c-format
msgid "Workstation"
msgstr "வேலைக்களம்"
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
#, c-format
msgid "Office Workstation"
msgstr "அலுவல் கருவிகள்"
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
#, fuzzy, c-format
msgid ""
"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
msgstr "அலுவல் கருவிகள்(விாிதாள், நிகழ்த்தி,வரைபடக் கருவிகள்)"
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
#, c-format
msgid ""
"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
"gnumeric), pdf viewers, etc"
msgstr "அலுவல் கருவிகள்(விாிதாள், நிகழ்த்தி,வரைபடக் கருவிகள்)"
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
#, c-format
msgid "Game station"
msgstr "விளையாட்டுகள்"
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
#, c-format
msgid "Amusement programs: arcade, boards, strategy, etc"
msgstr "விளையாட்டுகள்"
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
#, c-format
msgid "Multimedia station"
msgstr "பல்லூடக கணினி"
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
#, c-format
msgid "Sound and video playing/editing programs"
msgstr "பல்லூடக இயக்கிகள்/உருவாக்க நிரல்கள்"
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
#, c-format
msgid "Internet station"
msgstr "இணையக் கணினி"
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
#, fuzzy, c-format
msgid ""
"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
"Web"
msgstr "நீங்கள் மின்னஞ்சல், மற்றும் இணையத்ைத மேலோட உதவுங்கருவிகள்"
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
#, c-format
msgid "Network Computer (client)"
msgstr "வலையமைப்புக் கணினி(வேண்டி)"
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
#, c-format
msgid "Clients for different protocols including ssh"
msgstr "ssh முதலிய வலையமைப்புக் கருவிகள்"
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
#, c-format
msgid "Tools to ease the configuration of your computer"
msgstr "உங்கள் கணினியை எளிதாக வடிவமைக்க உதவுங்கருவிகள்"
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
#, c-format
msgid "Console Tools"
msgstr "முனையக் கருவிகள்"
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
#, c-format
msgid "Editors, shells, file tools, terminals"
msgstr "முனையம்,தொகுப்பாளர்கள், கோப்பு மேலாளர்கள் மற்றும் ஓடுகள்"
#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
#, c-format
msgid "Development"
msgstr "உருவாக்கம்"
#: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
#, c-format
msgid "C and C++ development libraries, programs and include files"
msgstr "C மற்றும் C++ நூலக நிரல்கள்"
#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
#, c-format
msgid "Documentation"
msgstr "உதவிநூல்"
#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
#, c-format
msgid "Books and Howto's on Linux and Free Software"
msgstr "புத்தகங்கள் மற்றும் எப்படிச் செய்வது போன்ற உதவி நூல்"
#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
#, c-format
msgid "LSB"
msgstr "LSB"
#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
#, c-format
msgid "Linux Standard Base. Third party applications support"
msgstr "LSB- லினக்ஸ் தரக்கட்டுப்பாட்டுக்கு தேவையான நிரல்கள்."
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
#, c-format
msgid "Web Server"
msgstr "இணையத்தள சேவையகம்"
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
#, c-format
msgid "Apache"
msgstr ""
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
#, fuzzy, c-format
msgid "Groupware"
msgstr "கிரப்"
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
#, c-format
msgid "Kolab Server"
msgstr "கோலாப் சேவகன்"
#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
#, c-format
msgid "Firewall/Router"
msgstr "நெருப்புச்சுவர்/வழிப்படுத்தி"
#: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
#, c-format
msgid "Internet gateway"
msgstr "இணைய நுழைவாயில்"
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
#, fuzzy, c-format
msgid "Mail/News"
msgstr "/கோப்பு/_புதியது"
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
#, fuzzy, c-format
msgid "Postfix mail server, Inn news server"
msgstr "மின்னஞ்சல் பரிமாறி"
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
#, fuzzy, c-format
msgid "Directory Server"
msgstr "RAID இருந்து நீக்கு"
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
#, fuzzy, c-format
msgid "FTP Server"
msgstr "NTP சேவையகம்"
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
#, c-format
msgid "ProFTPd"
msgstr ""
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
#, fuzzy, c-format
msgid "DNS/NIS"
msgstr "DNS/NIS "
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
#, c-format
msgid "Domain Name and Network Information Server"
msgstr "DNS/NIS"
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
#, fuzzy, c-format
msgid "File and Printer Sharing Server"
msgstr "அச்சுப்ெபாறி சேவையகம்"
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
#, fuzzy, c-format
msgid "NFS Server, Samba server"
msgstr "ஒலிப் பரிமாறி"
#: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
#, c-format
msgid "Database"
msgstr "தரவுதளங்கள்"
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
#, fuzzy, c-format
msgid "PostgreSQL and MySQL Database Server"
msgstr "PostgreSQL/MySQL தரவுத்தள பரிமாறிகள்"
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
#, c-format
msgid "Web/FTP"
msgstr "இணையதள/கோப்புப் பாிமாற்றம்"
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
#, c-format
msgid "Apache, Pro-ftpd"
msgstr "அப்பாச்சி, ftpd போன்ற பரிமாற்று நிரல்கள்"
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
#, c-format
msgid "Mail"
msgstr "மின்னஞ்சல்"
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
#, fuzzy, c-format
msgid "Postfix mail server"
msgstr "மின்னஞ்சல் பரிமாறி"
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
#, c-format
msgid "PostgreSQL or MySQL database server"
msgstr "PostgreSQL/MySQL தரவுத்தள பரிமாறிகள்"
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
#, c-format
msgid "Network Computer server"
msgstr "வலையமைப்பக பரிமாறி"
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
#, c-format
msgid "NFS server, SMB server, Proxy server, ssh server"
msgstr "NFS /சம்பா/பினாமி/ssh பரிமாறிகள்"
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
#, c-format
msgid "Graphical Environment"
msgstr "வரைவியல்வழி சூழல்கள்"
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
#, c-format
msgid "KDE Workstation"
msgstr "Kசாளரமைப்பு பணிக்கணினி"
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
#, c-format
msgid ""
"The K Desktop Environment, the basic graphical environment with a collection "
"of accompanying tools"
msgstr "Kசாளரமைப்பு- ஓர் பயன்படுத்துவதற்கு எளிதான வரைவியல்வழி மேலாளர்"
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
#, c-format
msgid "GNOME Workstation"
msgstr "குேனாம் பணிக்கணினி"
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
#, c-format
msgid ""
"A graphical environment with user-friendly set of applications and desktop "
"tools"
msgstr "ஓர் பயன்படுத்துவதற்கு எளிதான வரைவியல்வழி மேலாளர்"
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
#, fuzzy, c-format
msgid "LXDE Desktop"
msgstr "மேசைசெயலி"
@@ -659,54 +620,52 @@ msgid ""
"applications and desktop tools"
msgstr "ஓர் பயன்படுத்துவதற்கு எளிதான வரைவியல்வழி மேலாளர்"
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
#, c-format
msgid "Other Graphical Desktops"
msgstr "மற்ற வரைவியல்வழி மேலாளர்கள்"
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
#, fuzzy, c-format
msgid "Window Maker, Enlightenment, Fvwm, etc"
msgstr "குேனாம், ஐஸ்விம் ஆகிய பயன்படுத்துவதற்கு எளிதான வரைவியல்வழி மேலாளர்கள்"
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
#, c-format
msgid "Utilities"
msgstr "உதவிக்கருவிகள்"
#: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
#, fuzzy, c-format
msgid "SSH Server"
msgstr "சேவையகம்"
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
#, fuzzy, c-format
msgid "Webmin"
msgstr "வலைபடக் கருவி"
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
#, fuzzy, c-format
msgid "Webmin Remote Configuration Server"
msgstr "பரிமாறி வடிவமைப்பு"
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
#, fuzzy, c-format
msgid "Network Utilities/Monitoring"
msgstr "வலையமைப்பாக்க வடிவமைப்பு "
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
#, c-format
msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
msgstr ""
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
#, fuzzy, c-format
msgid "Mandriva Wizards"
msgstr "மாண்ட்ேரக் கட்டுப்பட்டு மையம்"
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
#, fuzzy, c-format
msgid "Wizards to configure server"
msgstr "அச்சுப்ெபாறி \"%s\" வடிவமைப்பு ெவற்றியடையவில்ைல"
@@ -805,17 +764,17 @@ msgstr ""
msgid "Click on images in order to see a bigger preview"
msgstr ""
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
#, c-format
msgid "Package Group Selection"
msgstr "பொதிகள் குழுத் தேர்வு"
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
#, c-format
msgid "Individual package selection"
msgstr "தனித்னி பொதியாக தேர்வுச் செய்"
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
#, c-format
msgid "Total size: %d / %d MB"
msgstr "மெகா பைட்டில் மொத்த அளவு %d / %d"
@@ -932,12 +891,12 @@ msgstr "குறைந்தபட்ச நிறுவல்"
msgid "Software Management"
msgstr "நிரல் மேலாண்மை"
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
#, c-format
msgid "Choose the packages you want to install"
msgstr "நிறுவ வேண்டிய பொதிகளை தேர்வுச் செய்யுங்கள் "
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
#, c-format
msgid "Installing"
msgstr "நிறுவப்படுகிறது"
@@ -964,7 +923,7 @@ msgid_plural "%d packages"
msgstr[0] "%d பொதிகள்"
msgstr[1] "%d பொதிகள்"
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
#, c-format
msgid "Summary"
msgstr "உரை"
@@ -974,7 +933,7 @@ msgstr "உரை"
msgid "Configure"
msgstr "வடிவமை"
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
#, c-format
msgid "not configured"
msgstr "வடிவமைக்கப்படவில்ைல"
@@ -984,14 +943,14 @@ msgstr "வடிவமைக்கப்படவில்ைல"
msgid "Media Selection"
msgstr "பொதிகள் குழுத் தேர்வு"
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
#, c-format
msgid ""
"The following installation media have been found.\n"
"If you want to skip some of them, you can unselect them now."
msgstr ""
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
#, c-format
msgid ""
"You have the option to copy the contents of the CDs onto the hard drive "
@@ -1000,7 +959,7 @@ msgid ""
"available once the system is fully installed."
msgstr ""
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
#, c-format
msgid "Copy whole CDs"
msgstr ""
@@ -1020,59 +979,49 @@ msgstr "தயவுசெய்து உங்கள் விசைப்ப
msgid "Here is the full list of available keyboards:"
msgstr "உங்கள் பயன்பாட்டிற்கு உள்ள விசைப்பலகைகள் அனைத்தும் இங்கே கொடுக்கப்பட்டுள்ளன"
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
#, c-format
msgid "Install/Upgrade"
msgstr "நிறுவுதுல்/ேமம்படுத்தல்"
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
#, c-format
msgid "Is this an install or an upgrade?"
msgstr "இது நிறுவுதலா அல்லது ேமம்படுத்தலா?"
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
#, fuzzy, c-format
msgid ""
"_: This is a noun:\n"
"Install"
msgstr "நிறுவு"
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
#, c-format
msgid "Upgrade %s"
msgstr " %s ேமம்படுத்து"
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
#, fuzzy, c-format
msgid "Encryption key for %s"
msgstr "மறைக்குறியீட்டுச் சாவி"
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
#, c-format
msgid "Cancel installation, reboot system"
msgstr ""
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
#, fuzzy, c-format
msgid "New Installation"
msgstr "நிறுவப்படுகிறது"
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
#, c-format
msgid "Upgrade previous installation (not recommended)"
msgstr ""
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
#, c-format
msgid ""
"Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1084,17 +1033,17 @@ msgid ""
"Installation\"."
msgstr ""
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "IDE"
msgstr "IDE"
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "Configuring IDE"
msgstr "IDE வடிவமைக்கப்படுகிறது..."
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
#, c-format
msgid ""
"No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1103,7 +1052,7 @@ msgstr ""
"துவங்குநிரலை நிறுவ இடமில்ைல. நிறுவுதல் தொடரும். ஆனால் உங்கள் லினக்ஸ் இயக்க நிரலை துவக்க "
"டிரேக்வட்ைட பயன்படுத்துங்கள்"
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
#, fuzzy, c-format
msgid ""
"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1113,7 +1062,7 @@ msgstr ""
"துவங்குநிரலை நிறுவ இடமில்ைல. நிறுவுதல் தொடரும். ஆனால் உங்கள் லினக்ஸ் இயக்க நிரலை துவக்க "
"டிரேக்வட்ைட பயன்படுத்துங்கள்"
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
#, c-format
msgid ""
"Change your Cd-Rom!\n"
@@ -1128,19 +1077,19 @@ msgstr ""
"இந்த சிடி இல்ைலயென்றால் நீக்கு என்ற பொத்தானை கிளிக் செய்தால் இந்த சிடியிலிருந்து நிறுவல் "
"நின்றுவிடும்"
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
#, c-format
msgid "Looking for available packages..."
msgstr "இருக்கும் பொதிகள் பார்ைவயிடப்படுகின்றன"
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
#, c-format
msgid ""
"Your system does not have enough space left for installation or upgrade (%"
"dMB > %dMB)"
msgstr ""
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
#, fuzzy, c-format
msgid ""
"Please choose load or save package selection.\n"
@@ -1149,52 +1098,52 @@ msgstr ""
"தயவுசெய்து உங்கள் பொதி தேர்ைவ ஒரு நெகிழ்வட்டில் சேமிக்கவும்.\n"
"இவ்வாறு சேமிக்கும் முறை தானியங்கி-நிறுவலை ஒத்து இருக்கும்"
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Load"
msgstr "ஏற்றி"
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Save"
msgstr "சேமி"
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
#, fuzzy, c-format
msgid "Bad file"
msgstr "கோப்பை ஏற்று"
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
#, fuzzy, c-format
msgid "KDE"
msgstr "IDE"
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
#, c-format
msgid "GNOME"
msgstr "குனோம்"
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
#, fuzzy, c-format
msgid "Desktop Selection"
msgstr "பொதிகள் குழுத் தேர்வு"
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
#, c-format
msgid "You can choose your workstation desktop profile."
msgstr ""
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
#, c-format
msgid "Selected size is larger than available space"
msgstr "நீங்கள் தேர்வு செய்துள்ள அளவு, இருக்குமிடத்ைத விட அதிகமாக உள்ளது"
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
#, c-format
msgid "Type of install"
msgstr "நிறுவல் முறை"
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
#, c-format
msgid ""
"You have not selected any group of packages.\n"
@@ -1203,82 +1152,82 @@ msgstr ""
"நீங்கள் பொதி குழுக்கள் எதனையும் தேர்வு செய்யவில்ைல.\n"
"தயவுசெய்து உங்களுக்கு தேவையானதை தேர்வு செய்யவும்"
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
#, c-format
msgid "With X"
msgstr "X உடன் வரைவியல்வழியிடல பயன்படுத்த இது தேவை"
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
#, c-format
msgid "With basic documentation (recommended!)"
msgstr "உதவி நூல்களுடன் (குறைந்தபட்சம் இது தேவை!)"
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
#, c-format
msgid "Truly minimal install (especially no urpmi)"
msgstr "மிகச்சிறிய நிறுவல்(urpmi கூட கிடையாது)"
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
#, c-format
msgid "Preparing installation"
msgstr "நிறுவுதல் தொடங்குகிறது"
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
#, c-format
msgid "Installing package %s"
msgstr "%s பொதி நிறுவப்படுகிறது"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "There was an error ordering packages:"
msgstr "பொதிகளை அடுக்குவதில் பிழை நேர்ந்துள்ளது"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "Go on anyway?"
msgstr "தொடர்ந்து செல்லலாமா?"
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
#, c-format
msgid "Retry"
msgstr ""
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
#, c-format
msgid "Skip this package"
msgstr ""
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
#, c-format
msgid "Skip all packages from medium \"%s\""
msgstr ""
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
#, fuzzy, c-format
msgid "Go back to media and packages selection"
msgstr "பொதித் தேர்ைவச் சேமி"
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
#, fuzzy, c-format
msgid "There was an error installing package %s."
msgstr "பொதிகளை நிறுவுவதில் பிழை நேர்ந்துள்ளது"
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
#, c-format
msgid "Post-install configuration"
msgstr "நிறுவியபின் சேய்ய வேண்டிய வடிவமைப்புகள்"
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
#, c-format
msgid "Please ensure the Update Modules media is in drive %s"
msgstr ""
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
#, c-format
msgid "Updates"
msgstr "புதுப்பித்தல்கள்"
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
#, c-format
msgid ""
"You now have the opportunity to download updated packages. These packages\n"
@@ -1298,96 +1247,96 @@ msgstr ""
"\n"
"இவற்ைற நிறுவ விருப்பமா ?"
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
#, c-format
msgid "%s on %s"
msgstr "%s இல் %s"
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
#, c-format
msgid "Hardware"
msgstr "வன்பொருள்"
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
#, c-format
msgid "Sound card"
msgstr "ஒலியட்ைட"
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
#, c-format
msgid "Do you have an ISA sound card?"
msgstr "உங்களிடம் ISA ஒலியட்ைட ஏதேனும் உள்ளனவா?"
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
#, fuzzy, c-format
msgid ""
"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
"card"
msgstr "\"sndconfig\" என்ற நிரல் மூலம் உங்கள் ஒலியட்ைடயை வடிவமைக்க முடியும்"
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
#, c-format
msgid "No sound card detected. Try \"harddrake\" after installation"
msgstr ""
"ஒலியட்ைட ஏதும் கண்டுபிடிக்க முடியவில்ைல. டிரேக்வன்ெபாருள் மாயாவியை பயன்படுத்துங்கள்"
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
#, c-format
msgid "Graphical interface"
msgstr "வரைவியல்வழி"
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
#, c-format
msgid "Network & Internet"
msgstr "வலையமைப்பும் இணையமும்"
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
#, fuzzy, c-format
msgid "Proxies"
msgstr "பயனர்குறிப்பு: "
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
#, fuzzy, c-format
msgid "configured"
msgstr "மறுவடிவமை"
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
#, c-format
msgid "Security Level"
msgstr "பாதுகாப்பு நிலை"
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
#, c-format
msgid "Firewall"
msgstr "நெருப்புச்சுவர்"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, fuzzy, c-format
msgid "activated"
msgstr "இப்போது துவக்கு"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "disabled"
msgstr "முடமாக்கப்பட்டுள்ளது"
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
#, c-format
msgid "You have not configured X. Are you sure you really want this?"
msgstr ""
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
#, c-format
msgid "Preparing bootloader..."
msgstr "துவங்குநிரலை உருவாக்குகிறேன்..."
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
#, c-format
msgid "Be patient, this may take a while..."
msgstr ""
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
#, fuzzy, c-format
msgid ""
"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1396,24 +1345,24 @@ msgid ""
"root fs is: root=%s"
msgstr "தயவுசெய்து நிறுவுவதற்கு ஆங்கிலத்ைத பயன்படுத்துங்கள்"
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
#, c-format
msgid ""
"In this security level, access to the files in the Windows partition is "
"restricted to the administrator."
msgstr ""
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr "வெற்று நெகிழ்வட்ைட %s இயக்கியில் உள்ளிடவும்"
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
#, c-format
msgid "Creating auto install floppy..."
msgstr "தானியங்கி நிறுவல்வட்ைட உருவாக்கவும்"
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
#, c-format
msgid ""
"Some steps are not completed.\n"
@@ -1424,7 +1373,7 @@ msgstr ""
"\n"
"நீங்கள் நிச்சயம் நிறுவுதலை விட்டு வெளியேற விரும்புகிறீர்களா?"
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
#, c-format
msgid "Congratulations"
msgstr "வாழ்த்துக்கள்"
@@ -1568,6 +1517,10 @@ msgid ""
"Exit"
msgstr "வெளிச்ெசல்"
+#, fuzzy
+#~ msgid "Downloading file %s..."
+#~ msgstr "கோப்புகளைக் கண்டுபிடி "
+
#~ msgid ""
#~ "You have selected the following server(s): %s\n"
#~ "\n"
diff --git a/perl-install/install/share/po/tg.po b/perl-install/install/share/po/tg.po
index 3f14c3b7e..796bf2de4 100644
--- a/perl-install/install/share/po/tg.po
+++ b/perl-install/install/share/po/tg.po
@@ -16,7 +16,7 @@ msgid ""
msgstr ""
"Project-Id-Version: DrakX-tg\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
"PO-Revision-Date: 2005-09-17 16:03+0500\n"
"Last-Translator: Victor Ibragimov <youth_opportunities@tajikngo.org>\n"
"Language-Team: Tajik\n"
@@ -25,31 +25,6 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.10\n"
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr ""
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr ""
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr ""
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr ""
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr ""
-
#: any.pm:109
#, c-format
msgid "Do you have further supplementary media?"
@@ -85,17 +60,17 @@ msgstr "Шабака (FTP)"
msgid "Network (NFS)"
msgstr "Шабакаи (NFS)"
-#: any.pm:163
+#: any.pm:165
#, c-format
msgid "URL of the mirror?"
msgstr "URL-и оина?"
-#: any.pm:169
+#: any.pm:171
#, c-format
msgid "URL must start with ftp:// or http://"
msgstr ""
-#: any.pm:180
+#: any.pm:182
#, c-format
msgid ""
"Contacting Mandriva Linux web site to get the list of available mirrors..."
@@ -103,7 +78,7 @@ msgstr ""
"Барои ба даст даровардани рӯйхати қуттиҳои дастрас пайвастшавӣ ба Mandriva "
"Linuxweb site ба роҳ монда шудааст..."
-#: any.pm:185
+#: any.pm:187
#, fuzzy, c-format
msgid ""
"Failed contacting Mandriva Linux web site to get the list of available "
@@ -112,70 +87,70 @@ msgstr ""
"Барои ба даст даровардани рӯйхати қуттиҳои дастрас пайвастшавӣ ба Mandriva "
"Linuxweb site ба роҳ монда шудааст..."
-#: any.pm:195
+#: any.pm:197
#, c-format
msgid "Choose a mirror from which to get the packages"
msgstr "Оинаро интихоб намоед, ки аз он қуттиҳоро гирифта мешавад"
-#: any.pm:225
+#: any.pm:227
#, c-format
msgid "NFS setup"
msgstr "Танзими NFS"
-#: any.pm:226
+#: any.pm:228
#, c-format
msgid "Please enter the hostname and directory of your NFS media"
msgstr ""
-#: any.pm:230
+#: any.pm:232
#, c-format
msgid "Hostname missing"
msgstr ""
-#: any.pm:231
+#: any.pm:233
#, c-format
msgid "Directory must begin with \"/\""
msgstr ""
-#: any.pm:235
+#: any.pm:237
#, c-format
msgid "Hostname of the NFS mount ?"
msgstr ""
-#: any.pm:236
+#: any.pm:238
#, c-format
msgid "Directory"
msgstr "Феҳрист"
-#: any.pm:258
+#: any.pm:260
#, c-format
msgid "Supplementary"
msgstr ""
-#: any.pm:293
+#: any.pm:295
#, c-format
msgid ""
"Can't find a package list file on this mirror. Make sure the location is "
"correct."
msgstr "Пайдо кардани файли hdlist дар ин оина нашуда истодааст."
-#: any.pm:328
+#: any.pm:334
#, c-format
msgid "Looking at packages already installed..."
msgstr ""
"Ҷустуҷи бастаи барномаҳои аллакай коргузорӣ шуда иҷро шуда истодааст..."
-#: any.pm:362
+#: any.pm:368
#, c-format
msgid "Finding packages to upgrade..."
msgstr "Ҷустуҷӯи қуттиҳо барои нав намудан иҷро мешавад..."
-#: any.pm:381
+#: any.pm:387
#, c-format
msgid "Removing packages prior to upgrade..."
msgstr ""
-#: any.pm:402
+#: any.pm:408
#, c-format
msgid ""
"You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -187,18 +162,18 @@ msgid ""
"please reboot your system and upgrade using the Mandriva update applet."
msgstr ""
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
#, c-format
msgid "Reboot"
msgstr "Бозхудборшавӣ"
-#: any.pm:407
+#: any.pm:413
#, c-format
msgid "Proceed"
msgstr ""
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -212,72 +187,72 @@ msgstr ""
"\n"
"Дар ҳақиқат мехоҳед, ки ин бастаи барномаҳоро хориҷ кунед?\n"
-#: any.pm:815
+#: any.pm:821
#, c-format
msgid "Error reading file %s"
msgstr "Хатогӣ ҳангоми хониши файл %s"
-#: any.pm:1022
+#: any.pm:1028
#, fuzzy, c-format
msgid "The following disk(s) were renamed:"
msgstr "- %s хориҷ карда шуд\n"
-#: any.pm:1024
+#: any.pm:1030
#, c-format
msgid "%s (previously named as %s)"
msgstr ""
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "HTTP"
msgstr "HTTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "FTP"
msgstr "FTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "NFS"
msgstr "NFS"
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
#, c-format
msgid "Network"
msgstr "Шабака"
-#: any.pm:1104
+#: any.pm:1110
#, fuzzy, c-format
msgid "Please choose a media"
msgstr "Илтимос интихоб кунед"
-#: any.pm:1120
+#: any.pm:1126
#, c-format
msgid "File already exists. Overwrite it?"
msgstr "Файл аллакай вуҷуд дорад. Истифода барем?"
-#: any.pm:1124
+#: any.pm:1130
#, c-format
msgid "Permission denied"
msgstr "Рухсат инкор шуд"
-#: any.pm:1172
+#: any.pm:1178
#, c-format
msgid "Bad NFS name"
msgstr ""
-#: any.pm:1193
+#: any.pm:1199
#, fuzzy, c-format
msgid "Bad media %s"
msgstr "миёнаи иловашуда %s"
-#: any.pm:1236
+#: any.pm:1242
#, c-format
msgid "Can not make screenshots before partitioning"
msgstr "Сохтани экранаксҳо пеш аз тақсимкунӣ номумкин"
-#: any.pm:1244
+#: any.pm:1250
#, c-format
msgid "Screenshots will be available after install in %s"
msgstr "ЭкранАксҳо баъд аз коргузориш дар %s дастрас мешаванд"
@@ -288,11 +263,15 @@ msgid "Installation"
msgstr "Коргузорӣ шуда истодааст"
#: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
#, c-format
msgid "Configuration"
msgstr "Батанзимдарорӣ"
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
#: install2.pm:168
#, c-format
msgid "You must also format %s"
@@ -318,22 +297,22 @@ msgstr "Шабака оварда мешавад"
msgid "Bringing down the network"
msgstr "Шабака фаромада истодааст"
-#: media.pm:402
+#: media.pm:399
#, c-format
msgid "Please wait, retrieving file"
msgstr ""
-#: media.pm:734
-#, fuzzy, c-format
-msgid "Downloading file %s..."
-msgstr "Файлҳо фиристода шуда истодааст..."
+#: media.pm:718
+#, c-format
+msgid "unable to add medium"
+msgstr ""
-#: media.pm:822
+#: media.pm:758
#, c-format
msgid "Copying some packages on disks for future use"
msgstr ""
-#: media.pm:875
+#: media.pm:811
#, fuzzy, c-format
msgid "Copying in progress"
msgstr "Муаяйнкунӣ дар раванди иҷроиш қарор дорад"
@@ -375,27 +354,27 @@ msgstr ""
msgid "An error occurred:"
msgstr "Хатогӣ рух дод"
-#: pkgs.pm:776
+#: pkgs.pm:780
#, c-format
msgid "%d installation transactions failed"
msgstr "%d коргузорӣ амалӣ нагардид"
-#: pkgs.pm:777
+#: pkgs.pm:781
#, fuzzy, c-format
msgid "Installation of packages failed:"
msgstr "Интихоби синфи коргузорӣ"
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
#, c-format
msgid "Workstation"
msgstr "Истгоҳи корӣ"
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
#, c-format
msgid "Office Workstation"
msgstr "Истгоҳи Кории Идораӣ"
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
#, c-format
msgid ""
"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -405,7 +384,7 @@ msgstr ""
"ҷадвалҳои густурда (OpenOffice.org Calc, Kspread), азназаргузарҳои PDF ва "
"ғайра"
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
#, c-format
msgid ""
"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -414,32 +393,32 @@ msgstr ""
"Барномаҳои идораӣ: пардозандаи матнӣ (kword, abiword), ҷадвалҳои густурда "
"(kspread, gnumeric), pdf баррасҳо ва ғайра"
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
#, c-format
msgid "Game station"
msgstr "Истгоҳи бозӣ"
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
#, c-format
msgid "Amusement programs: arcade, boards, strategy, etc"
msgstr "Барномаҳои шавқовар: аркадаҳо, бозиҳои рӯи мизӣ, стратегия ва ғайра"
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
#, c-format
msgid "Multimedia station"
msgstr "Истгоҳи бисёрмуҳита"
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
#, c-format
msgid "Sound and video playing/editing programs"
msgstr "Барномаҳо барои бозикунии/таҳрири овоз ва видео"
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
#, c-format
msgid "Internet station"
msgstr "Истгоҳи Интернет"
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
#, c-format
msgid ""
"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -448,211 +427,193 @@ msgstr ""
"Маҷмӯи асбобҳо барои хондан ва фиристодани пост ва ахборот (mutt, tin..) ва "
"баррасии Web"
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
#, c-format
msgid "Network Computer (client)"
msgstr "Компютери Шабакавӣ (мизоҷ)"
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
#, c-format
msgid "Clients for different protocols including ssh"
msgstr "Мизоҷон барои қарордодҳои гуногун, аз он ҷумла ssh"
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
#, c-format
msgid "Tools to ease the configuration of your computer"
msgstr "Асбобҳо барои осоннамоии танзими компютери шумо"
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
#, c-format
msgid "Console Tools"
msgstr "Асбобҳои Нозиргоҳ"
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
#, c-format
msgid "Editors, shells, file tools, terminals"
msgstr "Муҳаррирон, пардозандаи фармонҳо, асбобҳои файлӣ, поёнаҳо"
#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
#, c-format
msgid "Development"
msgstr "Коркард"
#: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
#, c-format
msgid "C and C++ development libraries, programs and include files"
msgstr "Китобхонаи коркарди C ва C++, барномаҳо ва файлҳои дохилшаванда"
#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
#, c-format
msgid "Documentation"
msgstr "Санадсозӣ"
#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
#, c-format
msgid "Books and Howto's on Linux and Free Software"
msgstr "Китобҳо ва Чӣ тавр дар Linux ва Таъминоти Барномавии Озод"
#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
#, c-format
msgid "LSB"
msgstr "LSB"
#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
#, c-format
msgid "Linux Standard Base. Third party applications support"
msgstr "Манбаи Низоммеъёри Linux. Пуштибонии замимаҳои коргардонони сеюм"
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
#, c-format
msgid "Web Server"
msgstr "Хидматгори Веб"
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
#, c-format
msgid "Apache"
msgstr "Apache"
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
#, c-format
msgid "Groupware"
msgstr "Groupware"
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
#, c-format
msgid "Kolab Server"
msgstr "Хидматрасони Kolab"
#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
#, c-format
msgid "Firewall/Router"
msgstr "Фейрвол/Масиргузор"
#: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
#, c-format
msgid "Internet gateway"
msgstr "Даричаи тадохули Интернет"
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
#, c-format
msgid "Mail/News"
msgstr "Пост/Ахборот"
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
#, c-format
msgid "Postfix mail server, Inn news server"
msgstr "Хидматрасони постии Postfix, Inn хидматрасони ахборотӣ"
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
#, c-format
msgid "Directory Server"
msgstr "Хидматрасони Феҳрист"
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
#, c-format
msgid "FTP Server"
msgstr "Хидматрасони FTP"
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
#, c-format
msgid "ProFTPd"
msgstr "ProFTPd"
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
#, c-format
msgid "DNS/NIS"
msgstr "DNS/NIS"
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
#, c-format
msgid "Domain Name and Network Information Server"
msgstr "Номи Доменӣ ва Хидматрасони Ахбороти Шабакавӣ"
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
#, c-format
msgid "File and Printer Sharing Server"
msgstr "Хидматрасони Истифодабарандаи Файл ва Чопгар"
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
#, c-format
msgid "NFS Server, Samba server"
msgstr "Хидматрасони NFS, хидматрасони Samba"
#: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
#, c-format
msgid "Database"
msgstr "Манбаи маълумот"
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
#, c-format
msgid "PostgreSQL and MySQL Database Server"
msgstr "PostgreSQL ва MySQL Хидматрасони Манбаи Додаҳо"
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
#, c-format
msgid "Web/FTP"
msgstr "Web/FTP"
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
#, c-format
msgid "Apache, Pro-ftpd"
msgstr "Apache, Pro-ftpd"
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
#, c-format
msgid "Mail"
msgstr "Пост"
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
#, c-format
msgid "Postfix mail server"
msgstr "Хидматрасони пости Postfix"
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
#, c-format
msgid "PostgreSQL or MySQL database server"
msgstr "Хидматрасони манбаи маълумоти PostgreSQL ё MySQL"
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
#, c-format
msgid "Network Computer server"
msgstr "Хидматрасони Компютери Шабакавӣ"
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
#, c-format
msgid "NFS server, SMB server, Proxy server, ssh server"
msgstr "NFS хидматрасон, SMB хидматрасон, Proxy хидматрасон, ssh хидматрасон"
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
#, c-format
msgid "Graphical Environment"
msgstr "Муҳити Графикӣ"
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
#, c-format
msgid "KDE Workstation"
msgstr "Истгоҳи кории KDE"
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
#, c-format
msgid ""
"The K Desktop Environment, the basic graphical environment with a collection "
@@ -660,12 +621,12 @@ msgid ""
msgstr ""
"K Муҳити Мизи Корӣ, ин муҳити графикии асосӣ бо маҷмӯи асбобҳои ҳамроҳкунанда"
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
#, c-format
msgid "GNOME Workstation"
msgstr "Истгоҳи кории Gnome"
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
#, c-format
msgid ""
"A graphical environment with user-friendly set of applications and desktop "
@@ -674,7 +635,7 @@ msgstr ""
"Муҳити графикӣ бо маҷмӯи замимаҳо ва мизи кории бо корванд иртиботи дӯстона "
"дошта"
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
#, fuzzy, c-format
msgid "LXDE Desktop"
msgstr "Мизи Кории Ғалатёб"
@@ -688,54 +649,52 @@ msgstr ""
"Муҳити графикӣ бо маҷмӯи замимаҳо ва мизи кории бо корванд иртиботи дӯстона "
"дошта"
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
#, c-format
msgid "Other Graphical Desktops"
msgstr "Дигар Мизҳои Кории Графикӣ"
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
#, fuzzy, c-format
msgid "Window Maker, Enlightenment, Fvwm, etc"
msgstr "Icewm, Window Maker, Enlightenment, Fvwm, ва ғайра"
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
#, c-format
msgid "Utilities"
msgstr "Дастгоҳҳо"
#: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
#, c-format
msgid "SSH Server"
msgstr "Хидматгори SSH"
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
#, c-format
msgid "Webmin"
msgstr "Webmin"
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
#, c-format
msgid "Webmin Remote Configuration Server"
msgstr "Батанзимдарори Хидматрасони Дурдасти Webmin"
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
#, c-format
msgid "Network Utilities/Monitoring"
msgstr "Дастгоҳҳои Шабака/Дидабонӣ"
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
#, c-format
msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
msgstr "Дидабонии асбобҳо, ҳисоботи ҷараёнҳо, tcpdump, nmap, ..."
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
#, c-format
msgid "Mandriva Wizards"
msgstr "Устодҳои Mandriva"
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
#, c-format
msgid "Wizards to configure server"
msgstr "Устод барои танзимдарории хидматрасон"
@@ -836,17 +795,17 @@ msgstr ""
msgid "Click on images in order to see a bigger preview"
msgstr ""
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
#, c-format
msgid "Package Group Selection"
msgstr "Интихоби Гурӯҳи Қуттиҳо"
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
#, c-format
msgid "Individual package selection"
msgstr "Интихоби қуттиҳои алоҳида"
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
#, c-format
msgid "Total size: %d / %d MB"
msgstr "Андозаи умумӣ: %d / %d MB"
@@ -967,12 +926,12 @@ msgstr "Коргузории хурдтарин"
msgid "Software Management"
msgstr "Идоракунии Нармафзор"
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
#, c-format
msgid "Choose the packages you want to install"
msgstr "Бастаи барномаҳоеро, ки коргузорӣ кардан мехоҳед, интихоб намоед"
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
#, c-format
msgid "Installing"
msgstr "Коргузорӣ шуда истодааст"
@@ -999,7 +958,7 @@ msgid_plural "%d packages"
msgstr[0] "%d қуттиҳо"
msgstr[1] "%d қуттиҳо"
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
#, c-format
msgid "Summary"
msgstr "Ҷамбаст"
@@ -1009,7 +968,7 @@ msgstr "Ҷамбаст"
msgid "Configure"
msgstr "Танзим додан"
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
#, c-format
msgid "not configured"
msgstr "танзимдода нашуда"
@@ -1019,7 +978,7 @@ msgstr "танзимдода нашуда"
msgid "Media Selection"
msgstr "Интихоби Гурӯҳи Қуттиҳо"
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
#, c-format
msgid ""
"The following installation media have been found.\n"
@@ -1029,7 +988,7 @@ msgstr ""
"Агар баъзеи онҳоро партофтан хоҳед, онҳоро дар айни замон интихоб накарда "
"метавонед."
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
#, c-format
msgid ""
"You have the option to copy the contents of the CDs onto the hard drive "
@@ -1038,7 +997,7 @@ msgid ""
"available once the system is fully installed."
msgstr ""
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
#, c-format
msgid "Copy whole CDs"
msgstr ""
@@ -1058,59 +1017,49 @@ msgstr "Лутфан, ороиши забонакро интихоб кунед"
msgid "Here is the full list of available keyboards:"
msgstr "Дар ин ҷо рӯйхати пурраи забонакҳои имконпазир дода шудааст"
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
#, c-format
msgid "Install/Upgrade"
msgstr "Кор гузоштан/Афзоиш додан"
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
#, c-format
msgid "Is this an install or an upgrade?"
msgstr "Ин коргузорӣ аст ё навсозӣ?"
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
#, fuzzy, c-format
msgid ""
"_: This is a noun:\n"
"Install"
msgstr "Коргузоштан"
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
#, c-format
msgid "Upgrade %s"
msgstr "Афзоиш %s"
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
#, c-format
msgid "Encryption key for %s"
msgstr "Дагмаи рамздошта барои %s"
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
#, c-format
msgid "Cancel installation, reboot system"
msgstr ""
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
#, fuzzy, c-format
msgid "New Installation"
msgstr "Коргузорӣ шуда истодааст"
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
#, c-format
msgid "Upgrade previous installation (not recommended)"
msgstr ""
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
#, c-format
msgid ""
"Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1122,17 +1071,17 @@ msgid ""
"Installation\"."
msgstr ""
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "IDE"
msgstr "IDE"
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "Configuring IDE"
msgstr "IDE ба танзим дароварда мешавад"
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
#, c-format
msgid ""
"No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1142,7 +1091,7 @@ msgstr ""
"кард, аммо барои худборшавии систем ба шумо лозим аст, то ки қисми "
"худборшавии авваларо дар DiskDrake офаред"
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
#, c-format
msgid ""
"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1153,7 +1102,7 @@ msgstr ""
"давом хоҳад кард, аммо барои худборшавии систем ба шумо лозим аст, то ки "
"қисми худборшавии авваларо дар DiskDrake офаред"
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
#, c-format
msgid ""
"Change your Cd-Rom!\n"
@@ -1168,19 +1117,19 @@ msgstr ""
"Агар шумо онро надошта бошед, барои радкунии коргузорӣ аз ин Cd-Rom, Бекор "
"карданро пахш кунед."
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
#, c-format
msgid "Looking for available packages..."
msgstr "Қуттиҳои дастрасшаванда ҷустуҷӯ карда мешавад..."
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
#, c-format
msgid ""
"Your system does not have enough space left for installation or upgrade (%"
"dMB > %dMB)"
msgstr ""
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
#, fuzzy, c-format
msgid ""
"Please choose load or save package selection.\n"
@@ -1189,52 +1138,52 @@ msgstr ""
"Лутфан интихоби кор андохтан ё нигоҳ доштанро дар дискет ба роҳ монед.\n"
"Шаклбандӣ ҳамон хел аст ҳамчун дискетҳое ки бо auto_install офарида шудааст."
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Load"
msgstr "Боркунӣ"
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Save"
msgstr "Нигоҳ доштан"
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
#, fuzzy, c-format
msgid "Bad file"
msgstr "Пурбокунии файлҳо"
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
#, fuzzy, c-format
msgid "KDE"
msgstr "IDE"
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
#, c-format
msgid "GNOME"
msgstr "GNOME"
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
#, fuzzy, c-format
msgid "Desktop Selection"
msgstr "Интихоби Гурӯҳи Қуттиҳо"
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
#, c-format
msgid "You can choose your workstation desktop profile."
msgstr ""
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
#, c-format
msgid "Selected size is larger than available space"
msgstr "Андозаи интихобшуда аз ҷои дастрасшуда зиёд аст"
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
#, c-format
msgid "Type of install"
msgstr "Навъи коргузорӣ"
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
#, c-format
msgid ""
"You have not selected any group of packages.\n"
@@ -1243,82 +1192,82 @@ msgstr ""
"Шумо ягон гурӯҳи қуттиҳоро интихоб накардед.\n"
"Лутфан, коргузории пастарини дилхоҳатонро интихоб намоед:"
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
#, c-format
msgid "With X"
msgstr "Бо X"
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
#, c-format
msgid "With basic documentation (recommended!)"
msgstr "Бо санадсозии асосӣ (маслиҳат дода мешавад!)"
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
#, c-format
msgid "Truly minimal install (especially no urpmi)"
msgstr "Дар ҳақиқат коргузории хурдтарин (алалхусус ғайри urpmi)"
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
#, c-format
msgid "Preparing installation"
msgstr "Коргузорӣ тайёр шуда истодааст"
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
#, c-format
msgid "Installing package %s"
msgstr ""
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "There was an error ordering packages:"
msgstr "Ҳангоми ба даст даровардани қуттиҳо хатогие рӯй дод:"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "Go on anyway?"
msgstr "Ба ҳар ҳол давом диҳам?"
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
#, c-format
msgid "Retry"
msgstr ""
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
#, c-format
msgid "Skip this package"
msgstr ""
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
#, c-format
msgid "Skip all packages from medium \"%s\""
msgstr ""
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
#, fuzzy, c-format
msgid "Go back to media and packages selection"
msgstr "Интихоби қуттиҳоро нигоҳ доштан"
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
#, fuzzy, c-format
msgid "There was an error installing package %s."
msgstr "Ҳангоми коргузории қуттиҳо хатогӣ пайдо гардид:"
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
#, c-format
msgid "Post-install configuration"
msgstr "Баъд аз пайкарабандӣ коргузорӣ мегардад"
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
#, c-format
msgid "Please ensure the Update Modules media is in drive %s"
msgstr ""
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
#, c-format
msgid "Updates"
msgstr "Нав кардан"
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
#, c-format
msgid ""
"You now have the opportunity to download updated packages. These packages\n"
@@ -1341,28 +1290,28 @@ msgstr ""
"\n"
"Оё шумо хоҳиши коргузорӣ намудани ин навигариҳо ҳастед?"
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
#, c-format
msgid "%s on %s"
msgstr "%s дар %s"
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
#, c-format
msgid "Hardware"
msgstr "Сахтафзор"
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
#, c-format
msgid "Sound card"
msgstr "Корти овоздор"
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
#, c-format
msgid "Do you have an ISA sound card?"
msgstr "Шумо карти садои ISA доред?"
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
#, c-format
msgid ""
"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1371,68 +1320,68 @@ msgstr ""
"Барои батанзимдарории корти овозии шумо баъди коргузорӣ \"alsaconf\" ё "
"\"sndconfig\"-ро корандозӣ намоед"
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
#, c-format
msgid "No sound card detected. Try \"harddrake\" after installation"
msgstr ""
"Корти овозӣ муайян нагардид. \"harddrake\"-ро баъди коргузорӣ кӯшиш намоед"
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
#, c-format
msgid "Graphical interface"
msgstr "Интерфейси графикӣ"
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
#, c-format
msgid "Network & Internet"
msgstr "Шабака ва Интернет"
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
#, c-format
msgid "Proxies"
msgstr "Боваринок"
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
#, c-format
msgid "configured"
msgstr "танзимшуда"
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
#, c-format
msgid "Security Level"
msgstr "Сатҳи Амният"
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
#, c-format
msgid "Firewall"
msgstr "Фейрвол"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "activated"
msgstr "фаъолшуда"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "disabled"
msgstr "ғайрифаъол"
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
#, c-format
msgid "You have not configured X. Are you sure you really want this?"
msgstr "Шумо X-ро ба танзим надаровардаед. Шумо дар ҳақиқат инро мехоҳед?"
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
#, c-format
msgid "Preparing bootloader..."
msgstr "Корандози худборшави аввала тайёр мешавад..."
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
#, c-format
msgid "Be patient, this may take a while..."
msgstr ""
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
#, c-format
msgid ""
"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1445,7 +1394,7 @@ msgstr ""
"BootX ё ин ки воситаҳои дигарро барои худборшавии мошини худ истифода баред. "
"Нишонванди ҳаста барои решаи fs ин: root=%s"
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
#, c-format
msgid ""
"In this security level, access to the files in the Windows partition is "
@@ -1454,17 +1403,17 @@ msgstr ""
"Дар ин сатҳи бехатарӣ дастрасӣ ба файлҳо дар қисматҳои Windows таҳо ба "
"идоракунанда иҷозат дода мешаванд."
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr "Дискети холиро ба гардон дохил намоед %s"
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
#, c-format
msgid "Creating auto install floppy..."
msgstr "Диски нарми худкоргузорӣ офарида шуда истодааст..."
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
#, c-format
msgid ""
"Some steps are not completed.\n"
@@ -1475,7 +1424,7 @@ msgstr ""
"\n"
"Шумо дар ҳақиқат баромадан мехоҳед?"
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
#, c-format
msgid "Congratulations"
msgstr "Табрикот"
@@ -1619,6 +1568,10 @@ msgid ""
"Exit"
msgstr "Хуруҷ"
+#, fuzzy
+#~ msgid "Downloading file %s..."
+#~ msgstr "Файлҳо фиристода шуда истодааст..."
+
#~ msgid ""
#~ "You have selected the following server(s): %s\n"
#~ "\n"
diff --git a/perl-install/install/share/po/th.po b/perl-install/install/share/po/th.po
index 978e91bd9..baf849492 100644
--- a/perl-install/install/share/po/th.po
+++ b/perl-install/install/share/po/th.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: DrakX\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
"PO-Revision-Date: 2001-09-10 14:24GMT+7\n"
"Last-Translator: Wachara Chinsettawong <wachara@yahoo.com>\n"
"Language-Team: Thai <th@li.org>\n"
@@ -16,31 +16,6 @@ msgstr ""
"X-Generator: KBabel 0.9.5\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr ""
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr ""
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr ""
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr ""
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr ""
-
#: any.pm:109
#, fuzzy, c-format
msgid "Do you have further supplementary media?"
@@ -76,92 +51,92 @@ msgstr "Network interface"
msgid "Network (NFS)"
msgstr ""
-#: any.pm:163
+#: any.pm:165
#, c-format
msgid "URL of the mirror?"
msgstr ""
-#: any.pm:169
+#: any.pm:171
#, c-format
msgid "URL must start with ftp:// or http://"
msgstr ""
-#: any.pm:180
+#: any.pm:182
#, fuzzy, c-format
msgid ""
"Contacting Mandriva Linux web site to get the list of available mirrors..."
msgstr "กำลังติดต่อกับมิลเรอร์ไซต์เพื่อหารายการของแพ็คเก็จที่มีให้"
-#: any.pm:185
+#: any.pm:187
#, fuzzy, c-format
msgid ""
"Failed contacting Mandriva Linux web site to get the list of available "
"mirrors"
msgstr "กำลังติดต่อกับมิลเรอร์ไซต์เพื่อหารายการของแพ็คเก็จที่มีให้"
-#: any.pm:195
+#: any.pm:197
#, c-format
msgid "Choose a mirror from which to get the packages"
msgstr "เลือกมิลเรอร์ไซต์ที่จะใช้ในการดาวน์โหลดแพ็คเก็จ"
-#: any.pm:225
+#: any.pm:227
#, c-format
msgid "NFS setup"
msgstr ""
-#: any.pm:226
+#: any.pm:228
#, c-format
msgid "Please enter the hostname and directory of your NFS media"
msgstr ""
-#: any.pm:230
+#: any.pm:232
#, c-format
msgid "Hostname missing"
msgstr ""
-#: any.pm:231
+#: any.pm:233
#, c-format
msgid "Directory must begin with \"/\""
msgstr ""
-#: any.pm:235
+#: any.pm:237
#, c-format
msgid "Hostname of the NFS mount ?"
msgstr ""
-#: any.pm:236
+#: any.pm:238
#, c-format
msgid "Directory"
msgstr "สารบัญ"
-#: any.pm:258
+#: any.pm:260
#, c-format
msgid "Supplementary"
msgstr ""
-#: any.pm:293
+#: any.pm:295
#, fuzzy, c-format
msgid ""
"Can't find a package list file on this mirror. Make sure the location is "
"correct."
msgstr "Adapter %s: %s"
-#: any.pm:328
+#: any.pm:334
#, fuzzy, c-format
msgid "Looking at packages already installed..."
msgstr "คุณไม่สามารถไม่เลือกแพกเกจนี้เพราะมันได้ถูกติดตั้งไปแล้ว"
-#: any.pm:362
+#: any.pm:368
#, c-format
msgid "Finding packages to upgrade..."
msgstr "กำลังหาแพ็คเก็จที่จะทำการอัพเกรด"
-#: any.pm:381
+#: any.pm:387
#, c-format
msgid "Removing packages prior to upgrade..."
msgstr ""
-#: any.pm:402
+#: any.pm:408
#, c-format
msgid ""
"You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -173,18 +148,18 @@ msgid ""
"please reboot your system and upgrade using the Mandriva update applet."
msgstr ""
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
#, c-format
msgid "Reboot"
msgstr ""
-#: any.pm:407
+#: any.pm:413
#, c-format
msgid "Proceed"
msgstr ""
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -193,72 +168,72 @@ msgid ""
"Do you really want to remove these packages?\n"
msgstr ""
-#: any.pm:815
+#: any.pm:821
#, c-format
msgid "Error reading file %s"
msgstr "มีปัญหากับการอ่านข้อมูลในไฟล์ %s"
-#: any.pm:1022
+#: any.pm:1028
#, fuzzy, c-format
msgid "The following disk(s) were renamed:"
msgstr "แพ็คเก็จเหล่านี้กำลังจะถูกติดตั้ง"
-#: any.pm:1024
+#: any.pm:1030
#, c-format
msgid "%s (previously named as %s)"
msgstr ""
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "HTTP"
msgstr "HTTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "FTP"
msgstr "FTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "NFS"
msgstr "NFS"
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
#, c-format
msgid "Network"
msgstr "ระบบเครือข่าย"
-#: any.pm:1104
+#: any.pm:1110
#, fuzzy, c-format
msgid "Please choose a media"
msgstr "กรุณาเลือก"
-#: any.pm:1120
+#: any.pm:1126
#, fuzzy, c-format
msgid "File already exists. Overwrite it?"
msgstr "ไฟล์มีอยู่แล้ว ต้องการใช้?"
-#: any.pm:1124
+#: any.pm:1130
#, c-format
msgid "Permission denied"
msgstr "สิทธิการทำงานถูกปฎิเสท"
-#: any.pm:1172
+#: any.pm:1178
#, c-format
msgid "Bad NFS name"
msgstr ""
-#: any.pm:1193
+#: any.pm:1199
#, fuzzy, c-format
msgid "Bad media %s"
msgstr "อุปกรณ์ที่ถูกเพิ่มเข้ามา %s"
-#: any.pm:1236
+#: any.pm:1242
#, fuzzy, c-format
msgid "Can not make screenshots before partitioning"
msgstr "โปรแกรมไม่สามารถเพิ่มพาร์ติชั่นได้อีก"
-#: any.pm:1244
+#: any.pm:1250
#, fuzzy, c-format
msgid "Screenshots will be available after install in %s"
msgstr "คุณสามารถเลือกภาษาอื่นซึ่งจะสามารถใช้ได้หลังติดตั้ง"
@@ -269,11 +244,15 @@ msgid "Installation"
msgstr "กำลังติดตั้ง"
#: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
#, c-format
msgid "Configuration"
msgstr "ปรับแต่งค่า"
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
#: install2.pm:168
#, c-format
msgid "You must also format %s"
@@ -298,22 +277,22 @@ msgstr "ระบบเน็ตเวิร์กกำลังจะทำง
msgid "Bringing down the network"
msgstr "ระบบเน็ตเวิร์กกำลังจะหยุดทำงาน"
-#: media.pm:402
+#: media.pm:399
#, c-format
msgid "Please wait, retrieving file"
msgstr ""
-#: media.pm:734
-#, fuzzy, c-format
-msgid "Downloading file %s..."
-msgstr "บันทึกลงไฟล์"
+#: media.pm:718
+#, c-format
+msgid "unable to add medium"
+msgstr ""
-#: media.pm:822
+#: media.pm:758
#, c-format
msgid "Copying some packages on disks for future use"
msgstr ""
-#: media.pm:875
+#: media.pm:811
#, fuzzy, c-format
msgid "Copying in progress"
msgstr "ค้นหาเจอบน port %s"
@@ -355,296 +334,278 @@ msgstr ""
msgid "An error occurred:"
msgstr "มีปัญหาเกิดขึ้น"
-#: pkgs.pm:776
+#: pkgs.pm:780
#, fuzzy, c-format
msgid "%d installation transactions failed"
msgstr "การติดตั้งไม่สำเร็จ"
-#: pkgs.pm:777
+#: pkgs.pm:781
#, fuzzy, c-format
msgid "Installation of packages failed:"
msgstr "กำลังติดตั้งแพ็คเก็จ %s"
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
#, fuzzy, c-format
msgid "Workstation"
msgstr "Workstation ที่ทำงาน"
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
#, c-format
msgid "Office Workstation"
msgstr "Workstation ที่ทำงาน"
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
#, c-format
msgid ""
"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
msgstr ""
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
#, c-format
msgid ""
"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
"gnumeric), pdf viewers, etc"
msgstr ""
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
#, fuzzy, c-format
msgid "Game station"
msgstr "Workstation ที่ทำงาน"
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
#, c-format
msgid "Amusement programs: arcade, boards, strategy, etc"
msgstr ""
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
#, fuzzy, c-format
msgid "Multimedia station"
msgstr "Multimedia - เขียน CD "
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
#, c-format
msgid "Sound and video playing/editing programs"
msgstr ""
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
#, fuzzy, c-format
msgid "Internet station"
msgstr "การเชื่อมต่อกับ Internet แบบ sharing"
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
#, fuzzy, c-format
msgid ""
"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
"Web"
msgstr "เครื่องมือในการอ่านและส่ง mail และ news (pine, mutt, tin..) และท่องอินเตอร์เน็ต"
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
#, fuzzy, c-format
msgid "Network Computer (client)"
msgstr "เครื่องพิมพ์ในระบบ Network (Socket)"
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
#, c-format
msgid "Clients for different protocols including ssh"
msgstr "Clients for different protocols including ssh"
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
#, c-format
msgid "Tools to ease the configuration of your computer"
msgstr "เครืองมือที่ช่วยในการปรับแต่งเครื่องชองคุณให้ง่ายขึ้น"
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
#, fuzzy, c-format
msgid "Console Tools"
msgstr "ปิด"
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
#, c-format
msgid "Editors, shells, file tools, terminals"
msgstr ""
#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
#, c-format
msgid "Development"
msgstr "พัฒนาซอฟท์แวร์ (Development)"
#: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
#, c-format
msgid "C and C++ development libraries, programs and include files"
msgstr ""
#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
#, c-format
msgid "Documentation"
msgstr "คู่มือ"
#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
#, c-format
msgid "Books and Howto's on Linux and Free Software"
msgstr ""
#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
#, c-format
msgid "LSB"
msgstr ""
#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
#, c-format
msgid "Linux Standard Base. Third party applications support"
msgstr ""
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
#, fuzzy, c-format
msgid "Web Server"
msgstr "เซิร์ฟเวอร์"
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
#, c-format
msgid "Apache"
msgstr ""
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
#, fuzzy, c-format
msgid "Groupware"
msgstr "เวิร์กกรุ๊ป (workgroup)"
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
#, fuzzy, c-format
msgid "Kolab Server"
msgstr "เซิร์ฟเวอร์ NIS"
#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
#, c-format
msgid "Firewall/Router"
msgstr ""
#: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
#, fuzzy, c-format
msgid "Internet gateway"
msgstr "การติดต่อ internet"
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
#, fuzzy, c-format
msgid "Mail/News"
msgstr "/ไฟล์/_ใหม่"
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
#, fuzzy, c-format
msgid "Postfix mail server, Inn news server"
msgstr "ชื่อเซิร์ฟเวอร์ของพรินเตอร์"
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
#, fuzzy, c-format
msgid "Directory Server"
msgstr "เรียกคืนจากแผ่นฟล้อปปี้"
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
#, fuzzy, c-format
msgid "FTP Server"
msgstr "เซิร์ฟเวอร์ NIS"
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
#, c-format
msgid "ProFTPd"
msgstr ""
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
#, fuzzy, c-format
msgid "DNS/NIS"
msgstr "ใช้ NIS"
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
#, fuzzy, c-format
msgid "Domain Name and Network Information Server"
msgstr "ชื่อโดเมน"
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
#, fuzzy, c-format
msgid "File and Printer Sharing Server"
msgstr "ชื่อเซิร์ฟเวอร์ของพรินเตอร์"
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
#, fuzzy, c-format
msgid "NFS Server, Samba server"
msgstr "เซิร์ฟเวอร์ NIS"
#: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
#, c-format
msgid "Database"
msgstr "ฐานข้อมูล"
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
#, c-format
msgid "PostgreSQL and MySQL Database Server"
msgstr ""
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
#, c-format
msgid "Web/FTP"
msgstr ""
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
#, c-format
msgid "Apache, Pro-ftpd"
msgstr ""
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
#, c-format
msgid "Mail"
msgstr "จดหมาย"
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
#, fuzzy, c-format
msgid "Postfix mail server"
msgstr "ชื่อเซิร์ฟเวอร์ของพรินเตอร์"
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
#, c-format
msgid "PostgreSQL or MySQL database server"
msgstr ""
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
#, fuzzy, c-format
msgid "Network Computer server"
msgstr "เครื่องพิมพ์ในระบบ Network (Socket)"
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
#, c-format
msgid "NFS server, SMB server, Proxy server, ssh server"
msgstr ""
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
#, c-format
msgid "Graphical Environment"
msgstr "การทำงานแบบกราฟฟิก"
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
#, fuzzy, c-format
msgid "KDE Workstation"
msgstr "Workstation ที่ทำงาน"
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
#, c-format
msgid ""
"The K Desktop Environment, the basic graphical environment with a collection "
"of accompanying tools"
msgstr ""
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
#, fuzzy, c-format
msgid "GNOME Workstation"
msgstr "Workstation ที่ทำงาน"
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
#, c-format
msgid ""
"A graphical environment with user-friendly set of applications and desktop "
"tools"
msgstr ""
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
#, fuzzy, c-format
msgid "LXDE Desktop"
msgstr "พื้นที่ทำงาน"
@@ -656,54 +617,52 @@ msgid ""
"applications and desktop tools"
msgstr ""
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
#, c-format
msgid "Other Graphical Desktops"
msgstr "Graphical Desktops อื่นๆ"
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
#, c-format
msgid "Window Maker, Enlightenment, Fvwm, etc"
msgstr ""
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
#, c-format
msgid "Utilities"
msgstr "อรรถประโยชน์"
#: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
#, fuzzy, c-format
msgid "SSH Server"
msgstr "เซิร์ฟเวอร์ NIS"
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
#, fuzzy, c-format
msgid "Webmin"
msgstr "อุปกรณ์"
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
#, fuzzy, c-format
msgid "Webmin Remote Configuration Server"
msgstr "การคอนฟิก Internet"
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
#, fuzzy, c-format
msgid "Network Utilities/Monitoring"
msgstr "การคอนฟิกระบบเน็ตเวิร์ก"
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
#, c-format
msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
msgstr ""
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
#, fuzzy, c-format
msgid "Mandriva Wizards"
msgstr "Control Center"
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
#, fuzzy, c-format
msgid "Wizards to configure server"
msgstr "การคอนฟิกเครื่องพิมพ์"
@@ -802,17 +761,17 @@ msgstr ""
msgid "Click on images in order to see a bigger preview"
msgstr ""
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
#, c-format
msgid "Package Group Selection"
msgstr "เลือกกลุ่มแพ็คเก็จ"
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
#, c-format
msgid "Individual package selection"
msgstr "Individual package selection"
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
#, c-format
msgid "Total size: %d / %d MB"
msgstr "ขนาดรวม: %d / %d MB "
@@ -929,12 +888,12 @@ msgstr "ออกจากการติดตั้ง"
msgid "Software Management"
msgstr "การบริหารโปรแกรม"
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
#, c-format
msgid "Choose the packages you want to install"
msgstr "เลือกแพ็คเก็จที่คุณต้องการติดตั้ง"
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
#, c-format
msgid "Installing"
msgstr "กำลังติดตั้ง"
@@ -960,7 +919,7 @@ msgid "%d package"
msgid_plural "%d packages"
msgstr[0] "แพ็คเก็จ %d ชุด"
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
#, c-format
msgid "Summary"
msgstr "รวมความ"
@@ -970,7 +929,7 @@ msgstr "รวมความ"
msgid "Configure"
msgstr "การปรับแต่ง"
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
#, fuzzy, c-format
msgid "not configured"
msgstr "คอนฟิกใหม่"
@@ -980,14 +939,14 @@ msgstr "คอนฟิกใหม่"
msgid "Media Selection"
msgstr "เลือกกลุ่มแพ็คเก็จ"
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
#, c-format
msgid ""
"The following installation media have been found.\n"
"If you want to skip some of them, you can unselect them now."
msgstr ""
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
#, c-format
msgid ""
"You have the option to copy the contents of the CDs onto the hard drive "
@@ -996,7 +955,7 @@ msgid ""
"available once the system is fully installed."
msgstr ""
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
#, c-format
msgid "Copy whole CDs"
msgstr ""
@@ -1016,59 +975,49 @@ msgstr "คุณต้องการเลือกคีย์บอร์ด
msgid "Here is the full list of available keyboards:"
msgstr "ต่อไปนี้คือ keyboard ที่ใช้ได้"
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
#, fuzzy, c-format
msgid "Install/Upgrade"
msgstr "ติดตั้ง/อัพเกรด "
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
#, fuzzy, c-format
msgid "Is this an install or an upgrade?"
msgstr "นี่เป็นการติดตั้งหรือการอัพเกรด"
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
#, fuzzy, c-format
msgid ""
"_: This is a noun:\n"
"Install"
msgstr "ติดตั้ง"
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
#, fuzzy, c-format
msgid "Upgrade %s"
msgstr "Update"
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
#, fuzzy, c-format
msgid "Encryption key for %s"
msgstr "รหัสผ่านไม่เหมือนกัน"
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
#, c-format
msgid "Cancel installation, reboot system"
msgstr ""
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
#, fuzzy, c-format
msgid "New Installation"
msgstr "กำลังติดตั้ง"
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
#, c-format
msgid "Upgrade previous installation (not recommended)"
msgstr ""
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
#, c-format
msgid ""
"Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1080,24 +1029,24 @@ msgid ""
"Installation\"."
msgstr ""
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "IDE"
msgstr "IDE"
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "Configuring IDE"
msgstr "คอนฟิก IDE"
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
#, c-format
msgid ""
"No free space for 1MB bootstrap! Install will continue, but to boot your "
"system, you'll need to create the bootstrap partition in DiskDrake"
msgstr ""
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
#, c-format
msgid ""
"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1105,7 +1054,7 @@ msgid ""
"DiskDrake"
msgstr ""
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
#, c-format
msgid ""
"Change your Cd-Rom!\n"
@@ -1118,153 +1067,153 @@ msgstr ""
"กรุณาใส่ CD-ROM \"%s\" และกด OK\n"
"ถ้่าคุณไม่มี กรุณากด ยกเลิก (cancel) เพื่อหลีกเลี่ยงการติดตั้งจาก CD-ROM นี้"
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
#, c-format
msgid "Looking for available packages..."
msgstr "กำลังหาแพ็คเก็จที่มีอยู่"
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
#, c-format
msgid ""
"Your system does not have enough space left for installation or upgrade (%"
"dMB > %dMB)"
msgstr ""
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
#, c-format
msgid ""
"Please choose load or save package selection.\n"
"The format is the same as auto_install generated files."
msgstr ""
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Load"
msgstr "โหลด"
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Save"
msgstr "บันทึก"
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
#, fuzzy, c-format
msgid "Bad file"
msgstr "เปิดแฟ้ม"
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
#, fuzzy, c-format
msgid "KDE"
msgstr "IDE"
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
#, c-format
msgid "GNOME"
msgstr "GNOME"
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
#, fuzzy, c-format
msgid "Desktop Selection"
msgstr "เลือกกลุ่มแพ็คเก็จ"
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
#, c-format
msgid "You can choose your workstation desktop profile."
msgstr ""
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
#, c-format
msgid "Selected size is larger than available space"
msgstr ""
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
#, c-format
msgid "Type of install"
msgstr ""
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
#, c-format
msgid ""
"You have not selected any group of packages.\n"
"Please choose the minimal installation you want:"
msgstr ""
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
#, c-format
msgid "With X"
msgstr ""
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
#, c-format
msgid "With basic documentation (recommended!)"
msgstr ""
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
#, c-format
msgid "Truly minimal install (especially no urpmi)"
msgstr ""
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
#, c-format
msgid "Preparing installation"
msgstr "กำลังเตรียมการติดตั้ง"
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
#, c-format
msgid "Installing package %s"
msgstr "กำลังติดตั้งแพ็คเก็จ %s"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "There was an error ordering packages:"
msgstr "มีปัญหาการลำดับของแพ็คเก็จ:"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "Go on anyway?"
msgstr "ทำงานต่อหรือไม่?"
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
#, c-format
msgid "Retry"
msgstr ""
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
#, c-format
msgid "Skip this package"
msgstr ""
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
#, c-format
msgid "Skip all packages from medium \"%s\""
msgstr ""
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
#, fuzzy, c-format
msgid "Go back to media and packages selection"
msgstr "บันทึกกลุ่มแพ็คเก็จที่เลือก"
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
#, fuzzy, c-format
msgid "There was an error installing package %s."
msgstr "มีปัญหาการติดตั้งของแพ็คเก็จ:"
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
#, c-format
msgid "Post-install configuration"
msgstr "การคอนฟิกหลังการติดตั้ง"
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
#, c-format
msgid "Please ensure the Update Modules media is in drive %s"
msgstr ""
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
#, fuzzy, c-format
msgid "Updates"
msgstr "อัพเดท"
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
#, c-format
msgid ""
"You now have the opportunity to download updated packages. These packages\n"
@@ -1277,95 +1226,95 @@ msgid ""
"Do you want to install the updates?"
msgstr ""
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
#, c-format
msgid "%s on %s"
msgstr "%s บน %s"
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
#, c-format
msgid "Hardware"
msgstr "ฮาร์ดแวร์"
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
#, c-format
msgid "Sound card"
msgstr "Sound card"
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
#, fuzzy, c-format
msgid "Do you have an ISA sound card?"
msgstr "คุณมีอันอื่นๆอีกหรือไม่?"
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
#, c-format
msgid ""
"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
"card"
msgstr ""
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
#, c-format
msgid "No sound card detected. Try \"harddrake\" after installation"
msgstr ""
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
#, fuzzy, c-format
msgid "Graphical interface"
msgstr "ให้เป็นกราฟฟิคเมื่อเริ่มต้น"
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
#, c-format
msgid "Network & Internet"
msgstr "เน็ตเวิร์คกับอินเตอร์เน็ต"
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
#, fuzzy, c-format
msgid "Proxies"
msgstr "Profile: "
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
#, fuzzy, c-format
msgid "configured"
msgstr "คอนฟิกใหม่"
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
#, c-format
msgid "Security Level"
msgstr "ระดับความปลอดภัย"
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
#, c-format
msgid "Firewall"
msgstr ""
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, fuzzy, c-format
msgid "activated"
msgstr "แอ็คทีฟ"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "disabled"
msgstr "ไม่ใช้งาน"
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
#, c-format
msgid "You have not configured X. Are you sure you really want this?"
msgstr ""
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
#, c-format
msgid "Preparing bootloader..."
msgstr "กำลังเตรียมบูตโหลดเดอร์"
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
#, c-format
msgid "Be patient, this may take a while..."
msgstr ""
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
#, c-format
msgid ""
"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1374,24 +1323,24 @@ msgid ""
"root fs is: root=%s"
msgstr ""
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
#, c-format
msgid ""
"In this security level, access to the files in the Windows partition is "
"restricted to the administrator."
msgstr ""
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr "ให้ใส่แผ่นฟล้อปปี้ลงในไดรว์ %s "
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
#, c-format
msgid "Creating auto install floppy..."
msgstr "กำลังเตรียมการติดตั้งลงบน floppy"
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
#, c-format
msgid ""
"Some steps are not completed.\n"
@@ -1402,7 +1351,7 @@ msgstr ""
"\n"
"คุณต้องการออกจากการติดตั้งจริงๆหรือไม่?"
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
#, fuzzy, c-format
msgid "Congratulations"
msgstr "ขอแสดงความยินดี"
@@ -1547,6 +1496,10 @@ msgid ""
msgstr "เลิกทำงาน"
#, fuzzy
+#~ msgid "Downloading file %s..."
+#~ msgstr "บันทึกลงไฟล์"
+
+#, fuzzy
#~ msgid "IceWm Desktop"
#~ msgstr "พื้นที่ทำงาน"
diff --git a/perl-install/install/share/po/tl.po b/perl-install/install/share/po/tl.po
index 7b6549173..dc7106bd1 100644
--- a/perl-install/install/share/po/tl.po
+++ b/perl-install/install/share/po/tl.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: DrakX-tl\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
"PO-Revision-Date: 2004-09-15 13:35+0200\n"
"Last-Translator: Arys P. Deloso <arys@deloso.org>\n"
"Language-Team: Filipino <salinpinoy@comitus.net>\n"
@@ -16,31 +16,6 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.3\n"
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr ""
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr ""
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr ""
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr ""
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr ""
-
#: any.pm:109
#, fuzzy, c-format
msgid "Do you have further supplementary media?"
@@ -76,17 +51,17 @@ msgstr "Network %s"
msgid "Network (NFS)"
msgstr ""
-#: any.pm:163
+#: any.pm:165
#, c-format
msgid "URL of the mirror?"
msgstr ""
-#: any.pm:169
+#: any.pm:171
#, c-format
msgid "URL must start with ftp:// or http://"
msgstr ""
-#: any.pm:180
+#: any.pm:182
#, c-format
msgid ""
"Contacting Mandriva Linux web site to get the list of available mirrors..."
@@ -94,7 +69,7 @@ msgstr ""
"Nakikipag-alam sa web site ng Mandriva Linux para makuha ang talaan ng mga "
"available na mirror..."
-#: any.pm:185
+#: any.pm:187
#, fuzzy, c-format
msgid ""
"Failed contacting Mandriva Linux web site to get the list of available "
@@ -103,69 +78,69 @@ msgstr ""
"Nakikipag-alam sa web site ng Mandriva Linux para makuha ang talaan ng mga "
"available na mirror..."
-#: any.pm:195
+#: any.pm:197
#, c-format
msgid "Choose a mirror from which to get the packages"
msgstr "Pumili ng mirror kung saan kukunin ang mga package"
-#: any.pm:225
+#: any.pm:227
#, c-format
msgid "NFS setup"
msgstr ""
-#: any.pm:226
+#: any.pm:228
#, c-format
msgid "Please enter the hostname and directory of your NFS media"
msgstr ""
-#: any.pm:230
+#: any.pm:232
#, c-format
msgid "Hostname missing"
msgstr ""
-#: any.pm:231
+#: any.pm:233
#, c-format
msgid "Directory must begin with \"/\""
msgstr ""
-#: any.pm:235
+#: any.pm:237
#, c-format
msgid "Hostname of the NFS mount ?"
msgstr ""
-#: any.pm:236
+#: any.pm:238
#, c-format
msgid "Directory"
msgstr "Directory"
-#: any.pm:258
+#: any.pm:260
#, c-format
msgid "Supplementary"
msgstr ""
-#: any.pm:293
+#: any.pm:295
#, fuzzy, c-format
msgid ""
"Can't find a package list file on this mirror. Make sure the location is "
"correct."
msgstr "Hindi mahanap ang %s sa %s"
-#: any.pm:328
+#: any.pm:334
#, c-format
msgid "Looking at packages already installed..."
msgstr "Naghahanap ng mga package na naka-install..."
-#: any.pm:362
+#: any.pm:368
#, c-format
msgid "Finding packages to upgrade..."
msgstr "Naghahanap ng mga package na i-a-upgrade..."
-#: any.pm:381
+#: any.pm:387
#, c-format
msgid "Removing packages prior to upgrade..."
msgstr ""
-#: any.pm:402
+#: any.pm:408
#, c-format
msgid ""
"You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -177,18 +152,18 @@ msgid ""
"please reboot your system and upgrade using the Mandriva update applet."
msgstr ""
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
#, c-format
msgid "Reboot"
msgstr "I-reboot"
-#: any.pm:407
+#: any.pm:413
#, c-format
msgid "Proceed"
msgstr ""
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -202,72 +177,72 @@ msgstr ""
"\n"
"Gusto ninyo ba talagang tanggalin ang mga package na ito?\n"
-#: any.pm:815
+#: any.pm:821
#, c-format
msgid "Error reading file %s"
msgstr "May error sa pagbabasa ng file na %s"
-#: any.pm:1022
+#: any.pm:1028
#, fuzzy, c-format
msgid "The following disk(s) were renamed:"
msgstr "- %s ay tinanggal\n"
-#: any.pm:1024
+#: any.pm:1030
#, c-format
msgid "%s (previously named as %s)"
msgstr ""
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "HTTP"
msgstr ""
-#: any.pm:1081
+#: any.pm:1087
#, fuzzy, c-format
msgid "FTP"
msgstr "gFTP"
-#: any.pm:1081
+#: any.pm:1087
#, fuzzy, c-format
msgid "NFS"
msgstr "PFS"
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
#, c-format
msgid "Network"
msgstr "Network"
-#: any.pm:1104
+#: any.pm:1110
#, fuzzy, c-format
msgid "Please choose a media"
msgstr "Pumili ka"
-#: any.pm:1120
+#: any.pm:1126
#, fuzzy, c-format
msgid "File already exists. Overwrite it?"
msgstr "Mayroon ng file. Gamitin ito?"
-#: any.pm:1124
+#: any.pm:1130
#, c-format
msgid "Permission denied"
msgstr "Pahintulot ipinagkaila"
-#: any.pm:1172
+#: any.pm:1178
#, c-format
msgid "Bad NFS name"
msgstr ""
-#: any.pm:1193
+#: any.pm:1199
#, fuzzy, c-format
msgid "Bad media %s"
msgstr "idinagdag ang medium na %s"
-#: any.pm:1236
+#: any.pm:1242
#, c-format
msgid "Can not make screenshots before partitioning"
msgstr "Hindi makagawa ng mga screenshot bago mag-partisyon"
-#: any.pm:1244
+#: any.pm:1250
#, c-format
msgid "Screenshots will be available after install in %s"
msgstr "Ang mga screenshot ay magiging available matapos ang install sa %s"
@@ -278,11 +253,15 @@ msgid "Installation"
msgstr "Nag-i-install"
#: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
#, c-format
msgid "Configuration"
msgstr "Configuration"
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
#: install2.pm:168
#, c-format
msgid "You must also format %s"
@@ -308,22 +287,22 @@ msgstr "Ginagawang \"up\" ang network"
msgid "Bringing down the network"
msgstr "Ginagawang \"down\" ang network"
-#: media.pm:402
+#: media.pm:399
#, c-format
msgid "Please wait, retrieving file"
msgstr ""
-#: media.pm:734
-#, fuzzy, c-format
-msgid "Downloading file %s..."
-msgstr "Ipinapadala ang mga file..."
+#: media.pm:718
+#, c-format
+msgid "unable to add medium"
+msgstr ""
-#: media.pm:822
+#: media.pm:758
#, c-format
msgid "Copying some packages on disks for future use"
msgstr ""
-#: media.pm:875
+#: media.pm:811
#, fuzzy, c-format
msgid "Copying in progress"
msgstr "Tumatakbo ang pagtitiktik"
@@ -365,27 +344,27 @@ msgstr ""
msgid "An error occurred:"
msgstr "May \"error\" na nangyari"
-#: pkgs.pm:776
+#: pkgs.pm:780
#, c-format
msgid "%d installation transactions failed"
msgstr "%d transaksyong pag-i-install ay nabigo"
-#: pkgs.pm:777
+#: pkgs.pm:781
#, fuzzy, c-format
msgid "Installation of packages failed:"
msgstr "Ini-install ang package na %s"
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
#, c-format
msgid "Workstation"
msgstr "Workstation"
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
#, c-format
msgid "Office Workstation"
msgstr "Pang-opisina na Workstation"
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
#, c-format
msgid ""
"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -394,7 +373,7 @@ msgstr ""
"Mga pang-opisinang program: mga wordprocessor (OpenOffice.org Writer, "
"Kword), mga spreadsheet (OpenOffice.org Calc, Kspread), mga pdf viewer, etc"
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
#, c-format
msgid ""
"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -403,32 +382,32 @@ msgstr ""
"Mga pang-opisinang program: mga wordprocessor (kword, abiword), mga "
"spreadsheet (kspread, gnumeric), mga pdf viewer, etc"
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
#, c-format
msgid "Game station"
msgstr "Pang-laro na istasyon"
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
#, c-format
msgid "Amusement programs: arcade, boards, strategy, etc"
msgstr "Mga nakakalibang na program: arcade, mga board game, strategy, etc"
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
#, c-format
msgid "Multimedia station"
msgstr "Pang-multimedia na istasyon"
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
#, c-format
msgid "Sound and video playing/editing programs"
msgstr "Mga program na pang-play/edit ng tunog, musika at video"
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
#, c-format
msgid "Internet station"
msgstr "Pang-internet na istasyon"
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
#, c-format
msgid ""
"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -437,211 +416,193 @@ msgstr ""
"Kumpol ng mga kagamitang pangbasa at pangsulat ng mail at news (mutt, tin..) "
"at pang-browse ng Web"
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
#, c-format
msgid "Network Computer (client)"
msgstr "Network Computer (client)"
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
#, c-format
msgid "Clients for different protocols including ssh"
msgstr "Mga client para sa iba't-ibang mga protocol kasama ang ssh"
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
#, c-format
msgid "Tools to ease the configuration of your computer"
msgstr "Kagamitang pangpadali ng configuration ng inyong computer"
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
#, c-format
msgid "Console Tools"
msgstr "Kagamitang Pang-Console"
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
#, c-format
msgid "Editors, shells, file tools, terminals"
msgstr "Mga editor, shell, file tool, terminal"
#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
#, c-format
msgid "Development"
msgstr "Paglinang (Development)"
#: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
#, c-format
msgid "C and C++ development libraries, programs and include files"
msgstr "mga C at C++ development library, program at include file"
#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
#, c-format
msgid "Documentation"
msgstr "Dokumentasyon"
#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
#, c-format
msgid "Books and Howto's on Linux and Free Software"
msgstr "Mga Libro at Howto tungkol sa Linux at Free Software"
#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
#, c-format
msgid "LSB"
msgstr "LSB"
#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
#, c-format
msgid "Linux Standard Base. Third party applications support"
msgstr "Linux Standard Base. Suporta para sa mga third party application"
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
#, c-format
msgid "Web Server"
msgstr "Web Server"
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
#, c-format
msgid "Apache"
msgstr "Apache"
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
#, c-format
msgid "Groupware"
msgstr "Groupware"
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
#, c-format
msgid "Kolab Server"
msgstr "Kolab Server"
#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
#, c-format
msgid "Firewall/Router"
msgstr "Firewall/Router"
#: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
#, c-format
msgid "Internet gateway"
msgstr "Internet gateway"
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
#, fuzzy, c-format
msgid "Mail/News"
msgstr "/File/_Bago"
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
#, fuzzy, c-format
msgid "Postfix mail server, Inn news server"
msgstr "Postfix mail server"
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
#, fuzzy, c-format
msgid "Directory Server"
msgstr "Directory Kung Saan Kukunin ang Ibabalik"
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
#, c-format
msgid "FTP Server"
msgstr "FTP Server"
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
#, c-format
msgid "ProFTPd"
msgstr ""
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
#, fuzzy, c-format
msgid "DNS/NIS"
msgstr "DNS"
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
#, fuzzy, c-format
msgid "Domain Name and Network Information Server"
msgstr "Domain Name Server"
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
#, fuzzy, c-format
msgid "File and Printer Sharing Server"
msgstr "Printer Server"
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
#, c-format
msgid "NFS Server, Samba server"
msgstr "NFS server, Samba server"
#: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
#, c-format
msgid "Database"
msgstr "Database"
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
#, fuzzy, c-format
msgid "PostgreSQL and MySQL Database Server"
msgstr "PostgreSQL o MySQL database server"
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
#, c-format
msgid "Web/FTP"
msgstr "Web/FTP"
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
#, c-format
msgid "Apache, Pro-ftpd"
msgstr "Apache, Pro-ftpd"
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
#, c-format
msgid "Mail"
msgstr "Mail"
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
#, c-format
msgid "Postfix mail server"
msgstr "Postfix mail server"
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
#, c-format
msgid "PostgreSQL or MySQL database server"
msgstr "PostgreSQL o MySQL database server"
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
#, c-format
msgid "Network Computer server"
msgstr "Network Computer server"
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
#, c-format
msgid "NFS server, SMB server, Proxy server, ssh server"
msgstr "NFS server, SMB server, Proxy server, ssh server"
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
#, c-format
msgid "Graphical Environment"
msgstr "Graphical na Kapaligiran"
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
#, c-format
msgid "KDE Workstation"
msgstr "KDE Workstation"
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
#, c-format
msgid ""
"The K Desktop Environment, the basic graphical environment with a collection "
@@ -650,12 +611,12 @@ msgstr ""
"Ang K Desktop Environment, ang pinakabatayang graphical environment na may "
"koleksyon ng mga kasabay na kagamitan"
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
#, c-format
msgid "GNOME Workstation"
msgstr "GNOME Workstation"
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
#, c-format
msgid ""
"A graphical environment with user-friendly set of applications and desktop "
@@ -664,7 +625,7 @@ msgstr ""
"Isang graphical environment na may kumpol ng mga user-friendly (madaling "
"gamitin) na application at kagamitang pang-desktop"
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
#, fuzzy, c-format
msgid "LXDE Desktop"
msgstr "Desktop"
@@ -678,54 +639,52 @@ msgstr ""
"Isang graphical environment na may kumpol ng mga user-friendly (madaling "
"gamitin) na application at kagamitang pang-desktop"
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
#, c-format
msgid "Other Graphical Desktops"
msgstr "Ibang Mga Graphical Desktop"
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
#, fuzzy, c-format
msgid "Window Maker, Enlightenment, Fvwm, etc"
msgstr "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
#, fuzzy, c-format
msgid "Utilities"
msgstr "Philippines"
#: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
#, c-format
msgid "SSH Server"
msgstr "SSH Server"
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
#, fuzzy, c-format
msgid "Webmin"
msgstr "Webcam"
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
#, fuzzy, c-format
msgid "Webmin Remote Configuration Server"
msgstr "Configuration ng Terminal Server"
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
#, fuzzy, c-format
msgid "Network Utilities/Monitoring"
msgstr "Pagmo-monitor ng Network"
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
#, c-format
msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
msgstr ""
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
#, fuzzy, c-format
msgid "Mandriva Wizards"
msgstr "<b>Mandriva Store</b>"
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
#, fuzzy, c-format
msgid "Wizards to configure server"
msgstr "Nabigong i-configure ang printer na \"%s\"!"
@@ -826,17 +785,17 @@ msgstr ""
msgid "Click on images in order to see a bigger preview"
msgstr ""
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
#, c-format
msgid "Package Group Selection"
msgstr "Pagpili ng Pangkat ng mga Package"
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
#, c-format
msgid "Individual package selection"
msgstr "Isa-isang pagpili ng package"
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
#, c-format
msgid "Total size: %d / %d MB"
msgstr "Kabuuang laki: %d / %d MB"
@@ -955,12 +914,12 @@ msgstr "Maliitang install"
msgid "Software Management"
msgstr "Pangangasiwa ng Software"
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
#, c-format
msgid "Choose the packages you want to install"
msgstr "Piliin ang mga package na gusto ninyong i-install"
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
#, c-format
msgid "Installing"
msgstr "Nag-i-install"
@@ -987,7 +946,7 @@ msgid_plural "%d packages"
msgstr[0] "%d mga package"
msgstr[1] "%d mga package"
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
#, c-format
msgid "Summary"
msgstr "Kabuuan"
@@ -997,7 +956,7 @@ msgstr "Kabuuan"
msgid "Configure"
msgstr "Configure"
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
#, c-format
msgid "not configured"
msgstr "hindi na-configure"
@@ -1007,14 +966,14 @@ msgstr "hindi na-configure"
msgid "Media Selection"
msgstr "Pagpili ng Pangkat ng mga Package"
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
#, c-format
msgid ""
"The following installation media have been found.\n"
"If you want to skip some of them, you can unselect them now."
msgstr ""
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
#, c-format
msgid ""
"You have the option to copy the contents of the CDs onto the hard drive "
@@ -1023,7 +982,7 @@ msgid ""
"available once the system is fully installed."
msgstr ""
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
#, c-format
msgid "Copy whole CDs"
msgstr ""
@@ -1043,59 +1002,49 @@ msgstr "Piliin ang inyong layout ng keyboard"
msgid "Here is the full list of available keyboards:"
msgstr "Narito ang buong talaan ng mga available na keyboard"
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
#, c-format
msgid "Install/Upgrade"
msgstr "I-install/I-upgrade"
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
#, c-format
msgid "Is this an install or an upgrade?"
msgstr "Ito ba ay install o upgrade?"
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
#, fuzzy, c-format
msgid ""
"_: This is a noun:\n"
"Install"
msgstr "I-install"
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
#, c-format
msgid "Upgrade %s"
msgstr "I-pgrade ang %s"
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
#, c-format
msgid "Encryption key for %s"
msgstr "Encryption key para sa %s"
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
#, c-format
msgid "Cancel installation, reboot system"
msgstr ""
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
#, fuzzy, c-format
msgid "New Installation"
msgstr "Nag-i-install"
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
#, c-format
msgid "Upgrade previous installation (not recommended)"
msgstr ""
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
#, c-format
msgid ""
"Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1107,17 +1056,17 @@ msgid ""
"Installation\"."
msgstr ""
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "IDE"
msgstr "IDE"
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "Configuring IDE"
msgstr "Kino-configure ang IDE"
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
#, c-format
msgid ""
"No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1127,7 +1076,7 @@ msgstr ""
"ma-boot ang inyong sistema, kailangan ninyong gumawa ng partisyon ng "
"bootstrap sa DiskDrake"
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
#, fuzzy, c-format
msgid ""
"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1138,7 +1087,7 @@ msgstr ""
"ma-boot ang inyong sistema, kailangan ninyong gumawa ng partisyon ng "
"bootstrap sa DiskDrake"
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
#, c-format
msgid ""
"Change your Cd-Rom!\n"
@@ -1152,19 +1101,19 @@ msgstr ""
"ang Ok pagkatapos. Kung wala kayo nito, pindutin ang Cancel para iwasang\n"
"mag-install mula sa CD-ROM na ito."
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
#, c-format
msgid "Looking for available packages..."
msgstr "Naghahanap ng mga available na package..."
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
#, c-format
msgid ""
"Your system does not have enough space left for installation or upgrade (%"
"dMB > %dMB)"
msgstr ""
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
#, fuzzy, c-format
msgid ""
"Please choose load or save package selection.\n"
@@ -1173,52 +1122,52 @@ msgstr ""
"Pakipili ang i-load o i-save ang pagpili ng package sa floppy.\n"
"Ang format ay katulad ng sa mga ginawang auto_install na floppy."
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, fuzzy, c-format
msgid "Load"
msgstr "XLoad"
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Save"
msgstr "I-save"
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
#, fuzzy, c-format
msgid "Bad file"
msgstr "I-load ang mga file"
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
#, fuzzy, c-format
msgid "KDE"
msgstr "IDE"
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
#, c-format
msgid "GNOME"
msgstr "GNOME"
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
#, fuzzy, c-format
msgid "Desktop Selection"
msgstr "Pagpili ng Pangkat ng mga Package"
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
#, c-format
msgid "You can choose your workstation desktop profile."
msgstr ""
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
#, c-format
msgid "Selected size is larger than available space"
msgstr "Ang piniling laki ay mas malaki sa available na puwang"
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
#, c-format
msgid "Type of install"
msgstr "Uri ng install"
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
#, c-format
msgid ""
"You have not selected any group of packages.\n"
@@ -1227,82 +1176,82 @@ msgstr ""
"Wala pa kayong napiling pangkat ng mga package.\n"
"Pakipili ang maliitang pag-i-install na gusto ninyo:"
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
#, c-format
msgid "With X"
msgstr "May X"
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
#, c-format
msgid "With basic documentation (recommended!)"
msgstr "May pinakabatayang dokumento (inirerekomenda!)"
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
#, c-format
msgid "Truly minimal install (especially no urpmi)"
msgstr "Talagang maliitang install (walang urpmi)"
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
#, c-format
msgid "Preparing installation"
msgstr "Inihahanda ang pag-i-install"
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
#, c-format
msgid "Installing package %s"
msgstr "Ini-install ang package na %s"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "There was an error ordering packages:"
msgstr "May error sa pagsasaayos ng mga package:"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "Go on anyway?"
msgstr "Magpatuloy pa rin?"
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
#, c-format
msgid "Retry"
msgstr ""
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
#, c-format
msgid "Skip this package"
msgstr ""
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
#, c-format
msgid "Skip all packages from medium \"%s\""
msgstr ""
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
#, fuzzy, c-format
msgid "Go back to media and packages selection"
msgstr "I-save ang mga piniling package"
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
#, fuzzy, c-format
msgid "There was an error installing package %s."
msgstr "May error sa pag-i-install ng mga package na:"
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
#, c-format
msgid "Post-install configuration"
msgstr "Configuration matapos ang install"
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
#, c-format
msgid "Please ensure the Update Modules media is in drive %s"
msgstr ""
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
#, c-format
msgid "Updates"
msgstr "Mga update"
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
#, c-format
msgid ""
"You now have the opportunity to download updated packages. These packages\n"
@@ -1325,28 +1274,28 @@ msgstr ""
"\n"
"Gusto ninyong i-install ang mga update ?"
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
#, c-format
msgid "%s on %s"
msgstr "%s sa %s"
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
#, c-format
msgid "Hardware"
msgstr "Hardware"
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
#, c-format
msgid "Sound card"
msgstr "Sound card"
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
#, c-format
msgid "Do you have an ISA sound card?"
msgstr "Mayroon ba kayong ISA na sound card?"
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
#, c-format
msgid ""
"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1355,70 +1304,70 @@ msgstr ""
"Patakbuhin ang \"alsaconf\" o \"sndconfig\" pagkatapos mag-install para i-"
"configure ang iyong sound card"
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
#, c-format
msgid "No sound card detected. Try \"harddrake\" after installation"
msgstr ""
"Walang natiktikang sound card. Subukan ang \"harddrake\" pagkatapos mag-"
"install"
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
#, c-format
msgid "Graphical interface"
msgstr "Graphical interface"
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
#, c-format
msgid "Network & Internet"
msgstr "Network & Internet"
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
#, c-format
msgid "Proxies"
msgstr "Mga Proxy"
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
#, c-format
msgid "configured"
msgstr "na-configure"
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
#, c-format
msgid "Security Level"
msgstr "Level ng Seguridad"
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
#, c-format
msgid "Firewall"
msgstr "Firewall"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "activated"
msgstr "na-activate"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "disabled"
msgstr "na-disable"
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
#, c-format
msgid "You have not configured X. Are you sure you really want this?"
msgstr ""
"Hindi pa ninyo na-configure ang X. Sigurado kayong gusto ninyong gawin ito?"
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
#, c-format
msgid "Preparing bootloader..."
msgstr "Inihahanda ang bootloader..."
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
#, c-format
msgid "Be patient, this may take a while..."
msgstr ""
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
#, fuzzy, c-format
msgid ""
"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1431,7 +1380,7 @@ msgstr ""
"Ang install ay magpapatuloy, ngunit kakailanganin ninyong\n"
"gamitin ang BootX o ibang paraan para i-boot ang inyong makina"
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
#, c-format
msgid ""
"In this security level, access to the files in the Windows partition is "
@@ -1440,17 +1389,17 @@ msgstr ""
"Sa level ng seguridad na ito, ang access sa mga file na nasa partisyon ng "
"Windows ay limitado sa tagapangasiwa."
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr "Magsuksok ng blangkong floppy sa drive %s"
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
#, c-format
msgid "Creating auto install floppy..."
msgstr "Lumilikha ng auto install floppy..."
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
#, c-format
msgid ""
"Some steps are not completed.\n"
@@ -1461,7 +1410,7 @@ msgstr ""
"\n"
"Gusto ninyo ba talagang sumuko ngayon?"
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
#, c-format
msgid "Congratulations"
msgstr "Maligayang bati"
@@ -1605,6 +1554,10 @@ msgid ""
"Exit"
msgstr "Exit"
+#, fuzzy
+#~ msgid "Downloading file %s..."
+#~ msgstr "Ipinapadala ang mga file..."
+
#~ msgid ""
#~ "You have selected the following server(s): %s\n"
#~ "\n"
diff --git a/perl-install/install/share/po/tr.po b/perl-install/install/share/po/tr.po
index 267d6221d..7464aac8f 100644
--- a/perl-install/install/share/po/tr.po
+++ b/perl-install/install/share/po/tr.po
@@ -18,7 +18,7 @@ msgid ""
msgstr ""
"Project-Id-Version: DrakX\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
"PO-Revision-Date: 2009-03-30 22:37+0300\n"
"Last-Translator: Atilla ÖNTAŞ <atilla_ontas@mandriva.org>\n"
"Language-Team: Turkish <cooker-i18n@mandrivalinux.org>\n"
@@ -28,31 +28,6 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Lokalize 0.3\n"
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr "Masaüstünüz bir USB anahtarı üzerinde"
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr "100%% açık kaynak Mandriva linux dağıtımı"
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr "Linux'u Mandriva One ile kolayca keşfedin"
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr "Tam bir Mandriva Linux masaüstü, destek dahil"
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr "Mandriva: herkesin ihtiyacına göre dağıtımlar"
-
#: any.pm:109
#, c-format
msgid "Do you have further supplementary media?"
@@ -92,17 +67,17 @@ msgstr "Ağ (FTP)"
msgid "Network (NFS)"
msgstr "Ağ (NFS)"
-#: any.pm:163
+#: any.pm:165
#, c-format
msgid "URL of the mirror?"
msgstr "Yansının URL bağlantısı?"
-#: any.pm:169
+#: any.pm:171
#, c-format
msgid "URL must start with ftp:// or http://"
msgstr "URL ftp:// veya http:// ile başlamak zorundadır."
-#: any.pm:180
+#: any.pm:182
#, c-format
msgid ""
"Contacting Mandriva Linux web site to get the list of available mirrors..."
@@ -110,7 +85,7 @@ msgstr ""
"Yansı adreslerini almak için Mandriva Linux web sayfasına bağlantı "
"kuruluyor..."
-#: any.pm:185
+#: any.pm:187
#, c-format
msgid ""
"Failed contacting Mandriva Linux web site to get the list of available "
@@ -119,47 +94,47 @@ msgstr ""
"Yansı adreslerini almak için Mandriva Linux web sayfasına bağlantı kurma "
"başarısız"
-#: any.pm:195
+#: any.pm:197
#, c-format
msgid "Choose a mirror from which to get the packages"
msgstr "Paketleri alacağınız bir yansı adresi seçiniz"
-#: any.pm:225
+#: any.pm:227
#, c-format
msgid "NFS setup"
msgstr "NFS kurulumu"
-#: any.pm:226
+#: any.pm:228
#, c-format
msgid "Please enter the hostname and directory of your NFS media"
msgstr "NFS kaynağı için bir sunucu adı ve dizini giriniz."
-#: any.pm:230
+#: any.pm:232
#, c-format
msgid "Hostname missing"
msgstr "Sunucu adı yok"
-#: any.pm:231
+#: any.pm:233
#, c-format
msgid "Directory must begin with \"/\""
msgstr "Dizin \"/\" ile başlamalıdır."
-#: any.pm:235
+#: any.pm:237
#, c-format
msgid "Hostname of the NFS mount ?"
msgstr "NFS bağı için sunucu adı?"
-#: any.pm:236
+#: any.pm:238
#, c-format
msgid "Directory"
msgstr "Dizin"
-#: any.pm:258
+#: any.pm:260
#, c-format
msgid "Supplementary"
msgstr "Tamamlayıcı"
-#: any.pm:293
+#: any.pm:295
#, c-format
msgid ""
"Can't find a package list file on this mirror. Make sure the location is "
@@ -168,22 +143,22 @@ msgstr ""
"Bu yansı üzerinde paket listesi bulunamadı. Yerinin doğru olduğundan emin "
"olun."
-#: any.pm:328
+#: any.pm:334
#, c-format
msgid "Looking at packages already installed..."
msgstr "Kurulu paketler inceleniyor..."
-#: any.pm:362
+#: any.pm:368
#, c-format
msgid "Finding packages to upgrade..."
msgstr "Yükseltilecek paketler bulunuyor"
-#: any.pm:381
+#: any.pm:387
#, c-format
msgid "Removing packages prior to upgrade..."
msgstr "Yükseltmeye hazırlık olmak üzere paketler kaldırılıyor..."
-#: any.pm:402
+#: any.pm:408
#, c-format
msgid ""
"You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -203,18 +178,18 @@ msgstr ""
"
lütfen sisteminizi yeniden başlatarak Mandriva güncelleme programcığını "
"kullanmak 
suretiyle yükseltme yapın."
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
#, c-format
msgid "Reboot"
msgstr "Yeniden başlat"
-#: any.pm:407
+#: any.pm:413
#, c-format
msgid "Proceed"
msgstr "Onayla"
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -227,72 +202,72 @@ msgstr ""
"\n"
"Bu paketleri kaldırmak istiyor musunuz?\n"
-#: any.pm:815
+#: any.pm:821
#, c-format
msgid "Error reading file %s"
msgstr "%s dosyası okunurken hata oluştu"
-#: any.pm:1022
+#: any.pm:1028
#, c-format
msgid "The following disk(s) were renamed:"
msgstr "Şu diskler yeniden adlandırılacak:"
-#: any.pm:1024
+#: any.pm:1030
#, c-format
msgid "%s (previously named as %s)"
msgstr "%s (eski adı %s)"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "HTTP"
msgstr "HTTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "FTP"
msgstr "FTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "NFS"
msgstr "NFS"
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
#, c-format
msgid "Network"
msgstr "Ağ"
-#: any.pm:1104
+#: any.pm:1110
#, c-format
msgid "Please choose a media"
msgstr "Lütfen bir medya seçin"
-#: any.pm:1120
+#: any.pm:1126
#, c-format
msgid "File already exists. Overwrite it?"
msgstr "Bu dosya zaten var. Üzerine yazılsın mı?"
-#: any.pm:1124
+#: any.pm:1130
#, c-format
msgid "Permission denied"
msgstr "İzin verilmedi"
-#: any.pm:1172
+#: any.pm:1178
#, c-format
msgid "Bad NFS name"
msgstr "Kötü NFS adı"
-#: any.pm:1193
+#: any.pm:1199
#, c-format
msgid "Bad media %s"
msgstr "Kötü veri kaynağı %s"
-#: any.pm:1236
+#: any.pm:1242
#, c-format
msgid "Can not make screenshots before partitioning"
msgstr "Disk bölümlemesi yapılmadan ekran örnekleri alınamaz."
-#: any.pm:1244
+#: any.pm:1250
#, c-format
msgid "Screenshots will be available after install in %s"
msgstr "Ekran örnekleri %s kurulduktan sonra mümkün olacak"
@@ -303,11 +278,15 @@ msgid "Installation"
msgstr "Kurulum"
#: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
#, c-format
msgid "Configuration"
msgstr "Yapılandırma"
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
#: install2.pm:168
#, c-format
msgid "You must also format %s"
@@ -332,22 +311,22 @@ msgstr "Ağ bağlanıyor"
msgid "Bringing down the network"
msgstr "Ağ ayrılıyor"
-#: media.pm:402
+#: media.pm:399
#, c-format
msgid "Please wait, retrieving file"
msgstr "Dosya alınıyor. Lütfen bekleyin"
-#: media.pm:734
+#: media.pm:718
#, c-format
-msgid "Downloading file %s..."
-msgstr "%s dosyası indiriliyor..."
+msgid "unable to add medium"
+msgstr ""
-#: media.pm:822
+#: media.pm:758
#, c-format
msgid "Copying some packages on disks for future use"
msgstr "Bazı paketler sonradan kullanım için disklere kopyalanıyor"
-#: media.pm:875
+#: media.pm:811
#, c-format
msgid "Copying in progress"
msgstr "Kopyalama sürüyor"
@@ -391,27 +370,27 @@ msgstr ""
msgid "An error occurred:"
msgstr "Bir hata oluştu:"
-#: pkgs.pm:776
+#: pkgs.pm:780
#, c-format
msgid "%d installation transactions failed"
msgstr "%d kurulum yönergesi başarısız oldu"
-#: pkgs.pm:777
+#: pkgs.pm:781
#, c-format
msgid "Installation of packages failed:"
msgstr "Paket kurulumu başarısız oldu:"
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
#, c-format
msgid "Workstation"
msgstr "İş istasyonu"
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
#, c-format
msgid "Office Workstation"
msgstr "Ofis iş istasyonu"
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
#, c-format
msgid ""
"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -420,7 +399,7 @@ msgstr ""
"Ofis programları: kelime işlemciler (OpenOffice.org Writer, Kword), "
"OpenOffice.org Calc, Kspread, pdf göstericiler, vb.."
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
#, c-format
msgid ""
"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -429,32 +408,32 @@ msgstr ""
"Ofis programları: kelime işlemciler (kword, abiword), kspread, gnumeric, pdf "
"göstericiler, vb.."
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
#, c-format
msgid "Game station"
msgstr "Oyun Konsolu"
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
#, c-format
msgid "Amusement programs: arcade, boards, strategy, etc"
msgstr "Eğlence programları: kart oyunları, taktik ve strateji, vb.."
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
#, c-format
msgid "Multimedia station"
msgstr "Çoklu ortam konsolu"
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
#, c-format
msgid "Sound and video playing/editing programs"
msgstr "Ses ve video çalma/düzenleme uygulamaları"
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
#, c-format
msgid "Internet station"
msgstr "Internet konsolu"
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
#, c-format
msgid ""
"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -463,223 +442,205 @@ msgstr ""
"E-posta alışverişi ve haber grubu istemci programları (pine, mutt, tin..) ve "
"web istemcileri "
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
#, c-format
msgid "Network Computer (client)"
msgstr "Ağ Makinası (client)"
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
#, c-format
msgid "Clients for different protocols including ssh"
msgstr "ssh içeren diğer ağ öğeleri için protokoller"
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
#, c-format
msgid "Tools to ease the configuration of your computer"
msgstr "Sisteminizin ayarlarını düzenleyecek uygulama"
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
#, c-format
msgid "Console Tools"
msgstr "Konsol Araçları"
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
#, c-format
msgid "Editors, shells, file tools, terminals"
msgstr "Metin düzenleyiciler, kabuklar, dosya araçları, terminaller"
#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
#, c-format
msgid "Development"
msgstr "Geliştirme"
#: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
#, c-format
msgid "C and C++ development libraries, programs and include files"
msgstr "C ve C++ geliştirme kütüphaneleri, programlar ve include dosyaları"
#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
#, c-format
msgid "Documentation"
msgstr "Belgeler"
#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
#, c-format
msgid "Books and Howto's on Linux and Free Software"
msgstr "Serbest Yazılım ve Linux üzerine Kitaplar ve Nasıl belgeleri"
#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
#, c-format
msgid "LSB"
msgstr "LSB"
#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
#, c-format
msgid "Linux Standard Base. Third party applications support"
msgstr "Linux Standartları Temeli. Üçüncü parti uygulama desteği"
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
#, c-format
msgid "Web Server"
msgstr "Web Sunucu"
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
#, c-format
msgid "Apache"
msgstr "Apache"
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
#, c-format
msgid "Groupware"
msgstr "Grup"
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
#, c-format
msgid "Kolab Server"
msgstr "Kolab Sunucu"
#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
#, c-format
msgid "Firewall/Router"
msgstr "Güvenlik Kalkanı/Router"
#: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
#, c-format
msgid "Internet gateway"
msgstr "Internet ağ geçidi"
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
#, c-format
msgid "Mail/News"
msgstr "Posta/Haber"
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
#, c-format
msgid "Postfix mail server, Inn news server"
msgstr "Postfix posta sunucu, Inn haber sunucu"
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
#, c-format
msgid "Directory Server"
msgstr "Dizin Sunucusu"
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
#, c-format
msgid "FTP Server"
msgstr "FTP sunucusu"
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
#, c-format
msgid "ProFTPd"
msgstr "ProFTPd"
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
#, c-format
msgid "DNS/NIS"
msgstr "DNS/NIS"
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
#, c-format
msgid "Domain Name and Network Information Server"
msgstr "Alan adı ve Ağ Bilgileri Sunucusu"
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
#, c-format
msgid "File and Printer Sharing Server"
msgstr "Dosya ve Yazdırma Paylaşım Sunucusu"
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
#, c-format
msgid "NFS Server, Samba server"
msgstr "NFS sunucu, Samba sunucu"
#: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
#, c-format
msgid "Database"
msgstr "Veritabanı"
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
#, c-format
msgid "PostgreSQL and MySQL Database Server"
msgstr "PostgreSQL veya MySQL veritabanı sunucusu"
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
#, c-format
msgid "Web/FTP"
msgstr "Web/FTP"
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
#, c-format
msgid "Apache, Pro-ftpd"
msgstr "Apache ve Pro-ftpd"
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
#, c-format
msgid "Mail"
msgstr "Posta"
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
#, c-format
msgid "Postfix mail server"
msgstr "Postfix posta sunucu"
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
#, c-format
msgid "PostgreSQL or MySQL database server"
msgstr "PostgreSQL veya MySQL veritabanı sunucusu"
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
#, c-format
msgid "Network Computer server"
msgstr "Ağ Makinası sunucusu"
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
#, c-format
msgid "NFS server, SMB server, Proxy server, ssh server"
msgstr "NFS sunucusu, SMB sunucusu, Vekil Sunucu, ssh Sunucu"
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
#, c-format
msgid "Graphical Environment"
msgstr "Grafik Ortamı"
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
#, c-format
msgid "KDE Workstation"
msgstr "KDE İş istasyonu"
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
#, c-format
msgid ""
"The K Desktop Environment, the basic graphical environment with a collection "
"of accompanying tools"
msgstr "KDE Masaüstü Ortamı, temel grafik ortamla birlikte birleşik araçlar"
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
#, c-format
msgid "GNOME Workstation"
msgstr "GNOME İş istasyonu"
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
#, c-format
msgid ""
"A graphical environment with user-friendly set of applications and desktop "
@@ -687,7 +648,7 @@ msgid ""
msgstr ""
"Kullanıcı dostu uygulamalar ve masaüstü araçlarına sahip görsel bir ortam "
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
#, c-format
msgid "LXDE Desktop"
msgstr "LXDE Masaüstü"
@@ -701,54 +662,52 @@ msgstr ""
"Kullanıcı dostu uygulamalar ve masaüstü araçlarına sahip hafif bir görsel "
"ortam"
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
#, c-format
msgid "Other Graphical Desktops"
msgstr "Diğer Görsel Masaüstleri"
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
#, c-format
msgid "Window Maker, Enlightenment, Fvwm, etc"
msgstr "Window Maker, Enlightenment, Fvwm, etc"
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
#, c-format
msgid "Utilities"
msgstr "Araçlar"
#: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
#, c-format
msgid "SSH Server"
msgstr "SSH Sunucu"
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
#, c-format
msgid "Webmin"
msgstr "Webmin"
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
#, c-format
msgid "Webmin Remote Configuration Server"
msgstr "Webmin Uzak Yapılandırma Sunucusu"
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
#, c-format
msgid "Network Utilities/Monitoring"
msgstr "Ağ Araçları/İzleme"
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
#, c-format
msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
msgstr "İzleme araçları, işlem sayımı, tcpdump, nmap, ..."
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
#, c-format
msgid "Mandriva Wizards"
msgstr "Mandriva Sihirbazları"
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
#, c-format
msgid "Wizards to configure server"
msgstr "Sunucuyu yapılandırmak için Sihirbazlar"
@@ -848,17 +807,17 @@ msgstr "'%s' masaüstünün ön izlemesini burada görebilirsiniz."
msgid "Click on images in order to see a bigger preview"
msgstr "Daha büyük ön izlemeler görebilmek için resim üzerine tıklayın"
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
#, c-format
msgid "Package Group Selection"
msgstr "Paket Grubu Seçimi"
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
#, c-format
msgid "Individual package selection"
msgstr "Tek tek paket seçimi"
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
#, c-format
msgid "Total size: %d / %d MB"
msgstr "Toplam boyut: %d / %d MB"
@@ -975,12 +934,12 @@ msgstr "En ufak kurulum"
msgid "Software Management"
msgstr "Yazılım Yöneticisi"
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
#, c-format
msgid "Choose the packages you want to install"
msgstr "Kurmak istediğiniz paketleri seçin"
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
#, c-format
msgid "Installing"
msgstr "Kuruluyor"
@@ -1006,7 +965,7 @@ msgid "%d package"
msgid_plural "%d packages"
msgstr[0] "%d paket"
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
#, c-format
msgid "Summary"
msgstr "Özet"
@@ -1016,7 +975,7 @@ msgstr "Özet"
msgid "Configure"
msgstr "Yapılandır"
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
#, c-format
msgid "not configured"
msgstr "yapılandırılmamış"
@@ -1026,7 +985,7 @@ msgstr "yapılandırılmamış"
msgid "Media Selection"
msgstr "Paket Grubu Seçimi"
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
#, c-format
msgid ""
"The following installation media have been found.\n"
@@ -1035,7 +994,7 @@ msgstr ""
"Şu kurulum medyası bulundu.\n"
"Bu bazılarını geçmek isterseniz, şimdi seçimden çıkarabilirsiniz."
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
#, c-format
msgid ""
"You have the option to copy the contents of the CDs onto the hard drive "
@@ -1047,7 +1006,7 @@ msgstr ""
"Sabit diskten kruluma devam edilecek ve paketler sistem tamamen kurulduğunda "
"da hazır olacaktır."
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
#, c-format
msgid "Copy whole CDs"
msgstr "CD'lerin tamamını kopyala"
@@ -1067,17 +1026,17 @@ msgstr "Lütfen klavye düzeninizi seçiniz"
msgid "Here is the full list of available keyboards:"
msgstr "Mevcut tüm klavye düzenlerinin listesi:"
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
#, c-format
msgid "Install/Upgrade"
msgstr "Kur/Yükselt"
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
#, c-format
msgid "Is this an install or an upgrade?"
msgstr "Bu bir yükleme mi yoksa yükseltme mi ?"
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
#, c-format
msgid ""
"_: This is a noun:\n"
@@ -1086,42 +1045,32 @@ msgstr ""
"_: This is a noun:\n"
"Kurulum"
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
#, c-format
msgid "Upgrade %s"
msgstr "%s Yükselt"
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr "Bir 32 bit'ten 64 bit dağıtıma yükseltme desteklenmemektedir."
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr "Bir 64 bit'ten 32 bit dağıtıma yükseltme desteklenmemektedir."
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
#, c-format
msgid "Encryption key for %s"
msgstr "%s için Parola"
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
#, c-format
msgid "Cancel installation, reboot system"
msgstr "Kurulumu iptal et, sistemi yeniden başlat"
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
#, c-format
msgid "New Installation"
msgstr "Yeni Kurulum"
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
#, c-format
msgid "Upgrade previous installation (not recommended)"
msgstr "Önceki kurulumu güncelle (önerilmez)"
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
#, c-format
msgid ""
"Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1142,17 +1091,17 @@ msgstr ""
"yedeklemeniz\n"
"
önerilir."
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "IDE"
msgstr "IDE"
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "Configuring IDE"
msgstr "IDE yapılandırması"
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
#, c-format
msgid ""
"No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1162,7 +1111,7 @@ msgstr ""
"alan yok! Kurulum devam edecektir fakat açılış için DiskDrake'i kullanarak "
"bir önyükleme disk bölümü oluşturmanız gerekecek"
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
#, c-format
msgid ""
"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1173,7 +1122,7 @@ msgstr ""
"açılış için DiskDrake'i kullanarak bir önyükleme disk bölümü oluşturmanız "
"gerekecek"
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
#, c-format
msgid ""
"Change your Cd-Rom!\n"
@@ -1186,12 +1135,12 @@ msgstr ""
"\"%s\" etiketli Cd-Rom'u sürücüye takın ve TAMAM'a basın.\n"
"Eğer Cd-Rom elinizde yoksa bu Cd-Rom'dan kurmamak için VAZGEÇ'e basın."
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
#, c-format
msgid "Looking for available packages..."
msgstr "Mevcut paketler taranıyor"
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
#, c-format
msgid ""
"Your system does not have enough space left for installation or upgrade (%"
@@ -1199,7 +1148,7 @@ msgid ""
msgstr ""
"Sisteminizde kurulum veya yükseltme için yeterli alan yok (% dMB > %dMB)"
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
#, c-format
msgid ""
"Please choose load or save package selection.\n"
@@ -1208,52 +1157,52 @@ msgstr ""
"Lütfen paket seçimini yükle veya kaydete tıklayınız.\n"
"Otomatik kurulum dosyaları ile aynı biçemde oluşturulacaktır."
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Load"
msgstr "Yükle"
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Save"
msgstr "Kaydet"
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
#, c-format
msgid "Bad file"
msgstr "Dosya hatalı"
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
#, c-format
msgid "KDE"
msgstr "KDE"
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
#, c-format
msgid "GNOME"
msgstr " "
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
#, c-format
msgid "Desktop Selection"
msgstr "Masaüstü Seçimi"
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
#, c-format
msgid "You can choose your workstation desktop profile."
msgstr "İş istasyonu masaüstü profili seçebilirsiniz."
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
#, c-format
msgid "Selected size is larger than available space"
msgstr "Seçilen boyut boş disk alanından daha büyük"
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
#, c-format
msgid "Type of install"
msgstr "Kurulum türü"
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
#, c-format
msgid ""
"You have not selected any group of packages.\n"
@@ -1262,82 +1211,82 @@ msgstr ""
"Seçilmiş bir paket grubu yok\n"
"Lütfen isteğinize uyan ve en az yer kaplayacak kurulumu seçin:"
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
#, c-format
msgid "With X"
msgstr "X ile"
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
#, c-format
msgid "With basic documentation (recommended!)"
msgstr "Temel belgeler olsun (önerilir!)"
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
#, c-format
msgid "Truly minimal install (especially no urpmi)"
msgstr "Gerçekten en küçük kurulum (özellikle urpmi-siz)"
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
#, c-format
msgid "Preparing installation"
msgstr "Kurulum hazırlanıyor"
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
#, c-format
msgid "Installing package %s"
msgstr "%s paketi kuruluyor"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "There was an error ordering packages:"
msgstr "Paketler düzenlenirken bir hata oluştu:"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "Go on anyway?"
msgstr "Yine de devam edilsin mi?"
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
#, c-format
msgid "Retry"
msgstr "Yeniden Dene"
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
#, c-format
msgid "Skip this package"
msgstr "Bu paketi geç"
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
#, c-format
msgid "Skip all packages from medium \"%s\""
msgstr "\"%s\" medyasından tüm paketleri geç."
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
#, c-format
msgid "Go back to media and packages selection"
msgstr "Medya ve paket seçimine geri dön."
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
#, c-format
msgid "There was an error installing package %s."
msgstr "Paket %s kurulurken bir hata oluştu."
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
#, c-format
msgid "Post-install configuration"
msgstr "Kurulum sonrası yapılandırma"
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
#, c-format
msgid "Please ensure the Update Modules media is in drive %s"
msgstr "Lütfen Update Module medyasının %s sürcüsünde olduğuna emin olun"
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
#, c-format
msgid "Updates"
msgstr "Güncellemeler"
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
#, c-format
msgid ""
"You now have the opportunity to download updated packages. These packages\n"
@@ -1361,28 +1310,28 @@ msgstr ""
"\n"
"Güncellemeleri kurmak istiyor musunuz ?"
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
#, c-format
msgid "%s on %s"
msgstr "%s üstündeki %s"
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
#, c-format
msgid "Hardware"
msgstr "Donanım"
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
#, c-format
msgid "Sound card"
msgstr "Ses Kartı"
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
#, c-format
msgid "Do you have an ISA sound card?"
msgstr "Bir ISA ses kartınız var mı?"
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
#, c-format
msgid ""
"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1391,67 +1340,67 @@ msgstr ""
"Ses kartınızı yapılandırmak için kurulumdan sonra \"sndconfig\" aracını "
"çalıştırın."
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
#, c-format
msgid "No sound card detected. Try \"harddrake\" after installation"
msgstr "Ses kartı bulunamadı. Kurulumdan sonra \"harddrake\" ile deneyin."
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
#, c-format
msgid "Graphical interface"
msgstr "Grafiksel arabirim"
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
#, c-format
msgid "Network & Internet"
msgstr "Ağ & İnternet"
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
#, c-format
msgid "Proxies"
msgstr "Vekil Sunucular"
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
#, c-format
msgid "configured"
msgstr "yapılandırıldı"
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
#, c-format
msgid "Security Level"
msgstr "Güvenlik Seviyesi"
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
#, c-format
msgid "Firewall"
msgstr "Güvenlik Duvarı"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "activated"
msgstr "etkinleştirilmiş"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "disabled"
msgstr "pasifleştirilmiş"
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
#, c-format
msgid "You have not configured X. Are you sure you really want this?"
msgstr "X'i yapılandırmadınız. Bunu yapmak istediğinizden emin misiniz?"
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
#, c-format
msgid "Preparing bootloader..."
msgstr "Önyükleyici hazırlanıyor"
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
#, c-format
msgid "Be patient, this may take a while..."
msgstr "Sabredin, bu biraz zaman alabilir..."
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
#, c-format
msgid ""
"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1464,7 +1413,7 @@ msgstr ""
"açmak için BootX veya benzeri araçlar kullanmak zorunda kalacaksınız. root "
"fs için kernel argümanı: root=%s"
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
#, c-format
msgid ""
"In this security level, access to the files in the Windows partition is "
@@ -1473,17 +1422,17 @@ msgstr ""
"Bu güvenlik seviyesinde, Windows bölümündeki dosyalara erişim yönetici "
"lehine kısıtlanmıştır."
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr "%s sürücüsüne boş bir disket yerleştirin"
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
#, c-format
msgid "Creating auto install floppy..."
msgstr "Otomatik kurulum disketi hazırlanıyor"
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
#, c-format
msgid ""
"Some steps are not completed.\n"
@@ -1494,7 +1443,7 @@ msgstr ""
"\n"
"Gerçekten çıkmak istiyormusunuz?"
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
#, c-format
msgid "Congratulations"
msgstr "Tebrikler"
@@ -1638,6 +1587,30 @@ msgid ""
"Exit"
msgstr "Çıkış"
+#~ msgid "Your desktop on a USB key"
+#~ msgstr "Masaüstünüz bir USB anahtarı üzerinde"
+
+#~ msgid "The 100%% open source Mandriva Linux distribution"
+#~ msgstr "100%% açık kaynak Mandriva linux dağıtımı"
+
+#~ msgid "Explore Linux easily with Mandriva One"
+#~ msgstr "Linux'u Mandriva One ile kolayca keşfedin"
+
+#~ msgid "A full Mandriva Linux desktop, with support"
+#~ msgstr "Tam bir Mandriva Linux masaüstü, destek dahil"
+
+#~ msgid "Mandriva: distributions for everybody's needs"
+#~ msgstr "Mandriva: herkesin ihtiyacına göre dağıtımlar"
+
+#~ msgid "Downloading file %s..."
+#~ msgstr "%s dosyası indiriliyor..."
+
+#~ msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
+#~ msgstr "Bir 32 bit'ten 64 bit dağıtıma yükseltme desteklenmemektedir."
+
+#~ msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
+#~ msgstr "Bir 64 bit'ten 32 bit dağıtıma yükseltme desteklenmemektedir."
+
#~ msgid ""
#~ "You have selected the following server(s): %s\n"
#~ "\n"
diff --git a/perl-install/install/share/po/uk.po b/perl-install/install/share/po/uk.po
index 431df37c9..a98746099 100644
--- a/perl-install/install/share/po/uk.po
+++ b/perl-install/install/share/po/uk.po
@@ -14,7 +14,7 @@ msgid ""
msgstr ""
"Project-Id-Version: DrakX\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
"PO-Revision-Date: 2009-04-01 08:43+0300\n"
"Last-Translator: Taras Boychuk <btr0001@ukr.net>\n"
"Language-Team: ukrainian <translation@linux.org.ua>\n"
@@ -22,32 +22,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr "Робоча станція на ключі USB"
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr "Дистрибутив Мандріва Лінакс із 100%% відкритим кодом"
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr "Легко користуйтеся Лінаксом з Mandriva One"
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr "Повноцінна робоча станція Мандріва з підтримкою"
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr "Мандріва: дистрибутив, що задовольняє потреби усіх"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
#: any.pm:109
#, c-format
@@ -88,22 +64,24 @@ msgstr "Мережа (FTP)"
msgid "Network (NFS)"
msgstr "Мережа (NFS)"
-#: any.pm:163
+#: any.pm:165
#, c-format
msgid "URL of the mirror?"
msgstr "Посилання на дзеркало?"
-#: any.pm:169
+#: any.pm:171
#, c-format
msgid "URL must start with ftp:// or http://"
msgstr "Посилання має починатися з ftp:// або http://"
-#: any.pm:180
+#: any.pm:182
#, c-format
-msgid "Contacting Mandriva Linux web site to get the list of available mirrors..."
-msgstr "Зв'язуюсь з веб-сайтом Mandriva Linux, щоб отримати список наявних джерел..."
+msgid ""
+"Contacting Mandriva Linux web site to get the list of available mirrors..."
+msgstr ""
+"Зв'язуюсь з веб-сайтом Mandriva Linux, щоб отримати список наявних джерел..."
-#: any.pm:185
+#: any.pm:187
#, c-format
msgid ""
"Failed contacting Mandriva Linux web site to get the list of available "
@@ -112,47 +90,47 @@ msgstr ""
"Помилка зв'язку з веб-сайтом Mandriva Linux, щоб отримати список наявних "
"джерел..."
-#: any.pm:195
+#: any.pm:197
#, c-format
msgid "Choose a mirror from which to get the packages"
msgstr "Виберіть сервер, з якого звантажити пакунки"
-#: any.pm:225
+#: any.pm:227
#, c-format
msgid "NFS setup"
msgstr "Встановлення NFS"
-#: any.pm:226
+#: any.pm:228
#, c-format
msgid "Please enter the hostname and directory of your NFS media"
msgstr "Введіть назву машини або теку з носієм NFS"
-#: any.pm:230
+#: any.pm:232
#, c-format
msgid "Hostname missing"
msgstr "Немає назви машини"
-#: any.pm:231
+#: any.pm:233
#, c-format
msgid "Directory must begin with \"/\""
msgstr "Тека повинна починатися з \"/\""
-#: any.pm:235
+#: any.pm:237
#, c-format
msgid "Hostname of the NFS mount ?"
msgstr "Назва комп'ютера для монтування NFS?"
-#: any.pm:236
+#: any.pm:238
#, c-format
msgid "Directory"
msgstr "Тека"
-#: any.pm:258
+#: any.pm:260
#, c-format
msgid "Supplementary"
msgstr "Додатковий"
-#: any.pm:293
+#: any.pm:295
#, c-format
msgid ""
"Can't find a package list file on this mirror. Make sure the location is "
@@ -161,22 +139,22 @@ msgstr ""
"Неможливо знайти перелік пакунків на цьому дзеркалі. Переконайтеся, чи "
"правильне розташування."
-#: any.pm:328
+#: any.pm:334
#, c-format
msgid "Looking at packages already installed..."
msgstr "Переглядається список вже встановлених пакунків..."
-#: any.pm:362
+#: any.pm:368
#, c-format
msgid "Finding packages to upgrade..."
msgstr "Шукаю пакунки для поновлення..."
-#: any.pm:381
+#: any.pm:387
#, c-format
msgid "Removing packages prior to upgrade..."
msgstr "Вилучення пакунків перед поновленням..."
-#: any.pm:402
+#: any.pm:408
#, c-format
msgid ""
"You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -197,18 +175,18 @@ msgstr ""
"перезавантажте систему, а потім виконайте оновлення за допомогою аплету\n"
"оновлення Mandriva."
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
#, c-format
msgid "Reboot"
msgstr "Перезавантажити"
-#: any.pm:407
+#: any.pm:413
#, c-format
msgid "Proceed"
msgstr "Продовжувати"
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -222,72 +200,72 @@ msgstr ""
"\n"
"Ви справді хочете вилучити ці пакунки?\n"
-#: any.pm:815
+#: any.pm:821
#, c-format
msgid "Error reading file %s"
msgstr "Помилка при читанні файла %s"
-#: any.pm:1022
+#: any.pm:1028
#, c-format
msgid "The following disk(s) were renamed:"
msgstr "Назву наступних дисків було змінено:"
-#: any.pm:1024
+#: any.pm:1030
#, c-format
msgid "%s (previously named as %s)"
msgstr "%s (попередня назва %s)"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "HTTP"
msgstr "HTTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "FTP"
msgstr "FTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "NFS"
msgstr "NFS"
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
#, c-format
msgid "Network"
msgstr "Мережа"
-#: any.pm:1104
+#: any.pm:1110
#, c-format
msgid "Please choose a media"
msgstr "Будь ласка, виберіть носій"
-#: any.pm:1120
+#: any.pm:1126
#, c-format
msgid "File already exists. Overwrite it?"
msgstr "Файл вже існує. Переписати?"
-#: any.pm:1124
+#: any.pm:1130
#, c-format
msgid "Permission denied"
msgstr "Доступ заборонено"
-#: any.pm:1172
+#: any.pm:1178
#, c-format
msgid "Bad NFS name"
msgstr "Неправильна назва NFS"
-#: any.pm:1193
+#: any.pm:1199
#, c-format
msgid "Bad media %s"
msgstr "Поганий носій %s"
-#: any.pm:1236
+#: any.pm:1242
#, c-format
msgid "Can not make screenshots before partitioning"
msgstr "Не можу робити знімки екрану перед розбиттям на розділи"
-#: any.pm:1244
+#: any.pm:1250
#, c-format
msgid "Screenshots will be available after install in %s"
msgstr "Знімки екрану стануть можливими після встановлення в %s"
@@ -298,11 +276,15 @@ msgid "Installation"
msgstr "Встановлення"
#: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
#, c-format
msgid "Configuration"
msgstr "Конфігурація"
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
#: install2.pm:168
#, c-format
msgid "You must also format %s"
@@ -329,22 +311,22 @@ msgstr "Вмикаю мережу"
msgid "Bringing down the network"
msgstr "Вимикаю мережу"
-#: media.pm:402
+#: media.pm:399
#, c-format
msgid "Please wait, retrieving file"
msgstr "Зачекайте, перевіряється файл"
-#: media.pm:734
+#: media.pm:718
#, c-format
-msgid "Downloading file %s..."
-msgstr "Звантажується файл %s..."
+msgid "unable to add medium"
+msgstr ""
-#: media.pm:822
+#: media.pm:758
#, c-format
msgid "Copying some packages on disks for future use"
msgstr "Копіювання деяких пакунків на диски для пізнішого використання"
-#: media.pm:875
+#: media.pm:811
#, c-format
msgid "Copying in progress"
msgstr "Триває копіювання"
@@ -388,27 +370,27 @@ msgstr ""
msgid "An error occurred:"
msgstr "Сталася помилка:"
-#: pkgs.pm:776
+#: pkgs.pm:780
#, c-format
msgid "%d installation transactions failed"
msgstr "%d запит на встановлення завершився невдало"
-#: pkgs.pm:777
+#: pkgs.pm:781
#, c-format
msgid "Installation of packages failed:"
msgstr "Встановлення пакунку невдале:"
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
#, c-format
msgid "Workstation"
msgstr "Робоча станція"
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
#, c-format
msgid "Office Workstation"
msgstr "Офісна робоча станція"
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
#, c-format
msgid ""
"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -418,7 +400,7 @@ msgstr ""
"електронні таблиці (OpenOffice.org Calc, Kspread), переглядачі файлів PDF, "
"тощо"
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
#, c-format
msgid ""
"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -427,32 +409,32 @@ msgstr ""
"Програми для офісу: текстові процесори (kword, abiword), бухгалтерські "
"таблиці (kspread, gnumeric), переглядачі файлів pdf, тощо"
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
#, c-format
msgid "Game station"
msgstr "Ігрова станція"
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
#, c-format
msgid "Amusement programs: arcade, boards, strategy, etc"
msgstr "Програми для розваг: ігри-перегони, ігри на дошці, стратегічні, тощо"
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
#, c-format
msgid "Multimedia station"
msgstr "Мультимедійна станція"
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
#, c-format
msgid "Sound and video playing/editing programs"
msgstr "Звукові та відео програвачі та редактори"
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
#, c-format
msgid "Internet station"
msgstr "Станція для Інтернету"
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
#, c-format
msgid ""
"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -461,211 +443,193 @@ msgstr ""
"Набір засобів для читання та передавання електронної пошти та груп новин "
"(pine, mutt, tin..), та для перегляду інформаційних тенет"
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
#, c-format
msgid "Network Computer (client)"
msgstr "Мережевий комп'ютер (клієнт)"
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
#, c-format
msgid "Clients for different protocols including ssh"
msgstr "Клієнти для різних протоколів (ssh включно)"
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
#, c-format
msgid "Tools to ease the configuration of your computer"
msgstr "Засоби для полегшення налаштування комп'ютера"
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
#, c-format
msgid "Console Tools"
msgstr "Засоби для консолі"
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
#, c-format
msgid "Editors, shells, file tools, terminals"
msgstr "Редактори, командні оболонки, файлові засоби та термінали"
#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
#, c-format
msgid "Development"
msgstr "Розробка"
#: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
#, c-format
msgid "C and C++ development libraries, programs and include files"
msgstr "Бібліотеки для програмування в C, C++, програми та файли include"
#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
#, c-format
msgid "Documentation"
msgstr "Документація"
#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
#, c-format
msgid "Books and Howto's on Linux and Free Software"
msgstr "Книжки та ЯК ЗРОБИТИ про Лінакс та вільне програмне забезпечення"
#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
#, c-format
msgid "LSB"
msgstr "LSB"
#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
#, c-format
msgid "Linux Standard Base. Third party applications support"
msgstr "Стандартна база Лінакс. Підтримка програм сторонніх виробників"
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
#, c-format
msgid "Web Server"
msgstr "Веб-сервер"
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
#, c-format
msgid "Apache"
msgstr "Apache"
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
#, c-format
msgid "Groupware"
msgstr "Групова робота"
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
#, c-format
msgid "Kolab Server"
msgstr "Сервер Kolab"
#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
#, c-format
msgid "Firewall/Router"
msgstr "Захисний шлюз/Маршрутизатор"
#: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
#, c-format
msgid "Internet gateway"
msgstr "Інтернет-шлюз"
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
#, c-format
msgid "Mail/News"
msgstr "Пошта/Новини"
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
#, c-format
msgid "Postfix mail server, Inn news server"
msgstr "Поштовий сервер postfix, сервер новин Inn"
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
#, c-format
msgid "Directory Server"
msgstr "Сервер тек"
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
#, c-format
msgid "FTP Server"
msgstr "Сервер FTP"
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
#, c-format
msgid "ProFTPd"
msgstr "ProFTPd"
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
#, c-format
msgid "DNS/NIS"
msgstr "DNS/NIS"
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
#, c-format
msgid "Domain Name and Network Information Server"
msgstr "Сервер назв домену і мережевий інформаційний сервер"
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
#, c-format
msgid "File and Printer Sharing Server"
msgstr "Сервер доступу до файлів і друкарок"
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
#, c-format
msgid "NFS Server, Samba server"
msgstr "Сервер NFS, сервер Samba"
#: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
#, c-format
msgid "Database"
msgstr "База даних"
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
#, c-format
msgid "PostgreSQL and MySQL Database Server"
msgstr "Сервери баз даних PostgreSQL і MySQL "
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
#, c-format
msgid "Web/FTP"
msgstr "Тенета/FTP"
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
#, c-format
msgid "Apache, Pro-ftpd"
msgstr "Apache, Pro-ftpd"
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
#, c-format
msgid "Mail"
msgstr "Пошта"
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
#, c-format
msgid "Postfix mail server"
msgstr "Поштовий сервер postfix"
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
#, c-format
msgid "PostgreSQL or MySQL database server"
msgstr "Сервери баз даних PostgreSQL або MySQL "
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
#, c-format
msgid "Network Computer server"
msgstr "Мережевий комп'ютер (сервер)"
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
#, c-format
msgid "NFS server, SMB server, Proxy server, ssh server"
msgstr "Сервер NFS, сервер SMB, проксі-сервер, сервер ssh"
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
#, c-format
msgid "Graphical Environment"
msgstr "Графічне середовище"
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
#, c-format
msgid "KDE Workstation"
msgstr "Робоча станція KDE"
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
#, c-format
msgid ""
"The K Desktop Environment, the basic graphical environment with a collection "
@@ -674,19 +638,20 @@ msgstr ""
"Робоче середовище K (KDE) - основне графічне середовище з набором допоміжних "
"засобів"
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
#, c-format
msgid "GNOME Workstation"
msgstr "Робоча станція Gnome"
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
#, c-format
msgid ""
"A graphical environment with user-friendly set of applications and desktop "
"tools"
-msgstr "Графічне середовище з дружнім інтерфейсом та програмами, засоби для стільниці"
+msgstr ""
+"Графічне середовище з дружнім інтерфейсом та програмами, засоби для стільниці"
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
#, c-format
msgid "LXDE Desktop"
msgstr "Стільниця LXDE"
@@ -696,56 +661,56 @@ msgstr "Стільниця LXDE"
msgid ""
"A lightweight & fast graphical environment with user-friendly set of "
"applications and desktop tools"
-msgstr "Легке і швидке графічне середовище з дружнім інтерфейсом та програмами, засоби для стільниці"
+msgstr ""
+"Легке і швидке графічне середовище з дружнім інтерфейсом та програмами, "
+"засоби для стільниці"
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
#, c-format
msgid "Other Graphical Desktops"
msgstr "Інші графічні стільниці"
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
#, c-format
msgid "Window Maker, Enlightenment, Fvwm, etc"
msgstr "Window Maker, Enlightenment, Fvwm, тощо"
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
#, c-format
msgid "Utilities"
msgstr "Інструменти"
#: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
#, c-format
msgid "SSH Server"
msgstr "Сервер SSH "
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
#, c-format
msgid "Webmin"
msgstr "Webmin"
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
#, c-format
msgid "Webmin Remote Configuration Server"
msgstr "Сервер віддаленого налаштування Webmin"
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
#, c-format
msgid "Network Utilities/Monitoring"
msgstr "Мережеві інструменти/Слідкування за мережею"
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
#, c-format
msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
msgstr "Інструменти для слідкування, облік процесів, tcpdump, nmap, ..."
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
#, c-format
msgid "Mandriva Wizards"
msgstr "Помічники Mandriva"
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
#, c-format
msgid "Wizards to configure server"
msgstr "Помічники для налаштування сервера"
@@ -844,17 +809,17 @@ msgstr "Попередній перегляд стільниці '%s'."
msgid "Click on images in order to see a bigger preview"
msgstr "Натисніть на зображення, щоб побачити більший розмір"
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
#, c-format
msgid "Package Group Selection"
msgstr "Вибір груп пакунків"
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
#, c-format
msgid "Individual package selection"
msgstr "Індивідуальний вибір пакунків"
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
#, c-format
msgid "Total size: %d / %d MB"
msgstr "Загальний розмір: %d / %d Мб "
@@ -973,12 +938,12 @@ msgstr "Мінімальне встановлення"
msgid "Software Management"
msgstr "Менеджер програм"
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
#, c-format
msgid "Choose the packages you want to install"
msgstr "Виберіть пакунки, які Ви хочете встановити"
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
#, c-format
msgid "Installing"
msgstr "Встановлюю"
@@ -1006,7 +971,7 @@ msgstr[0] "%d пакунок"
msgstr[1] "%d пакунки"
msgstr[2] "%d пакунків"
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
#, c-format
msgid "Summary"
msgstr "Загалом"
@@ -1016,7 +981,7 @@ msgstr "Загалом"
msgid "Configure"
msgstr "Налаштувати"
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
#, c-format
msgid "not configured"
msgstr "не налаштовано"
@@ -1026,7 +991,7 @@ msgstr "не налаштовано"
msgid "Media Selection"
msgstr "Вибір носія"
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
#, c-format
msgid ""
"The following installation media have been found.\n"
@@ -1035,7 +1000,7 @@ msgstr ""
"Було знайдено наступні носії встановлення.\n"
"Якщо Ви не хочете використовувати деякі з них, відмініть їх вибір."
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
#, c-format
msgid ""
"You have the option to copy the contents of the CDs onto the hard drive "
@@ -1048,7 +1013,7 @@ msgstr ""
"Після цього встановлення продовжиться з твердого диску і пакунки залишаться "
"доступними після повного встановлення системи."
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
#, c-format
msgid "Copy whole CDs"
msgstr "Копіювати компакт-диски повністю."
@@ -1068,59 +1033,49 @@ msgstr "Будь ласка, виберіть розкладку клавіат
msgid "Here is the full list of available keyboards:"
msgstr "Тут наведено повний список можливих мап клавіатури:"
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
#, c-format
msgid "Install/Upgrade"
msgstr "Встановити/Поновити"
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
#, c-format
msgid "Is this an install or an upgrade?"
msgstr "Це встановлення чи поновлення?"
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
#, c-format
msgid ""
"_: This is a noun:\n"
"Install"
msgstr "Встановлення"
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
#, c-format
msgid "Upgrade %s"
msgstr "Поновити %s"
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr "Поновлення системи з 32 біт до 64 не підтримується"
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr "Поновлення системи з 64 біт до 32 не підтримується"
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
#, c-format
msgid "Encryption key for %s"
msgstr "Ключ шифрування для %s"
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
#, c-format
msgid "Cancel installation, reboot system"
msgstr "Припинити встановлення, перезавантажити систему."
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
#, c-format
msgid "New Installation"
msgstr "Нове встановлення"
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
#, c-format
msgid "Upgrade previous installation (not recommended)"
msgstr "Поновити попереднє встановлення (не рекомендується)"
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
#, c-format
msgid ""
"Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1139,17 +1094,17 @@ msgstr ""
"Попередження : Вам потрібно зробити резервну копію особистих даних\n"
"перед тим, як виберете \"Нове встановлення\"."
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "IDE"
msgstr "IDE"
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "Configuring IDE"
msgstr "Налаштування IDE"
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
#, c-format
msgid ""
"No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1159,7 +1114,7 @@ msgstr ""
"буде продовжуватись, але для завантаження своєї системи Вам потрібно\n"
"буде створити DiskDrake'ом завантажувальний розділ"
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
#, c-format
msgid ""
"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1170,7 +1125,7 @@ msgstr ""
"буде продовжуватись, але для завантаження системи потрібно буде створити "
"DiskDrake'ом завантажувальний розділ"
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
#, c-format
msgid ""
"Change your Cd-Rom!\n"
@@ -1184,12 +1139,12 @@ msgstr ""
"Якщо Ви не маєте такого диску, натисніть Скасувати, щоб не\n"
"встановлювати з цього диску."
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
#, c-format
msgid "Looking for available packages..."
msgstr "Шукаю наявні пакунки..."
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
#, c-format
msgid ""
"Your system does not have enough space left for installation or upgrade (%"
@@ -1198,7 +1153,7 @@ msgstr ""
"У Вашій системі не залишилося достатньо місця для встановлення або "
"поновлення (%dМб > %dМб)"
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
#, c-format
msgid ""
"Please choose load or save package selection.\n"
@@ -1207,52 +1162,52 @@ msgstr ""
"Будь ласка, виберіть, завантажити чи записати вибір пакунків.\n"
"Формат такий самий, як для файлів auto_install."
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Load"
msgstr "Завантаження"
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Save"
msgstr "Зберегти"
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
#, c-format
msgid "Bad file"
msgstr "Поганий файл"
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
#, c-format
msgid "KDE"
msgstr "KDE"
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
#, c-format
msgid "GNOME"
msgstr "GNOME"
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
#, c-format
msgid "Desktop Selection"
msgstr "Вибір десктопу"
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
#, c-format
msgid "You can choose your workstation desktop profile."
msgstr "Ви можете вибрати профіль стільниці робочої станції."
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
#, c-format
msgid "Selected size is larger than available space"
msgstr "Вибраний розмір більший за наявний "
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
#, c-format
msgid "Type of install"
msgstr "Тип встановлення"
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
#, c-format
msgid ""
"You have not selected any group of packages.\n"
@@ -1261,82 +1216,82 @@ msgstr ""
"Ви не вказали жодної групи пакунків.\n"
"Будь ласка, вкажіть мінімальне встановлення, яке Ви хочете:"
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
#, c-format
msgid "With X"
msgstr "Разом з Х"
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
#, c-format
msgid "With basic documentation (recommended!)"
msgstr "З основною документацією (рекомендується!)"
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
#, c-format
msgid "Truly minimal install (especially no urpmi)"
msgstr "Насправді мінімальне встановлення (навіть без urpmi)"
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
#, c-format
msgid "Preparing installation"
msgstr "Підготовка встановлення"
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
#, c-format
msgid "Installing package %s"
msgstr "Встановлюється пакунок %s"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "There was an error ordering packages:"
msgstr "Сталася помилка під час сортування пакунків: "
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "Go on anyway?"
msgstr "Все-таки продовжувати?"
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
#, c-format
msgid "Retry"
msgstr "Ще раз"
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
#, c-format
msgid "Skip this package"
msgstr "Пропустити цей пакунок"
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
#, c-format
msgid "Skip all packages from medium \"%s\""
msgstr "Пропустити усі пакунки з носія \"%s\""
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
#, c-format
msgid "Go back to media and packages selection"
msgstr "Повернутися до вибору носіїв і пакунків"
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
#, c-format
msgid "There was an error installing package %s."
msgstr "Сталася помилка під час встановлення пакунка %s."
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
#, c-format
msgid "Post-install configuration"
msgstr "Налаштування після встановлення"
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
#, c-format
msgid "Please ensure the Update Modules media is in drive %s"
msgstr "Переконайтеся, чи джерело Update Modules знаходиться в носії %s"
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
#, c-format
msgid "Updates"
msgstr "Поновлення"
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
#, c-format
msgid ""
"You now have the opportunity to download updated packages. These packages\n"
@@ -1357,28 +1312,28 @@ msgstr ""
"\n"
"Ви хочете встановити ці поновлення?"
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
#, c-format
msgid "%s on %s"
msgstr "%s на %s"
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
#, c-format
msgid "Hardware"
msgstr "Залізо"
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
#, c-format
msgid "Sound card"
msgstr "Звукова плата"
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
#, c-format
msgid "Do you have an ISA sound card?"
msgstr "Чи маєте Ви звукові карти ISA?"
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
#, c-format
msgid ""
"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1387,67 +1342,67 @@ msgstr ""
"Виконайте \"alsaconf\" або \"sndconfig\" після встановлення, щоб налаштувати "
"звукову карту"
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
#, c-format
msgid "No sound card detected. Try \"harddrake\" after installation"
msgstr "Звукових карт не виявлено. Спробуйте \"harddrake\" після встановлення"
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
#, c-format
msgid "Graphical interface"
msgstr "Графічний інтерфейс"
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
#, c-format
msgid "Network & Internet"
msgstr "Мережа та Інтернет"
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
#, c-format
msgid "Proxies"
msgstr "Проксі"
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
#, c-format
msgid "configured"
msgstr "налаштовано"
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
#, c-format
msgid "Security Level"
msgstr "Рівень безпеки"
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
#, c-format
msgid "Firewall"
msgstr "Захисний шлюз"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "activated"
msgstr "увімкнено"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "disabled"
msgstr "відімкнено"
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
#, c-format
msgid "You have not configured X. Are you sure you really want this?"
msgstr "Ви не сконфігурували X. Ви впевнені, що дійсно цього хочете?"
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
#, c-format
msgid "Preparing bootloader..."
msgstr "Підготовлюю завантажувач..."
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
#, c-format
msgid "Be patient, this may take a while..."
msgstr "Будьте терпеливі, це може тривати довго..."
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
#, c-format
msgid ""
"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1461,7 +1416,7 @@ msgstr ""
"завантаження Вашої машини. Параметр ядра для кореневої файлової системи: "
"root=%s"
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
#, c-format
msgid ""
"In this security level, access to the files in the Windows partition is "
@@ -1470,17 +1425,17 @@ msgstr ""
"На цьому рівні безпеки доступ до файлів на розділі Windows дозволений тільки "
"адміністратору."
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr "Вставте чисту дискету в дисковод %s"
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
#, c-format
msgid "Creating auto install floppy..."
msgstr "Створення дискети для автоматичного встановлення..."
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
#, c-format
msgid ""
"Some steps are not completed.\n"
@@ -1491,7 +1446,7 @@ msgstr ""
"\n"
"Ви дійсно хочете припинити зараз?"
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
#, c-format
msgid "Congratulations"
msgstr "Вітання"
@@ -1635,3 +1590,26 @@ msgid ""
"Exit"
msgstr "Вийти"
+#~ msgid "Your desktop on a USB key"
+#~ msgstr "Робоча станція на ключі USB"
+
+#~ msgid "The 100%% open source Mandriva Linux distribution"
+#~ msgstr "Дистрибутив Мандріва Лінакс із 100%% відкритим кодом"
+
+#~ msgid "Explore Linux easily with Mandriva One"
+#~ msgstr "Легко користуйтеся Лінаксом з Mandriva One"
+
+#~ msgid "A full Mandriva Linux desktop, with support"
+#~ msgstr "Повноцінна робоча станція Мандріва з підтримкою"
+
+#~ msgid "Mandriva: distributions for everybody's needs"
+#~ msgstr "Мандріва: дистрибутив, що задовольняє потреби усіх"
+
+#~ msgid "Downloading file %s..."
+#~ msgstr "Звантажується файл %s..."
+
+#~ msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
+#~ msgstr "Поновлення системи з 32 біт до 64 не підтримується"
+
+#~ msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
+#~ msgstr "Поновлення системи з 64 біт до 32 не підтримується"
diff --git a/perl-install/install/share/po/uz.po b/perl-install/install/share/po/uz.po
index 09401a099..1d96f8bb3 100644
--- a/perl-install/install/share/po/uz.po
+++ b/perl-install/install/share/po/uz.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: uz@cyrillic\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
"PO-Revision-Date: 2008-08-24 01:06+0200\n"
"Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
"Language-Team: Uzbek <floss-uz-l10n@googlegroups.com>\n"
@@ -19,31 +19,6 @@ msgstr ""
"X-Generator: KBabel 1.11.4\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr ""
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr ""
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr ""
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr ""
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr ""
-
#: any.pm:109
#, c-format
msgid "Do you have further supplementary media?"
@@ -83,17 +58,17 @@ msgstr "Tarmoq (FTP)"
msgid "Network (NFS)"
msgstr "Tarmoq (NFS)"
-#: any.pm:163
+#: any.pm:165
#, c-format
msgid "URL of the mirror?"
msgstr "Oynaning manzili (URL)"
-#: any.pm:169
+#: any.pm:171
#, c-format
msgid "URL must start with ftp:// or http://"
msgstr "Manzil ftp:// yoki http:// bilan boshlanishi kerak"
-#: any.pm:180
+#: any.pm:182
#, c-format
msgid ""
"Contacting Mandriva Linux web site to get the list of available mirrors..."
@@ -101,7 +76,7 @@ msgstr ""
"Mavjud boʻlgan oynalarning roʻyxatini olish uchun Mandriva Linux sayti bilan "
"aloqa oʻrnatilmoqda..."
-#: any.pm:185
+#: any.pm:187
#, c-format
msgid ""
"Failed contacting Mandriva Linux web site to get the list of available "
@@ -110,47 +85,47 @@ msgstr ""
"Mavjud boʻlgan oynalarning roʻyxatini olish uchun Mandriva Linux sayti bilan "
"aloqa oʻrnatib boʻlmadi"
-#: any.pm:195
+#: any.pm:197
#, c-format
msgid "Choose a mirror from which to get the packages"
msgstr "Paketlarni olish uchun oynani tanlang"
-#: any.pm:225
+#: any.pm:227
#, c-format
msgid "NFS setup"
msgstr "NFS orqali oʻrnatish"
-#: any.pm:226
+#: any.pm:228
#, c-format
msgid "Please enter the hostname and directory of your NFS media"
msgstr "NFS toʻplamining kompyuter nomini va direktoriyani kiriting"
-#: any.pm:230
+#: any.pm:232
#, c-format
msgid "Hostname missing"
msgstr "Kompyuterning nomi koʻrsatilmagan"
-#: any.pm:231
+#: any.pm:233
#, c-format
msgid "Directory must begin with \"/\""
msgstr "Direktoriya \"/\" belgi bilan boshlashi kerak"
-#: any.pm:235
+#: any.pm:237
#, c-format
msgid "Hostname of the NFS mount ?"
msgstr "NFS serverining xost nomi"
-#: any.pm:236
+#: any.pm:238
#, c-format
msgid "Directory"
msgstr "Direktoriya"
-#: any.pm:258
+#: any.pm:260
#, c-format
msgid "Supplementary"
msgstr "Qoʻshimcha"
-#: any.pm:293
+#: any.pm:295
#, c-format
msgid ""
"Can't find a package list file on this mirror. Make sure the location is "
@@ -159,22 +134,22 @@ msgstr ""
"Oynada paketlar roʻyxatini topib boʻlmadi. Manzil (URL) toʻgʻri "
"koʻrsatilganligini tekshiring."
-#: any.pm:328
+#: any.pm:334
#, c-format
msgid "Looking at packages already installed..."
msgstr "Allaqachon oʻrnatilgan paketlar qidirilmoqda..."
-#: any.pm:362
+#: any.pm:368
#, c-format
msgid "Finding packages to upgrade..."
msgstr "Yangilash uchun paketlar qidirilmoqda..."
-#: any.pm:381
+#: any.pm:387
#, c-format
msgid "Removing packages prior to upgrade..."
msgstr "Yangilashdan avval paketlar olib tashlanmoqda..."
-#: any.pm:402
+#: any.pm:408
#, c-format
msgid ""
"You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -186,18 +161,18 @@ msgid ""
"please reboot your system and upgrade using the Mandriva update applet."
msgstr ""
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
#, c-format
msgid "Reboot"
msgstr "Oʻchirib-yoqish"
-#: any.pm:407
+#: any.pm:413
#, c-format
msgid "Proceed"
msgstr ""
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -210,72 +185,72 @@ msgstr ""
"\n"
"Davom etishni istaysizmi?\n"
-#: any.pm:815
+#: any.pm:821
#, c-format
msgid "Error reading file %s"
msgstr "%s faylini oʻqishda xato roʻy berdi"
-#: any.pm:1022
+#: any.pm:1028
#, c-format
msgid "The following disk(s) were renamed:"
msgstr "Quyidagi disk(lar)ning nomi oʻzgartirildi:"
-#: any.pm:1024
+#: any.pm:1030
#, c-format
msgid "%s (previously named as %s)"
msgstr "%s (oldingi nomi %s)"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "HTTP"
msgstr "HTTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "FTP"
msgstr "FTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "NFS"
msgstr "NFS"
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
#, c-format
msgid "Network"
msgstr "Tarmoq"
-#: any.pm:1104
+#: any.pm:1110
#, c-format
msgid "Please choose a media"
msgstr "Iltimos toʻplamni tanlang"
-#: any.pm:1120
+#: any.pm:1126
#, c-format
msgid "File already exists. Overwrite it?"
msgstr "Fayl allaqachon mavjud. Uni almashtirishni istaysizmi?"
-#: any.pm:1124
+#: any.pm:1130
#, c-format
msgid "Permission denied"
msgstr "Ruxsat yoʻq"
-#: any.pm:1172
+#: any.pm:1178
#, c-format
msgid "Bad NFS name"
msgstr "NFS nomi notoʻgʻri"
-#: any.pm:1193
+#: any.pm:1199
#, c-format
msgid "Bad media %s"
msgstr "Notoʻgʻri toʻplam %s"
-#: any.pm:1236
+#: any.pm:1242
#, c-format
msgid "Can not make screenshots before partitioning"
msgstr "Skrinshotlarni diskni boʻlishdan avval olib boʻlmaydi"
-#: any.pm:1244
+#: any.pm:1250
#, c-format
msgid "Screenshots will be available after install in %s"
msgstr ""
@@ -287,11 +262,15 @@ msgid "Installation"
msgstr "Oʻrnatish"
#: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
#, c-format
msgid "Configuration"
msgstr "Moslash"
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
#: install2.pm:168
#, c-format
msgid "You must also format %s"
@@ -316,22 +295,22 @@ msgstr "Tarmoq ishga tushirilmoqda"
msgid "Bringing down the network"
msgstr "Tarmoq oʻchirilmoqda"
-#: media.pm:402
+#: media.pm:399
#, c-format
msgid "Please wait, retrieving file"
msgstr ""
-#: media.pm:734
+#: media.pm:718
#, c-format
-msgid "Downloading file %s..."
-msgstr "%s fayli yozib olinmoqda..."
+msgid "unable to add medium"
+msgstr ""
-#: media.pm:822
+#: media.pm:758
#, c-format
msgid "Copying some packages on disks for future use"
msgstr "Baʼzi paketlardan diskka nusxa olinmoqda"
-#: media.pm:875
+#: media.pm:811
#, c-format
msgid "Copying in progress"
msgstr "Nusxa olish davom etmoqda"
@@ -375,27 +354,27 @@ msgstr ""
msgid "An error occurred:"
msgstr "Xato roʻy berdi"
-#: pkgs.pm:776
+#: pkgs.pm:780
#, c-format
msgid "%d installation transactions failed"
msgstr ""
-#: pkgs.pm:777
+#: pkgs.pm:781
#, fuzzy, c-format
msgid "Installation of packages failed:"
msgstr "%s paketi oʻrnatilmoqda"
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
#, c-format
msgid "Workstation"
msgstr "Ish stansiyasi"
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
#, c-format
msgid "Office Workstation"
msgstr "Idora stansiyasi"
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
#, c-format
msgid ""
"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -404,7 +383,7 @@ msgstr ""
"Idora uchun dasturlar: matn protsessorlari (OpenOffice.org Writer, Kword), "
"elektron jadvallar (OpenOffice.org Calc, Kspread), PDF koʻruvchilar va hokazo"
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
#, c-format
msgid ""
"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -413,32 +392,32 @@ msgstr ""
"Idora uchun dasturlar: matn protsessorlari (kword, abiword), elektron "
"jadvallar (kspread, gnumeric), PDF koʻruvchilar va hokazo"
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
#, c-format
msgid "Game station"
msgstr "Oʻyin stansiyasi"
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
#, c-format
msgid "Amusement programs: arcade, boards, strategy, etc"
msgstr "Ovunchoq dasturlar: arkada, stol oʻyinlari, strategiya va hokazo"
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
#, c-format
msgid "Multimedia station"
msgstr "Multimedia stansiyasi"
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
#, c-format
msgid "Sound and video playing/editing programs"
msgstr "Audio va videoni oʻynash/tahrirlash uchun dasturlar"
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
#, c-format
msgid "Internet station"
msgstr "Internet stansiyasi"
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
#, c-format
msgid ""
"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -447,223 +426,205 @@ msgstr ""
"Xat-xabar, yangiliklarni oʻqish va joʻnatish (mutt, tin..) va Internetda "
"sayr qilish uchun vositalar toʻplami"
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
#, c-format
msgid "Network Computer (client)"
msgstr "Tarmoqdagi kompyuter (klient)"
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
#, c-format
msgid "Clients for different protocols including ssh"
msgstr "Turli protokollar, shu jumlada SSH, uchun klientlar"
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
#, c-format
msgid "Tools to ease the configuration of your computer"
msgstr "Kompyuterni moslashni yengilashtirish uchun vositalar"
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
#, c-format
msgid "Console Tools"
msgstr "Konsol vositalari"
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
#, c-format
msgid "Editors, shells, file tools, terminals"
msgstr "Tahrirchilar, konsollar, fayl vositalari, terminallar"
#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
#, c-format
msgid "Development"
msgstr "Tuzish"
#: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
#, c-format
msgid "C and C++ development libraries, programs and include files"
msgstr "C va C++ tuzish kutubxonalari, vositalar va xeder fayllar"
#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
#, c-format
msgid "Documentation"
msgstr "Qoʻllanmalar"
#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
#, c-format
msgid "Books and Howto's on Linux and Free Software"
msgstr "Linux va erkin dasturlar haqida kitoblar va Howto'lar"
#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
#, c-format
msgid "LSB"
msgstr "LSB"
#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
#, c-format
msgid "Linux Standard Base. Third party applications support"
msgstr ""
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
#, c-format
msgid "Web Server"
msgstr "Veb-serveri"
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
#, c-format
msgid "Apache"
msgstr "Apache"
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
#, c-format
msgid "Groupware"
msgstr "Groupware"
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
#, c-format
msgid "Kolab Server"
msgstr "Kolab serveri"
#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
#, c-format
msgid "Firewall/Router"
msgstr "Fayervol/Ruter"
#: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
#, c-format
msgid "Internet gateway"
msgstr "Internet geytveyi"
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
#, c-format
msgid "Mail/News"
msgstr "Xat-xabar/Yangiliklar"
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
#, c-format
msgid "Postfix mail server, Inn news server"
msgstr "Postfix xat-xabar serveri, Inn yangiliklar serveri"
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
#, c-format
msgid "Directory Server"
msgstr "Direktoriya serveri"
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
#, c-format
msgid "FTP Server"
msgstr "FTP serveri"
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
#, c-format
msgid "ProFTPd"
msgstr "ProFTPd"
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
#, c-format
msgid "DNS/NIS"
msgstr "DNS/NIS"
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
#, c-format
msgid "Domain Name and Network Information Server"
msgstr "DNS va NIS"
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
#, c-format
msgid "File and Printer Sharing Server"
msgstr "Fayl va printerni boʻlishish serveri"
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
#, c-format
msgid "NFS Server, Samba server"
msgstr "NFS serveri, Samba serveri"
#: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
#, c-format
msgid "Database"
msgstr "Maʼlumot bazasi"
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
#, c-format
msgid "PostgreSQL and MySQL Database Server"
msgstr "PostgreSQL va MySQL maʼlumot bazasi"
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
#, c-format
msgid "Web/FTP"
msgstr "Web/FTP"
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
#, c-format
msgid "Apache, Pro-ftpd"
msgstr "Apache, Pro-ftpd"
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
#, c-format
msgid "Mail"
msgstr "Xat-xabar"
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
#, c-format
msgid "Postfix mail server"
msgstr "Postfix xat-xabar serveri"
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
#, c-format
msgid "PostgreSQL or MySQL database server"
msgstr "PostgreSQL yoki MySQL maʼlumot bazasi"
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
#, c-format
msgid "Network Computer server"
msgstr "Tarmoqdagi kompyuter (server)"
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
#, c-format
msgid "NFS server, SMB server, Proxy server, ssh server"
msgstr "NFS serveri, SMB serveri, Proxy serveri, SSH serveri"
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
#, c-format
msgid "Graphical Environment"
msgstr "Grafik muhit"
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
#, c-format
msgid "KDE Workstation"
msgstr "KDE stansiyasi"
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
#, c-format
msgid ""
"The K Desktop Environment, the basic graphical environment with a collection "
"of accompanying tools"
msgstr "KDE - vositalar toʻplami bilan birga asosiy grafik muhit"
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
#, c-format
msgid "GNOME Workstation"
msgstr "GNOME stansiyasi"
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
#, c-format
msgid ""
"A graphical environment with user-friendly set of applications and desktop "
@@ -672,7 +633,7 @@ msgstr ""
"Foydalanuvchilar uchun qulay dasturlar va ish stoli vositalaridan iborat "
"grafik muhit"
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
#, fuzzy, c-format
msgid "LXDE Desktop"
msgstr "IceWm ish stoli"
@@ -686,55 +647,53 @@ msgstr ""
"Foydalanuvchilar uchun qulay dasturlar va ish stoli vositalaridan iborat "
"grafik muhit"
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
#, c-format
msgid "Other Graphical Desktops"
msgstr "Boshqa grafik ish stollari"
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
#, c-format
msgid "Window Maker, Enlightenment, Fvwm, etc"
msgstr "Window Maker, Enlightenment, Fvwm, va hokazo"
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
#, c-format
msgid "Utilities"
msgstr "Vositalar"
#: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
#, c-format
msgid "SSH Server"
msgstr "SSH serveri"
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
#, c-format
msgid "Webmin"
msgstr "Webmin"
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
#, c-format
msgid "Webmin Remote Configuration Server"
msgstr "Webmin masofadan boshqarish serveri"
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
#, c-format
msgid "Network Utilities/Monitoring"
msgstr "Tarmoq vositalari/Nazorat qilish"
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
#, c-format
msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
msgstr ""
"Nazorat qilish vositalari, vazifalar hisobotchilari, tcpdump, nmap, ..."
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
#, c-format
msgid "Mandriva Wizards"
msgstr "Mandriva yordamchilari"
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
#, c-format
msgid "Wizards to configure server"
msgstr "Serverni moslash uchun yordamchilar"
@@ -828,17 +787,17 @@ msgstr ""
msgid "Click on images in order to see a bigger preview"
msgstr "Ish stolini yaqinroqdan koʻrish uchun rasmni sichqoncha bilan bosing"
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
#, c-format
msgid "Package Group Selection"
msgstr "Paketlarni guruh boʻyicha tanlash"
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
#, c-format
msgid "Individual package selection"
msgstr "Paketlarni bittama-bitta tanlash"
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
#, c-format
msgid "Total size: %d / %d MB"
msgstr "Jami: %d / %d Mb"
@@ -957,12 +916,12 @@ msgstr "Minimal oʻrnatish"
msgid "Software Management"
msgstr "Dasturlar boshqaruvi"
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
#, c-format
msgid "Choose the packages you want to install"
msgstr "Siz oʻrnatmoqchi boʻlgan paketlarni tanlang"
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
#, c-format
msgid "Installing"
msgstr "Oʻrnatilmoqda"
@@ -988,7 +947,7 @@ msgid "%d package"
msgid_plural "%d packages"
msgstr[0] "%d-ta paket"
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
#, c-format
msgid "Summary"
msgstr "Hisobot"
@@ -998,7 +957,7 @@ msgstr "Hisobot"
msgid "Configure"
msgstr "Moslash"
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
#, c-format
msgid "not configured"
msgstr "moslanmagan"
@@ -1008,7 +967,7 @@ msgstr "moslanmagan"
msgid "Media Selection"
msgstr "Ish stolini tanlash"
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
#, c-format
msgid ""
"The following installation media have been found.\n"
@@ -1017,7 +976,7 @@ msgstr ""
"Quyidagi oʻrnatish manbalari aniqlandi.\n"
"Faqat tanlangan manbalar oʻrnatish uchun ishlatiladi."
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
#, c-format
msgid ""
"You have the option to copy the contents of the CDs onto the hard drive "
@@ -1029,7 +988,7 @@ msgstr ""
"nusxa olish mumkin.\n"
"Oʻrnatish toʻliq tugagandan soʻng ular tizimga maʼlum boʻladi."
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
#, c-format
msgid "Copy whole CDs"
msgstr "Butun diskdan nusxa olish"
@@ -1049,59 +1008,49 @@ msgstr "Iltimos tugmalar tartibini tanlang"
msgid "Here is the full list of available keyboards:"
msgstr "Mavjud boʻlgan tugmataglarning toʻliq roʻyxati"
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
#, c-format
msgid "Install/Upgrade"
msgstr "Oʻrnatish/Yangilash"
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
#, c-format
msgid "Is this an install or an upgrade?"
msgstr "Bu oʻrnatishmi yoki yangilashmi?"
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
#, c-format
msgid ""
"_: This is a noun:\n"
"Install"
msgstr "Oʻrnatish"
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
#, c-format
msgid "Upgrade %s"
msgstr "%s OTni yangilash"
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
#, c-format
msgid "Encryption key for %s"
msgstr "%s uchun kodlash kaliti"
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
#, c-format
msgid "Cancel installation, reboot system"
msgstr "Oʻrnatishni bekor qilish, kompyuterni oʻchirib-yoqish"
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
#, c-format
msgid "New Installation"
msgstr "Oʻrnatish"
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
#, c-format
msgid "Upgrade previous installation (not recommended)"
msgstr ""
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
#, c-format
msgid ""
"Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1113,24 +1062,24 @@ msgid ""
"Installation\"."
msgstr ""
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "IDE"
msgstr "IDE"
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "Configuring IDE"
msgstr "IDE'ni moslash"
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
#, c-format
msgid ""
"No free space for 1MB bootstrap! Install will continue, but to boot your "
"system, you'll need to create the bootstrap partition in DiskDrake"
msgstr ""
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
#, c-format
msgid ""
"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1138,7 +1087,7 @@ msgid ""
"DiskDrake"
msgstr ""
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
#, c-format
msgid ""
"Change your Cd-Rom!\n"
@@ -1152,12 +1101,12 @@ msgstr ""
"Agar u sizda boʻlmasa, bu kompakt-diskdan oʻrnatishni bekor qilish uchun "
"\"Bekor qilish\" tugmasini bosing."
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
#, c-format
msgid "Looking for available packages..."
msgstr "Mavjud boʻlgan paketlar qidirilmoqda..."
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
#, c-format
msgid ""
"Your system does not have enough space left for installation or upgrade (%"
@@ -1165,59 +1114,59 @@ msgid ""
msgstr ""
"Tizimda oʻrnatish yoki yangilash uchun yetarli joy qolmadi (%d Mb > %d Mb)"
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
#, c-format
msgid ""
"Please choose load or save package selection.\n"
"The format is the same as auto_install generated files."
msgstr ""
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Load"
msgstr "Yuklash"
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Save"
msgstr "Saqlash"
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
#, c-format
msgid "Bad file"
msgstr "Notoʻgʻri fayl"
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
#, c-format
msgid "KDE"
msgstr "KDE"
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
#, c-format
msgid "GNOME"
msgstr "GNOME"
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
#, c-format
msgid "Desktop Selection"
msgstr "Ish stolini tanlash"
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
#, c-format
msgid "You can choose your workstation desktop profile."
msgstr "Quyidagilardan oʻrnatiladigan ish stolini tanlang"
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
#, c-format
msgid "Selected size is larger than available space"
msgstr "Tanlangan hajm mavjud boʻlgan boʻsh joydan katta"
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
#, c-format
msgid "Type of install"
msgstr "Oʻrnatishning turi"
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
#, c-format
msgid ""
"You have not selected any group of packages.\n"
@@ -1226,82 +1175,82 @@ msgstr ""
"Siz hech qanday paketlar guruhini tanlamadingiz.\n"
"Iltimos siz istagan minimal oʻrnatishni tanlang:"
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
#, c-format
msgid "With X"
msgstr "X bilan"
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
#, c-format
msgid "With basic documentation (recommended!)"
msgstr "Asosiy qoʻllanmalar bilan (tavsiya qilinadi!)"
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
#, c-format
msgid "Truly minimal install (especially no urpmi)"
msgstr "Haqiqiy minimal oʻrnatish (xususan urpmi'siz)"
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
#, c-format
msgid "Preparing installation"
msgstr "Oʻrnatishga tayyorlanmoqda"
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
#, c-format
msgid "Installing package %s"
msgstr "%s paketi oʻrnatilmoqda"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "There was an error ordering packages:"
msgstr "Quyidagi paketlarni saralashda xato roʻy berdi:"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "Go on anyway?"
msgstr "Bunga qaramasdan davom etishni istaysizmi?"
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
#, c-format
msgid "Retry"
msgstr "Qaytadan urinish"
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
#, c-format
msgid "Skip this package"
msgstr "Bu paketga eʼtibor berilmasin"
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
#, c-format
msgid "Skip all packages from medium \"%s\""
msgstr "\"%s\" toʻplamidan hamma paketlarga eʼtibor berilmasin"
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
#, c-format
msgid "Go back to media and packages selection"
msgstr "Oʻrnatish manbalarni va paketlarni tanlashga qaytish"
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
#, c-format
msgid "There was an error installing package %s."
msgstr "Quyidagi paketni oʻrnatishda xato roʻy berdi: %s"
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
#, c-format
msgid "Post-install configuration"
msgstr "Oʻrnatishdan keyin moslash"
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
#, c-format
msgid "Please ensure the Update Modules media is in drive %s"
msgstr ""
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
#, c-format
msgid "Updates"
msgstr "Yangilanishlar"
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
#, c-format
msgid ""
"You now have the opportunity to download updated packages. These packages\n"
@@ -1324,28 +1273,28 @@ msgstr ""
"\n"
"Yangilanishlarni oʻrnatishni istaysizmi?"
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
#, c-format
msgid "%s on %s"
msgstr "%s %s'da"
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
#, c-format
msgid "Hardware"
msgstr "Asbob-uskunalar"
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
#, c-format
msgid "Sound card"
msgstr "Tovush karta"
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
#, c-format
msgid "Do you have an ISA sound card?"
msgstr "Sizda ISA tovush kartasi bormi?"
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
#, c-format
msgid ""
"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1354,69 +1303,69 @@ msgstr ""
"Oʻrnatishdan keyin, tovush kartangizni moslash uchun, \"sndconfig\" yoki "
"\"alsaconf\" dasturini ishga tushiring"
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
#, c-format
msgid "No sound card detected. Try \"harddrake\" after installation"
msgstr ""
"Tovush kartasi topilmadi. Oʻrnatishdan keyin \"harddrake\" dasturini sinab "
"koʻring."
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
#, c-format
msgid "Graphical interface"
msgstr "Grafik interfeys"
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
#, c-format
msgid "Network & Internet"
msgstr "Tarmoq va Internet"
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
#, c-format
msgid "Proxies"
msgstr "Proksilar"
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
#, c-format
msgid "configured"
msgstr "moslangan"
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
#, c-format
msgid "Security Level"
msgstr "Xavfsizlik darajasi"
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
#, c-format
msgid "Firewall"
msgstr "Fayervol"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "activated"
msgstr "ishlayapti"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "disabled"
msgstr "oʻchirilgan"
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
#, c-format
msgid "You have not configured X. Are you sure you really want this?"
msgstr "Siz X'ni moslamadingiz. Rostdan buni istaysizmi?"
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
#, c-format
msgid "Preparing bootloader..."
msgstr "OT yuklagichi tayyorlanmoqda..."
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
#, c-format
msgid "Be patient, this may take a while..."
msgstr ""
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
#, c-format
msgid ""
"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1425,7 +1374,7 @@ msgid ""
"root fs is: root=%s"
msgstr ""
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
#, c-format
msgid ""
"In this security level, access to the files in the Windows partition is "
@@ -1434,17 +1383,17 @@ msgstr ""
"Ushbu xavfsizlik daraja qoʻllanilganda diskning Windows qismidagi fayllarga "
"faqat administrator murojaat qilishi mumkin."
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr "Boʻsh disketni %s uskunasiga qoʻying"
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
#, c-format
msgid "Creating auto install floppy..."
msgstr "Avto-oʻrnatish disketi yaratilmoqda..."
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
#, c-format
msgid ""
"Some steps are not completed.\n"
@@ -1455,7 +1404,7 @@ msgstr ""
"\n"
"Rostdan chiqishni istaysizmi?"
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
#, c-format
msgid "Congratulations"
msgstr "Tabriklaymiz!"
@@ -1599,6 +1548,9 @@ msgid ""
"Exit"
msgstr "Chiqish"
+#~ msgid "Downloading file %s..."
+#~ msgstr "%s fayli yozib olinmoqda..."
+
#~ msgid ""
#~ "You have selected the following server(s): %s\n"
#~ "\n"
diff --git a/perl-install/install/share/po/uz@cyrillic.po b/perl-install/install/share/po/uz@cyrillic.po
index 784a2c7ed..962a19477 100644
--- a/perl-install/install/share/po/uz@cyrillic.po
+++ b/perl-install/install/share/po/uz@cyrillic.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: uz@cyrillic\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
"PO-Revision-Date: 2008-08-24 01:06+0200\n"
"Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
"Language-Team: Uzbek <floss-uz-l10n@googlegroups.com>\n"
@@ -19,31 +19,6 @@ msgstr ""
"X-Generator: KBabel 1.11.4\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr ""
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr ""
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr ""
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr ""
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr ""
-
#: any.pm:109
#, c-format
msgid "Do you have further supplementary media?"
@@ -83,17 +58,17 @@ msgstr "Тармоқ (FTP)"
msgid "Network (NFS)"
msgstr "Тармоқ (NFS)"
-#: any.pm:163
+#: any.pm:165
#, c-format
msgid "URL of the mirror?"
msgstr "Ойнанинг манзили (URL)"
-#: any.pm:169
+#: any.pm:171
#, c-format
msgid "URL must start with ftp:// or http://"
msgstr "Манзил ftp:// ёки http:// билан бошланиши керак"
-#: any.pm:180
+#: any.pm:182
#, c-format
msgid ""
"Contacting Mandriva Linux web site to get the list of available mirrors..."
@@ -101,7 +76,7 @@ msgstr ""
"Мавжуд бўлган ойналарнинг рўйхатини олиш учун Mandriva Linux сайти билан "
"алоқа ўрнатилмоқда..."
-#: any.pm:185
+#: any.pm:187
#, c-format
msgid ""
"Failed contacting Mandriva Linux web site to get the list of available "
@@ -110,47 +85,47 @@ msgstr ""
"Мавжуд бўлган ойналарнинг рўйхатини олиш учун Mandriva Linux сайти билан "
"алоқа ўрнатиб бўлмади"
-#: any.pm:195
+#: any.pm:197
#, c-format
msgid "Choose a mirror from which to get the packages"
msgstr "Пакетларни олиш учун ойнани танланг"
-#: any.pm:225
+#: any.pm:227
#, c-format
msgid "NFS setup"
msgstr "NFS орқали ўрнатиш"
-#: any.pm:226
+#: any.pm:228
#, c-format
msgid "Please enter the hostname and directory of your NFS media"
msgstr "NFS тўпламининг компьютер номини ва директорияни киритинг"
-#: any.pm:230
+#: any.pm:232
#, c-format
msgid "Hostname missing"
msgstr "Компьютернинг номи кўрсатилмаган"
-#: any.pm:231
+#: any.pm:233
#, c-format
msgid "Directory must begin with \"/\""
msgstr "Директория \"/\" белги билан бошлаши керак"
-#: any.pm:235
+#: any.pm:237
#, c-format
msgid "Hostname of the NFS mount ?"
msgstr "NFS серверининг хост номи"
-#: any.pm:236
+#: any.pm:238
#, c-format
msgid "Directory"
msgstr "Директория"
-#: any.pm:258
+#: any.pm:260
#, c-format
msgid "Supplementary"
msgstr "Қўшимча"
-#: any.pm:293
+#: any.pm:295
#, c-format
msgid ""
"Can't find a package list file on this mirror. Make sure the location is "
@@ -159,22 +134,22 @@ msgstr ""
"Ойнада пакетлар рўйхатини топиб бўлмади. Манзил (URL) тўғри "
"кўрсатилганлигини текширинг."
-#: any.pm:328
+#: any.pm:334
#, c-format
msgid "Looking at packages already installed..."
msgstr "Аллақачон ўрнатилган пакетлар қидирилмоқда..."
-#: any.pm:362
+#: any.pm:368
#, c-format
msgid "Finding packages to upgrade..."
msgstr "Янгилаш учун пакетлар қидирилмоқда..."
-#: any.pm:381
+#: any.pm:387
#, c-format
msgid "Removing packages prior to upgrade..."
msgstr "Янгилашдан аввал пакетлар олиб ташланмоқда..."
-#: any.pm:402
+#: any.pm:408
#, c-format
msgid ""
"You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -186,18 +161,18 @@ msgid ""
"please reboot your system and upgrade using the Mandriva update applet."
msgstr ""
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
#, c-format
msgid "Reboot"
msgstr "Ўчириб-ёқиш"
-#: any.pm:407
+#: any.pm:413
#, c-format
msgid "Proceed"
msgstr ""
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -210,72 +185,72 @@ msgstr ""
"\n"
"Давом этишни истайсизми?\n"
-#: any.pm:815
+#: any.pm:821
#, c-format
msgid "Error reading file %s"
msgstr "%s файлини ўқишда хато рўй берди"
-#: any.pm:1022
+#: any.pm:1028
#, c-format
msgid "The following disk(s) were renamed:"
msgstr "Қуйидаги диск(лар)нинг номи ўзгартирилди:"
-#: any.pm:1024
+#: any.pm:1030
#, c-format
msgid "%s (previously named as %s)"
msgstr "%s (олдинги номи %s)"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "HTTP"
msgstr "HTTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "FTP"
msgstr "FTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "NFS"
msgstr "NFS"
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
#, c-format
msgid "Network"
msgstr "Тармоқ"
-#: any.pm:1104
+#: any.pm:1110
#, c-format
msgid "Please choose a media"
msgstr "Илтимос тўпламни танланг"
-#: any.pm:1120
+#: any.pm:1126
#, c-format
msgid "File already exists. Overwrite it?"
msgstr "Файл аллақачон мавжуд. Уни алмаштиришни истайсизми?"
-#: any.pm:1124
+#: any.pm:1130
#, c-format
msgid "Permission denied"
msgstr "Рухсат йўқ"
-#: any.pm:1172
+#: any.pm:1178
#, c-format
msgid "Bad NFS name"
msgstr "NFS номи нотўғри"
-#: any.pm:1193
+#: any.pm:1199
#, c-format
msgid "Bad media %s"
msgstr "Нотўғри тўплам %s"
-#: any.pm:1236
+#: any.pm:1242
#, c-format
msgid "Can not make screenshots before partitioning"
msgstr "Скриншотларни дискни бўлишдан аввал олиб бўлмайди"
-#: any.pm:1244
+#: any.pm:1250
#, c-format
msgid "Screenshots will be available after install in %s"
msgstr ""
@@ -287,11 +262,15 @@ msgid "Installation"
msgstr "Ўрнатиш"
#: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
#, c-format
msgid "Configuration"
msgstr "Мослаш"
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
#: install2.pm:168
#, c-format
msgid "You must also format %s"
@@ -316,22 +295,22 @@ msgstr "Тармоқ ишга туширилмоқда"
msgid "Bringing down the network"
msgstr "Тармоқ ўчирилмоқда"
-#: media.pm:402
+#: media.pm:399
#, c-format
msgid "Please wait, retrieving file"
msgstr ""
-#: media.pm:734
+#: media.pm:718
#, c-format
-msgid "Downloading file %s..."
-msgstr "%s файли ёзиб олинмоқда..."
+msgid "unable to add medium"
+msgstr ""
-#: media.pm:822
+#: media.pm:758
#, c-format
msgid "Copying some packages on disks for future use"
msgstr "Баъзи пакетлардан дискка нусха олинмоқда"
-#: media.pm:875
+#: media.pm:811
#, c-format
msgid "Copying in progress"
msgstr "Нусха олиш давом этмоқда"
@@ -375,27 +354,27 @@ msgstr ""
msgid "An error occurred:"
msgstr "Хато рўй берди"
-#: pkgs.pm:776
+#: pkgs.pm:780
#, c-format
msgid "%d installation transactions failed"
msgstr ""
-#: pkgs.pm:777
+#: pkgs.pm:781
#, fuzzy, c-format
msgid "Installation of packages failed:"
msgstr "%s пакети ўрнатилмоқда"
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
#, c-format
msgid "Workstation"
msgstr "Иш станцияси"
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
#, c-format
msgid "Office Workstation"
msgstr "Идора станцияси"
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
#, c-format
msgid ""
"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -404,7 +383,7 @@ msgstr ""
"Идора учун дастурлар: матн процессорлари (OpenOffice.org Writer, Kword), "
"электрон жадваллар (OpenOffice.org Calc, Kspread), PDF кўрувчилар ва ҳоказо"
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
#, c-format
msgid ""
"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -413,32 +392,32 @@ msgstr ""
"Идора учун дастурлар: матн процессорлари (kword, abiword), электрон "
"жадваллар (kspread, gnumeric), PDF кўрувчилар ва ҳоказо"
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
#, c-format
msgid "Game station"
msgstr "Ўйин станцияси"
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
#, c-format
msgid "Amusement programs: arcade, boards, strategy, etc"
msgstr "Овунчоқ дастурлар: аркада, стол ўйинлари, стратегия ва ҳоказо"
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
#, c-format
msgid "Multimedia station"
msgstr "Мултимедиа станцияси"
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
#, c-format
msgid "Sound and video playing/editing programs"
msgstr "Аудио ва видеони ўйнаш/таҳрирлаш учун дастурлар"
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
#, c-format
msgid "Internet station"
msgstr "Интернет станцияси"
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
#, c-format
msgid ""
"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -447,223 +426,205 @@ msgstr ""
"Хат-хабар, янгиликларни ўқиш ва жўнатиш (mutt, tin..) ва Интернетда сайр "
"қилиш учун воситалар тўплами"
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
#, c-format
msgid "Network Computer (client)"
msgstr "Тармоқдаги компьютер (клиент)"
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
#, c-format
msgid "Clients for different protocols including ssh"
msgstr "Турли протоколлар, шу жумлада SSH, учун клиентлар"
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
#, c-format
msgid "Tools to ease the configuration of your computer"
msgstr "Компьютерни мослашни енгилаштириш учун воситалар"
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
#, c-format
msgid "Console Tools"
msgstr "Консол воситалари"
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
#, c-format
msgid "Editors, shells, file tools, terminals"
msgstr "Таҳрирчилар, консоллар, файл воситалари, терминаллар"
#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
#, c-format
msgid "Development"
msgstr "Тузиш"
#: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
#, c-format
msgid "C and C++ development libraries, programs and include files"
msgstr "C ва C++ тузиш кутубхоналари, воситалар ва хедер файллар"
#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
#, c-format
msgid "Documentation"
msgstr "Қўлланмалар"
#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
#, c-format
msgid "Books and Howto's on Linux and Free Software"
msgstr "Linux ва эркин дастурлар ҳақида китоблар ва Howto'лар"
#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
#, c-format
msgid "LSB"
msgstr "LSB"
#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
#, c-format
msgid "Linux Standard Base. Third party applications support"
msgstr ""
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
#, c-format
msgid "Web Server"
msgstr "Веб-сервери"
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
#, c-format
msgid "Apache"
msgstr "Apache"
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
#, c-format
msgid "Groupware"
msgstr "Groupware"
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
#, c-format
msgid "Kolab Server"
msgstr "Kolab сервери"
#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
#, c-format
msgid "Firewall/Router"
msgstr "Файервол/Рутер"
#: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
#, c-format
msgid "Internet gateway"
msgstr "Интернет гейтвэйи"
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
#, c-format
msgid "Mail/News"
msgstr "Хат-хабар/Янгиликлар"
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
#, c-format
msgid "Postfix mail server, Inn news server"
msgstr "Postfix хат-хабар сервери, Inn янгиликлар сервери"
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
#, c-format
msgid "Directory Server"
msgstr "Директория сервери"
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
#, c-format
msgid "FTP Server"
msgstr "FTP сервери"
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
#, c-format
msgid "ProFTPd"
msgstr "ProFTPd"
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
#, c-format
msgid "DNS/NIS"
msgstr "DNS/NIS"
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
#, c-format
msgid "Domain Name and Network Information Server"
msgstr "DNS ва NIS"
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
#, c-format
msgid "File and Printer Sharing Server"
msgstr "Файл ва принтерни бўлишиш сервери"
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
#, c-format
msgid "NFS Server, Samba server"
msgstr "NFS сервери, Samba сервери"
#: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
#, c-format
msgid "Database"
msgstr "Маълумот базаси"
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
#, c-format
msgid "PostgreSQL and MySQL Database Server"
msgstr "PostgreSQL ва MySQL маълумот базаси"
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
#, c-format
msgid "Web/FTP"
msgstr "Web/FTP"
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
#, c-format
msgid "Apache, Pro-ftpd"
msgstr "Apache, Pro-ftpd"
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
#, c-format
msgid "Mail"
msgstr "Хат-хабар"
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
#, c-format
msgid "Postfix mail server"
msgstr "Postfix хат-хабар сервери"
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
#, c-format
msgid "PostgreSQL or MySQL database server"
msgstr "PostgreSQL ёки MySQL маълумот базаси"
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
#, c-format
msgid "Network Computer server"
msgstr "Тармоқдаги компьютер (сервер)"
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
#, c-format
msgid "NFS server, SMB server, Proxy server, ssh server"
msgstr "NFS сервери, SMB сервери, Proxy сервери, SSH сервери"
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
#, c-format
msgid "Graphical Environment"
msgstr "График муҳит"
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
#, c-format
msgid "KDE Workstation"
msgstr "KDE станцияси"
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
#, c-format
msgid ""
"The K Desktop Environment, the basic graphical environment with a collection "
"of accompanying tools"
msgstr "KDE - воситалар тўплами билан бирга асосий график муҳит"
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
#, c-format
msgid "GNOME Workstation"
msgstr "GNOME станцияси"
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
#, c-format
msgid ""
"A graphical environment with user-friendly set of applications and desktop "
@@ -672,7 +633,7 @@ msgstr ""
"Фойдаланувчилар учун қулай дастурлар ва иш столи воситаларидан иборат график "
"муҳит"
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
#, fuzzy, c-format
msgid "LXDE Desktop"
msgstr "IceWm иш столи"
@@ -686,54 +647,52 @@ msgstr ""
"Фойдаланувчилар учун қулай дастурлар ва иш столи воситаларидан иборат график "
"муҳит"
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
#, c-format
msgid "Other Graphical Desktops"
msgstr "Бошқа график иш столлари"
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
#, c-format
msgid "Window Maker, Enlightenment, Fvwm, etc"
msgstr "Window Maker, Enlightenment, Fvwm, ва ҳоказо"
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
#, c-format
msgid "Utilities"
msgstr "Воситалар"
#: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
#, c-format
msgid "SSH Server"
msgstr "SSH сервери"
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
#, c-format
msgid "Webmin"
msgstr "Webmin"
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
#, c-format
msgid "Webmin Remote Configuration Server"
msgstr "Webmin масофадан бошқариш сервери"
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
#, c-format
msgid "Network Utilities/Monitoring"
msgstr "Тармоқ воситалари/Назорат қилиш"
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
#, c-format
msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
msgstr "Назорат қилиш воситалари, вазифалар ҳисоботчилари, tcpdump, nmap, ..."
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
#, c-format
msgid "Mandriva Wizards"
msgstr "Mandriva ёрдамчилари"
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
#, c-format
msgid "Wizards to configure server"
msgstr "Серверни мослаш учун ёрдамчилар"
@@ -827,17 +786,17 @@ msgstr ""
msgid "Click on images in order to see a bigger preview"
msgstr "Иш столини яқинроқдан кўриш учун расмни сичқонча билан босинг"
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
#, c-format
msgid "Package Group Selection"
msgstr "Пакетларни гуруҳ бўйича танлаш"
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
#, c-format
msgid "Individual package selection"
msgstr "Пакетларни биттама-битта танлаш"
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
#, c-format
msgid "Total size: %d / %d MB"
msgstr "Жами: %d / %d Мб"
@@ -955,12 +914,12 @@ msgstr "Минимал ўрнатиш"
msgid "Software Management"
msgstr "Дастурлар бошқаруви"
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
#, c-format
msgid "Choose the packages you want to install"
msgstr "Сиз ўрнатмоқчи бўлган пакетларни танланг"
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
#, c-format
msgid "Installing"
msgstr "Ўрнатилмоқда"
@@ -986,7 +945,7 @@ msgid "%d package"
msgid_plural "%d packages"
msgstr[0] "%d-та пакет"
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
#, c-format
msgid "Summary"
msgstr "Ҳисобот"
@@ -996,7 +955,7 @@ msgstr "Ҳисобот"
msgid "Configure"
msgstr "Мослаш"
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
#, c-format
msgid "not configured"
msgstr "мосланмаган"
@@ -1006,7 +965,7 @@ msgstr "мосланмаган"
msgid "Media Selection"
msgstr "Иш столини танлаш"
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
#, c-format
msgid ""
"The following installation media have been found.\n"
@@ -1015,7 +974,7 @@ msgstr ""
"Қуйидаги ўрнатиш манбалари аниқланди.\n"
"Фақат танланган манбалар ўрнатиш учун ишлатилади."
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
#, c-format
msgid ""
"You have the option to copy the contents of the CDs onto the hard drive "
@@ -1027,7 +986,7 @@ msgstr ""
"олиш мумкин.\n"
"Ўрнатиш тўлиқ тугагандан сўнг улар тизимга маълум бўлади."
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
#, c-format
msgid "Copy whole CDs"
msgstr "Бутун дискдан нусха олиш"
@@ -1047,59 +1006,49 @@ msgstr "Илтимос тугмалар тартибини танланг"
msgid "Here is the full list of available keyboards:"
msgstr "Мавжуд бўлган тугматагларнинг тўлиқ рўйхати"
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
#, c-format
msgid "Install/Upgrade"
msgstr "Ўрнатиш/Янгилаш"
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
#, c-format
msgid "Is this an install or an upgrade?"
msgstr "Бу ўрнатишми ёки янгилашми?"
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
#, c-format
msgid ""
"_: This is a noun:\n"
"Install"
msgstr "Ўрнатиш"
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
#, c-format
msgid "Upgrade %s"
msgstr "%s ОТни янгилаш"
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
#, c-format
msgid "Encryption key for %s"
msgstr "%s учун кодлаш калити"
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
#, c-format
msgid "Cancel installation, reboot system"
msgstr "Ўрнатишни бекор қилиш, компьютерни ўчириб-ёқиш"
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
#, c-format
msgid "New Installation"
msgstr "Ўрнатиш"
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
#, c-format
msgid "Upgrade previous installation (not recommended)"
msgstr ""
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
#, c-format
msgid ""
"Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1111,24 +1060,24 @@ msgid ""
"Installation\"."
msgstr ""
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "IDE"
msgstr "IDE"
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "Configuring IDE"
msgstr "IDE'ни мослаш"
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
#, c-format
msgid ""
"No free space for 1MB bootstrap! Install will continue, but to boot your "
"system, you'll need to create the bootstrap partition in DiskDrake"
msgstr ""
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
#, c-format
msgid ""
"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1136,7 +1085,7 @@ msgid ""
"DiskDrake"
msgstr ""
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
#, c-format
msgid ""
"Change your Cd-Rom!\n"
@@ -1150,71 +1099,71 @@ msgstr ""
"Агар у сизда бўлмаса, бу компакт-дискдан ўрнатишни бекор қилиш учун \"Бекор "
"қилиш\" тугмасини босинг."
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
#, c-format
msgid "Looking for available packages..."
msgstr "Мавжуд бўлган пакетлар қидирилмоқда..."
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
#, c-format
msgid ""
"Your system does not have enough space left for installation or upgrade (%"
"dMB > %dMB)"
msgstr "Тизимда ўрнатиш ёки янгилаш учун етарли жой қолмади (%d Мб > %d Мб)"
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
#, c-format
msgid ""
"Please choose load or save package selection.\n"
"The format is the same as auto_install generated files."
msgstr ""
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Load"
msgstr "Юклаш"
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Save"
msgstr "Сақлаш"
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
#, c-format
msgid "Bad file"
msgstr "Нотўғри файл"
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
#, c-format
msgid "KDE"
msgstr "KDE"
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
#, c-format
msgid "GNOME"
msgstr "GNOME"
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
#, c-format
msgid "Desktop Selection"
msgstr "Иш столини танлаш"
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
#, c-format
msgid "You can choose your workstation desktop profile."
msgstr "Қуйидагилардан ўрнатиладиган иш столини танланг"
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
#, c-format
msgid "Selected size is larger than available space"
msgstr "Танланган ҳажм мавжуд бўлган бўш жойдан катта"
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
#, c-format
msgid "Type of install"
msgstr "Ўрнатишнинг тури"
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
#, c-format
msgid ""
"You have not selected any group of packages.\n"
@@ -1223,82 +1172,82 @@ msgstr ""
"Сиз ҳеч қандай пакетлар гуруҳини танламадингиз.\n"
"Илтимос сиз истаган минимал ўрнатишни танланг:"
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
#, c-format
msgid "With X"
msgstr "X билан"
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
#, c-format
msgid "With basic documentation (recommended!)"
msgstr "Асосий қўлланмалар билан (тавсия қилинади!)"
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
#, c-format
msgid "Truly minimal install (especially no urpmi)"
msgstr "Ҳақиқий минимал ўрнатиш (хусусан urpmi'сиз)"
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
#, c-format
msgid "Preparing installation"
msgstr "Ўрнатишга тайёрланмоқда"
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
#, c-format
msgid "Installing package %s"
msgstr "%s пакети ўрнатилмоқда"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "There was an error ordering packages:"
msgstr "Қуйидаги пакетларни саралашда хато рўй берди:"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "Go on anyway?"
msgstr "Бунга қарамасдан давом этишни истайсизми?"
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
#, c-format
msgid "Retry"
msgstr "Қайтадан уриниш"
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
#, c-format
msgid "Skip this package"
msgstr "Бу пакетга эътибор берилмасин"
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
#, c-format
msgid "Skip all packages from medium \"%s\""
msgstr "\"%s\" тўпламидан ҳамма пакетларга эътибор берилмасин"
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
#, c-format
msgid "Go back to media and packages selection"
msgstr "Ўрнатиш манбаларни ва пакетларни танлашга қайтиш"
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
#, c-format
msgid "There was an error installing package %s."
msgstr "Қуйидаги пакетни ўрнатишда хато рўй берди: %s"
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
#, c-format
msgid "Post-install configuration"
msgstr "Ўрнатишдан кейин мослаш"
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
#, c-format
msgid "Please ensure the Update Modules media is in drive %s"
msgstr ""
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
#, c-format
msgid "Updates"
msgstr "Янгиланишлар"
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
#, c-format
msgid ""
"You now have the opportunity to download updated packages. These packages\n"
@@ -1320,28 +1269,28 @@ msgstr ""
"\n"
"Янгиланишларни ўрнатишни истайсизми?"
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
#, c-format
msgid "%s on %s"
msgstr "%s %s'да"
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
#, c-format
msgid "Hardware"
msgstr "Асбоб-ускуналар"
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
#, c-format
msgid "Sound card"
msgstr "Товуш карта"
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
#, c-format
msgid "Do you have an ISA sound card?"
msgstr "Сизда ISA товуш картаси борми?"
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
#, c-format
msgid ""
"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1350,69 +1299,69 @@ msgstr ""
"Ўрнатишдан кейин, товуш картангизни мослаш учун, \"sndconfig\" ёки \"alsaconf"
"\" дастурини ишга туширинг"
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
#, c-format
msgid "No sound card detected. Try \"harddrake\" after installation"
msgstr ""
"Товуш картаси топилмади. Ўрнатишдан кейин \"harddrake\" дастурини синаб "
"кўринг."
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
#, c-format
msgid "Graphical interface"
msgstr "График интерфейс"
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
#, c-format
msgid "Network & Internet"
msgstr "Тармоқ ва Интернет"
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
#, c-format
msgid "Proxies"
msgstr "Проксилар"
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
#, c-format
msgid "configured"
msgstr "мосланган"
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
#, c-format
msgid "Security Level"
msgstr "Хавфсизлик даражаси"
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
#, c-format
msgid "Firewall"
msgstr "Файервол"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "activated"
msgstr "ишлаяпти"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "disabled"
msgstr "ўчирилган"
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
#, c-format
msgid "You have not configured X. Are you sure you really want this?"
msgstr "Сиз X'ни мосламадингиз. Ростдан буни истайсизми?"
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
#, c-format
msgid "Preparing bootloader..."
msgstr "ОТ юклагичи тайёрланмоқда..."
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
#, c-format
msgid "Be patient, this may take a while..."
msgstr ""
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
#, c-format
msgid ""
"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1421,7 +1370,7 @@ msgid ""
"root fs is: root=%s"
msgstr ""
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
#, c-format
msgid ""
"In this security level, access to the files in the Windows partition is "
@@ -1430,17 +1379,17 @@ msgstr ""
"Ушбу хавфсизлик даража қўлланилганда дискнинг Windows қисмидаги файлларга "
"фақат администратор мурожаат қилиши мумкин."
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr "Бўш дискетни %s ускунасига қўйинг"
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
#, c-format
msgid "Creating auto install floppy..."
msgstr "Авто-ўрнатиш дискети яратилмоқда..."
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
#, c-format
msgid ""
"Some steps are not completed.\n"
@@ -1451,7 +1400,7 @@ msgstr ""
"\n"
"Ростдан чиқишни истайсизми?"
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
#, c-format
msgid "Congratulations"
msgstr "Табриклаймиз!"
@@ -1595,6 +1544,9 @@ msgid ""
"Exit"
msgstr "Чиқиш"
+#~ msgid "Downloading file %s..."
+#~ msgstr "%s файли ёзиб олинмоқда..."
+
#~ msgid ""
#~ "You have selected the following server(s): %s\n"
#~ "\n"
diff --git a/perl-install/install/share/po/vi.po b/perl-install/install/share/po/vi.po
index 98e90063f..b59ff51fd 100644
--- a/perl-install/install/share/po/vi.po
+++ b/perl-install/install/share/po/vi.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: DrakX-vi version\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
"PO-Revision-Date: 2005-06-02 21:17+0700\n"
"Last-Translator: Larry Nguyen <larry@vnlinux.org>\n"
"Language-Team: <gnomevi-list@lists.sourceforge.net>\n"
@@ -16,31 +16,6 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr ""
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr ""
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr ""
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr ""
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr ""
-
#: any.pm:109
#, c-format
msgid "Do you have further supplementary media?"
@@ -76,17 +51,17 @@ msgstr "Mạng (FTP)"
msgid "Network (NFS)"
msgstr ""
-#: any.pm:163
+#: any.pm:165
#, c-format
msgid "URL of the mirror?"
msgstr "URL của mirror?"
-#: any.pm:169
+#: any.pm:171
#, c-format
msgid "URL must start with ftp:// or http://"
msgstr ""
-#: any.pm:180
+#: any.pm:182
#, c-format
msgid ""
"Contacting Mandriva Linux web site to get the list of available mirrors..."
@@ -94,7 +69,7 @@ msgstr ""
"Đang kết nối với website của Mandriva Linux để lấy danh sách các mirrors "
"hiệncó..."
-#: any.pm:185
+#: any.pm:187
#, fuzzy, c-format
msgid ""
"Failed contacting Mandriva Linux web site to get the list of available "
@@ -103,69 +78,69 @@ msgstr ""
"Đang kết nối với website của Mandriva Linux để lấy danh sách các mirrors "
"hiệncó..."
-#: any.pm:195
+#: any.pm:197
#, c-format
msgid "Choose a mirror from which to get the packages"
msgstr "Chọn một mirror để tải các gói về"
-#: any.pm:225
+#: any.pm:227
#, c-format
msgid "NFS setup"
msgstr ""
-#: any.pm:226
+#: any.pm:228
#, c-format
msgid "Please enter the hostname and directory of your NFS media"
msgstr ""
-#: any.pm:230
+#: any.pm:232
#, c-format
msgid "Hostname missing"
msgstr ""
-#: any.pm:231
+#: any.pm:233
#, c-format
msgid "Directory must begin with \"/\""
msgstr ""
-#: any.pm:235
+#: any.pm:237
#, c-format
msgid "Hostname of the NFS mount ?"
msgstr ""
-#: any.pm:236
+#: any.pm:238
#, c-format
msgid "Directory"
msgstr "Thư mục"
-#: any.pm:258
+#: any.pm:260
#, c-format
msgid "Supplementary"
msgstr ""
-#: any.pm:293
+#: any.pm:295
#, c-format
msgid ""
"Can't find a package list file on this mirror. Make sure the location is "
"correct."
msgstr "Không thể tìm tập tin hdlist trên mirror này"
-#: any.pm:328
+#: any.pm:334
#, c-format
msgid "Looking at packages already installed..."
msgstr "Kiểm tra các gói đã được cài đặt..."
-#: any.pm:362
+#: any.pm:368
#, c-format
msgid "Finding packages to upgrade..."
msgstr "Đang tìm các gói để nâng cấp"
-#: any.pm:381
+#: any.pm:387
#, c-format
msgid "Removing packages prior to upgrade..."
msgstr ""
-#: any.pm:402
+#: any.pm:408
#, c-format
msgid ""
"You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -177,18 +152,18 @@ msgid ""
"please reboot your system and upgrade using the Mandriva update applet."
msgstr ""
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
#, c-format
msgid "Reboot"
msgstr "Khởi động lại"
-#: any.pm:407
+#: any.pm:413
#, c-format
msgid "Proceed"
msgstr ""
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -201,72 +176,72 @@ msgstr ""
"\n"
"Bạn có thật sự muốn gỡ bỏ các gói tin này không?\n"
-#: any.pm:815
+#: any.pm:821
#, c-format
msgid "Error reading file %s"
msgstr "Lỗi khi đọc tập tin %s"
-#: any.pm:1022
+#: any.pm:1028
#, c-format
msgid "The following disk(s) were renamed:"
msgstr "Đã đổi tên (các) đĩa sau:"
-#: any.pm:1024
+#: any.pm:1030
#, c-format
msgid "%s (previously named as %s)"
msgstr "%s (tên cũ là %s)"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "HTTP"
msgstr "HTTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "FTP"
msgstr "FTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "NFS"
msgstr "NFS"
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
#, c-format
msgid "Network"
msgstr "Mạng"
-#: any.pm:1104
+#: any.pm:1110
#, c-format
msgid "Please choose a media"
msgstr "Hãy chọn phương tiện"
-#: any.pm:1120
+#: any.pm:1126
#, c-format
msgid "File already exists. Overwrite it?"
msgstr "Tập tin tồn tại. Có ghi đè nó không?"
-#: any.pm:1124
+#: any.pm:1130
#, c-format
msgid "Permission denied"
msgstr "Quyền hạn bị từ chối"
-#: any.pm:1172
+#: any.pm:1178
#, c-format
msgid "Bad NFS name"
msgstr ""
-#: any.pm:1193
+#: any.pm:1199
#, c-format
msgid "Bad media %s"
msgstr "Phương tiện hỏng %s"
-#: any.pm:1236
+#: any.pm:1242
#, c-format
msgid "Can not make screenshots before partitioning"
msgstr "Không thể tạo ảnh đĩa trước khi phân vùng"
-#: any.pm:1244
+#: any.pm:1250
#, c-format
msgid "Screenshots will be available after install in %s"
msgstr "Sẽ có ảnh chụp sau quá trình cài đặt trong %s"
@@ -277,11 +252,15 @@ msgid "Installation"
msgstr "Đang cài đặt"
#: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
#, c-format
msgid "Configuration"
msgstr "Cấu hình"
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
#: install2.pm:168
#, c-format
msgid "You must also format %s"
@@ -306,22 +285,22 @@ msgstr "Bật chức năng mạng"
msgid "Bringing down the network"
msgstr "Tắt chức năng mạng"
-#: media.pm:402
+#: media.pm:399
#, c-format
msgid "Please wait, retrieving file"
msgstr ""
-#: media.pm:734
+#: media.pm:718
#, c-format
-msgid "Downloading file %s..."
-msgstr "Đang tải về tập tin %s..."
+msgid "unable to add medium"
+msgstr ""
-#: media.pm:822
+#: media.pm:758
#, c-format
msgid "Copying some packages on disks for future use"
msgstr ""
-#: media.pm:875
+#: media.pm:811
#, c-format
msgid "Copying in progress"
msgstr "Đang sao chép"
@@ -363,27 +342,27 @@ msgstr ""
msgid "An error occurred:"
msgstr "Lỗi xảy ra"
-#: pkgs.pm:776
+#: pkgs.pm:780
#, c-format
msgid "%d installation transactions failed"
msgstr "%d phiên giao dịch cài đặt lỗi"
-#: pkgs.pm:777
+#: pkgs.pm:781
#, fuzzy, c-format
msgid "Installation of packages failed:"
msgstr "Đang cài đặt gói %s"
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
#, c-format
msgid "Workstation"
msgstr "Máy trạm"
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
#, c-format
msgid "Office Workstation"
msgstr "Văn phòng"
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
#, c-format
msgid ""
"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -392,7 +371,7 @@ msgstr ""
"Các chương trình văn phòng: wordprocessors (OpenOffice.org Writer, Kword), "
"spreadsheets (OpenOffice.org Calc, Kspread), chương trình xem PDF, v.v..."
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
#, c-format
msgid ""
"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -401,244 +380,226 @@ msgstr ""
"Các chương trình văn phòng: wordprocessors (kword, abiword), spreadsheets "
"(kspread, gnumeric), pdf viewers, v.v..."
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
#, c-format
msgid "Game station"
msgstr "Trò chơi"
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
#, c-format
msgid "Amusement programs: arcade, boards, strategy, etc"
msgstr "Các chương trình giải trí: arcade, boards, strategy, v.v..."
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
#, c-format
msgid "Multimedia station"
msgstr "Đa phương tiện"
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
#, c-format
msgid "Sound and video playing/editing programs"
msgstr "Các chương trình chơi Audio-Video/soạn thảo"
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
#, c-format
msgid "Internet station"
msgstr "Internet"
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
#, c-format
msgid ""
"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
"Web"
msgstr "Bộ công cụ đọc gửi thư tín và tin tức (mutt, tin..) và để duyệt Web"
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
#, c-format
msgid "Network Computer (client)"
msgstr "Máy tính mạng (khách)"
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
#, c-format
msgid "Clients for different protocols including ssh"
msgstr "Máy khách cho các giao thức khác bao gồm ssh"
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
#, c-format
msgid "Tools to ease the configuration of your computer"
msgstr "Công cụ xoá cấu hình máy tính của bạn"
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
#, c-format
msgid "Console Tools"
msgstr "Các công cụ console"
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
#, c-format
msgid "Editors, shells, file tools, terminals"
msgstr "Các trình soạn thảo, các tiện ích tập tin, các thiết bị đầu cuối"
#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
#, c-format
msgid "Development"
msgstr "Phát triển"
#: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
#, c-format
msgid "C and C++ development libraries, programs and include files"
msgstr ""
"Các thư viện phát triển C và C++, các chương trình và các tập tin đi kèm"
#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
#, c-format
msgid "Documentation"
msgstr "Tài liệu"
#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
#, c-format
msgid "Books and Howto's on Linux and Free Software"
msgstr "Các sách, how-to cho Linux và phần mềm miễn phí"
#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
#, c-format
msgid "LSB"
msgstr "LSB"
#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
#, c-format
msgid "Linux Standard Base. Third party applications support"
msgstr "Cơ Sở Về Chuẩn Linux (LSB). Hỗ trợ ứng dụng cho hãng thứ ba."
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
#, c-format
msgid "Web Server"
msgstr "Máy chủ Web"
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
#, c-format
msgid "Apache"
msgstr "Apache"
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
#, c-format
msgid "Groupware"
msgstr "Groupware"
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
#, c-format
msgid "Kolab Server"
msgstr "Máy chủ Kolab"
#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
#, c-format
msgid "Firewall/Router"
msgstr "Tường lửa/Định tuyến"
#: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
#, c-format
msgid "Internet gateway"
msgstr "Cổng kết nối Internet"
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
#, c-format
msgid "Mail/News"
msgstr "Mail/News"
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
#, c-format
msgid "Postfix mail server, Inn news server"
msgstr "Postfix mail server, Inn news server"
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
#, c-format
msgid "Directory Server"
msgstr "Máy chủ thư mục"
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
#, c-format
msgid "FTP Server"
msgstr "Máy chủ FTP"
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
#, c-format
msgid "ProFTPd"
msgstr "ProFTPd"
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
#, c-format
msgid "DNS/NIS"
msgstr "DNS/NIS"
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
#, c-format
msgid "Domain Name and Network Information Server"
msgstr "Máy chủ thông tin mạng và tên miền"
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
#, c-format
msgid "File and Printer Sharing Server"
msgstr "Máy chủ chia sẻ máy in và tập tin"
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
#, c-format
msgid "NFS Server, Samba server"
msgstr "Máy chủ Samba, NFS"
#: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
#, c-format
msgid "Database"
msgstr "Cơ sở dữ liệu"
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
#, c-format
msgid "PostgreSQL and MySQL Database Server"
msgstr "Máy chủ cơ sở dữ liệu PostgreSQL và MySQL"
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
#, c-format
msgid "Web/FTP"
msgstr "Web/FTP"
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
#, c-format
msgid "Apache, Pro-ftpd"
msgstr "Apache và Pro-ftpd"
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
#, c-format
msgid "Mail"
msgstr "Thư"
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
#, c-format
msgid "Postfix mail server"
msgstr "Máy chủ thư Postfix"
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
#, c-format
msgid "PostgreSQL or MySQL database server"
msgstr "PostgreSQL hay MySQL máy chủ cơ sở dữ liệu"
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
#, c-format
msgid "Network Computer server"
msgstr "Máy chủ mạng"
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
#, c-format
msgid "NFS server, SMB server, Proxy server, ssh server"
msgstr "Máy chủ NFS, SMB, SSH, ủy nhiệm"
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
#, c-format
msgid "Graphical Environment"
msgstr "Môi trường đồ hoạ"
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
#, c-format
msgid "KDE Workstation"
msgstr "KDE"
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
#, c-format
msgid ""
"The K Desktop Environment, the basic graphical environment with a collection "
@@ -646,12 +607,12 @@ msgid ""
msgstr ""
"K Desktop Environment, một môi trường đồ họa với một sưu tập tiện ích đi kèm"
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
#, c-format
msgid "GNOME Workstation"
msgstr "GNOME Workstation"
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
#, c-format
msgid ""
"A graphical environment with user-friendly set of applications and desktop "
@@ -659,7 +620,7 @@ msgid ""
msgstr ""
"Môi trường đồ họa thân thiện cho các ứng dụng và các tiện ích màn hình nền"
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
#, fuzzy, c-format
msgid "LXDE Desktop"
msgstr "IceWm Desktop"
@@ -672,54 +633,52 @@ msgid ""
msgstr ""
"Môi trường đồ họa thân thiện cho các ứng dụng và các tiện ích màn hình nền"
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
#, c-format
msgid "Other Graphical Desktops"
msgstr "Các màn hình nền đồ hoạ khác"
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
#, c-format
msgid "Window Maker, Enlightenment, Fvwm, etc"
msgstr "Window Maker, Enlightenment, Fvwm, v.v..."
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
#, c-format
msgid "Utilities"
msgstr "Tiện ích"
#: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
#, c-format
msgid "SSH Server"
msgstr "Máy chủ SSH"
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
#, c-format
msgid "Webmin"
msgstr "Webmin"
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
#, c-format
msgid "Webmin Remote Configuration Server"
msgstr "Cấu hình máy chủ từ xa Webmin"
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
#, c-format
msgid "Network Utilities/Monitoring"
msgstr "Giám sát và công cụ mạng"
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
#, c-format
msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
msgstr "Các công cụ theo dõi, quản lý tiến trình, tcpdump, nmap, ..."
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
#, c-format
msgid "Mandriva Wizards"
msgstr "Đồ thuật Mandriva"
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
#, c-format
msgid "Wizards to configure server"
msgstr "Đồ thuật cấu hình máy chủ"
@@ -819,17 +778,17 @@ msgstr ""
msgid "Click on images in order to see a bigger preview"
msgstr ""
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
#, c-format
msgid "Package Group Selection"
msgstr "Nhóm gói tin được chọn"
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
#, c-format
msgid "Individual package selection"
msgstr "Chọn các gói riêng"
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
#, c-format
msgid "Total size: %d / %d MB"
msgstr "Kích thước toàn bộ: %d / %d MB"
@@ -946,12 +905,12 @@ msgstr "Cài đặt tối thiểu"
msgid "Software Management"
msgstr "Quản Lý Phần Mềm"
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
#, c-format
msgid "Choose the packages you want to install"
msgstr "Chọn các gói bạn muốn cài đặt "
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
#, c-format
msgid "Installing"
msgstr "Đang cài đặt"
@@ -977,7 +936,7 @@ msgid "%d package"
msgid_plural "%d packages"
msgstr[0] "%d các gói"
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
#, c-format
msgid "Summary"
msgstr "Tóm tắt"
@@ -987,7 +946,7 @@ msgstr "Tóm tắt"
msgid "Configure"
msgstr "Cấu hình"
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
#, c-format
msgid "not configured"
msgstr "chưa được cấu hình"
@@ -997,7 +956,7 @@ msgstr "chưa được cấu hình"
msgid "Media Selection"
msgstr "Nhóm gói tin được chọn"
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
#, c-format
msgid ""
"The following installation media have been found.\n"
@@ -1006,7 +965,7 @@ msgstr ""
"Phát hiện thấy phương tiện cài đặt sau đây.\n"
"Nếu không dùng, hãy bỏ chọn chúng."
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
#, c-format
msgid ""
"You have the option to copy the contents of the CDs onto the hard drive "
@@ -1019,7 +978,7 @@ msgstr ""
"Sau đó tiếp tục tiến hành cài đặt từ đĩa cứng và các gói vẫn sẵn dùng ngay "
"sau khi cài đặt xong hệ thống."
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
#, c-format
msgid "Copy whole CDs"
msgstr "Sao chép toàn bộ CD"
@@ -1039,59 +998,49 @@ msgstr "Hãy chọn tổ chức bàn phím"
msgid "Here is the full list of available keyboards:"
msgstr "Đây là danh sách đầy đủ các bàn phím hiện có "
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
#, c-format
msgid "Install/Upgrade"
msgstr "Cài đặt/Nâng cấp"
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
#, c-format
msgid "Is this an install or an upgrade?"
msgstr "Thực hiện việc cài đặt hay nâng cấp ?"
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
#, fuzzy, c-format
msgid ""
"_: This is a noun:\n"
"Install"
msgstr "Cài đặt"
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
#, c-format
msgid "Upgrade %s"
msgstr "Nâng cấp %s"
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
#, c-format
msgid "Encryption key for %s"
msgstr "Khóa mã hóa cho %s"
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
#, c-format
msgid "Cancel installation, reboot system"
msgstr ""
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
#, fuzzy, c-format
msgid "New Installation"
msgstr "Đang cài đặt"
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
#, c-format
msgid "Upgrade previous installation (not recommended)"
msgstr ""
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
#, c-format
msgid ""
"Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1103,17 +1052,17 @@ msgid ""
"Installation\"."
msgstr ""
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "IDE"
msgstr "IDE"
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "Configuring IDE"
msgstr "Đang cấu hình IDE"
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
#, c-format
msgid ""
"No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1122,7 +1071,7 @@ msgstr ""
"Không còn không gian trống 1MB cho bootstrap! Vẫn tiếp tục cài đặt, nhưng để "
"khởi động hệ thống, bạn cần tạo phân vùng bootstrap trong DiskDrake."
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
#, c-format
msgid ""
"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1132,7 +1081,7 @@ msgstr ""
"Bạn cần tạo PPC PReP Boot bootstrap! Vẫn tiếp tục cài đặt, nhưng để khởi "
"động hệ thống, bạn cần tạo phân vùng bootstrap trong DiskDrake."
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
#, c-format
msgid ""
"Change your Cd-Rom!\n"
@@ -1145,19 +1094,19 @@ msgstr ""
"Hãy nạp đĩa CD có nhãn \"%s\" vào ổ đĩa rồi nhấn OK.\n"
"Nếu bạn không có, nhấn Bỏ qua để không chạy cài đặt từ đĩa này."
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
#, c-format
msgid "Looking for available packages..."
msgstr "Đang tìm các gói hiện có"
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
#, c-format
msgid ""
"Your system does not have enough space left for installation or upgrade (%"
"dMB > %dMB)"
msgstr ""
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
#, c-format
msgid ""
"Please choose load or save package selection.\n"
@@ -1166,52 +1115,52 @@ msgstr ""
"Hãy chọn nạp hoặc lưu lựa chọn gói tin.\n"
"Định dạng giống các tập tin auto_install được tạo."
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Load"
msgstr "Tải"
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Save"
msgstr "Lưu"
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
#, c-format
msgid "Bad file"
msgstr "Tập tin lỗi"
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
#, fuzzy, c-format
msgid "KDE"
msgstr "IDE"
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
#, c-format
msgid "GNOME"
msgstr "GNOME"
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
#, fuzzy, c-format
msgid "Desktop Selection"
msgstr "Nhóm gói tin được chọn"
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
#, c-format
msgid "You can choose your workstation desktop profile."
msgstr ""
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
#, c-format
msgid "Selected size is larger than available space"
msgstr "Kích thước được chọn lớn hơn không gian hiện có"
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
#, c-format
msgid "Type of install"
msgstr "Kiểu cài đặt"
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
#, c-format
msgid ""
"You have not selected any group of packages.\n"
@@ -1220,82 +1169,82 @@ msgstr ""
"Bạn đã không chọn bất kỳ một nhóm gói tin nào\n"
"Hãy chọn việc cài đặt tối thiểu mà bạn muốn"
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
#, c-format
msgid "With X"
msgstr "Với X"
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
#, c-format
msgid "With basic documentation (recommended!)"
msgstr "Với tài liệu cơ bản (khuyến nghị!)"
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
#, c-format
msgid "Truly minimal install (especially no urpmi)"
msgstr "Cài đặt thật tối thiểu (đặc biệt là không có urpmi)"
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
#, c-format
msgid "Preparing installation"
msgstr "Chuẩn bị cài đặt"
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
#, c-format
msgid "Installing package %s"
msgstr "Đang cài đặt gói %s"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "There was an error ordering packages:"
msgstr "Lỗi khi đang xử lý các gói:"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "Go on anyway?"
msgstr "Vẫn cứ tiếp tục?"
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
#, c-format
msgid "Retry"
msgstr ""
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
#, c-format
msgid "Skip this package"
msgstr ""
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
#, c-format
msgid "Skip all packages from medium \"%s\""
msgstr ""
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
#, fuzzy, c-format
msgid "Go back to media and packages selection"
msgstr "Lưu lựa chọn các gói"
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
#, fuzzy, c-format
msgid "There was an error installing package %s."
msgstr "Lỗi khi đang cài đặt các gói:"
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
#, c-format
msgid "Post-install configuration"
msgstr "Cấu hình sau khi cài đặt"
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
#, c-format
msgid "Please ensure the Update Modules media is in drive %s"
msgstr "Hãy đảm bảo là phương tiện Update Modules có trong drive %s"
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
#, c-format
msgid "Updates"
msgstr "Cập nhật"
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
#, c-format
msgid ""
"You now have the opportunity to download updated packages. These packages\n"
@@ -1315,28 +1264,28 @@ msgstr ""
"\n"
"Bạn có muốn cài đặt các gói cập nhật không ?"
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
#, c-format
msgid "%s on %s"
msgstr "%s trên %s"
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
#, c-format
msgid "Hardware"
msgstr "Phần cứng"
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
#, c-format
msgid "Sound card"
msgstr "Card âm thanh"
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
#, c-format
msgid "Do you have an ISA sound card?"
msgstr "Bạn có card âm thanh ISA không ?"
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
#, c-format
msgid ""
"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1345,68 +1294,68 @@ msgstr ""
"Chạy lệnh \"alsaconf\" hoặc \"sndconfig\" sau khi cài đặt để cấu hìnhcard âm "
"thanh"
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
#, c-format
msgid "No sound card detected. Try \"harddrake\" after installation"
msgstr ""
"Không phát hiện được card âm thanh nào. Hãy thử \"harddrake\" sau khi cài đặt"
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
#, c-format
msgid "Graphical interface"
msgstr "Giao diện đồ họa"
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
#, c-format
msgid "Network & Internet"
msgstr "Mạng & Internet"
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
#, c-format
msgid "Proxies"
msgstr "Proxies"
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
#, c-format
msgid "configured"
msgstr "đã cấu hình"
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
#, c-format
msgid "Security Level"
msgstr "Mức Bảo Mật"
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
#, c-format
msgid "Firewall"
msgstr "Tường lửa"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "activated"
msgstr "Đã kích hoạt"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "disabled"
msgstr "Đã tắt"
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
#, c-format
msgid "You have not configured X. Are you sure you really want this?"
msgstr "Chưa đặt cấu hình cho X. Bạn có chắc là muốn như vậy không ?"
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
#, c-format
msgid "Preparing bootloader..."
msgstr "Đang chuẩn bị trình khởi động"
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
#, c-format
msgid "Be patient, this may take a while..."
msgstr ""
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
#, c-format
msgid ""
"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1419,7 +1368,7 @@ msgstr ""
"phương tiện khác để khởi động máy tính. Đối số của kernel cho root fs là: "
"root=%s"
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
#, c-format
msgid ""
"In this security level, access to the files in the Windows partition is "
@@ -1428,17 +1377,17 @@ msgstr ""
"Với mức bảo mật này, chỉ người quản trị mới có quyền truy cậpvào các tập tin "
"trong phân vùng Windows."
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr "Nạp một đĩa mềm trắng vào ổ %s"
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
#, c-format
msgid "Creating auto install floppy..."
msgstr "Đang tạo đĩa mềm cài đặt tự động"
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
#, c-format
msgid ""
"Some steps are not completed.\n"
@@ -1449,7 +1398,7 @@ msgstr ""
"\n"
"Bạn thực sự muốn thoát ra bây giờ?"
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
#, c-format
msgid "Congratulations"
msgstr "Chúc mừng"
@@ -1593,6 +1542,9 @@ msgid ""
"Exit"
msgstr "Thoát ra"
+#~ msgid "Downloading file %s..."
+#~ msgstr "Đang tải về tập tin %s..."
+
#~ msgid ""
#~ "You have selected the following server(s): %s\n"
#~ "\n"
diff --git a/perl-install/install/share/po/wa.po b/perl-install/install/share/po/wa.po
index 75c5d0b7a..8b9b5053e 100644
--- a/perl-install/install/share/po/wa.po
+++ b/perl-install/install/share/po/wa.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: DrakX\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
"PO-Revision-Date: 2005-02-24 21:42+0100\n"
"Last-Translator: Pablo Saratxaga <pablo@walon.org>\n"
"Language-Team: Walloon <linux-wa@walon.org>\n"
@@ -19,31 +19,6 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=n > 1;\n"
"X-Generator: KBabel 1.0.2\n"
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr ""
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr ""
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr ""
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr ""
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr ""
-
#: any.pm:109
#, c-format
msgid "Do you have further supplementary media?"
@@ -84,17 +59,17 @@ msgstr "Rantoele (FTP)"
msgid "Network (NFS)"
msgstr "Rantoele (NFS)"
-#: any.pm:163
+#: any.pm:165
#, c-format
msgid "URL of the mirror?"
msgstr "Hårdêye do muroe?"
-#: any.pm:169
+#: any.pm:171
#, c-format
msgid "URL must start with ftp:// or http://"
msgstr "Li hårdêye doet cmincî avou «ftp://» ou «http://»"
-#: any.pm:180
+#: any.pm:182
#, c-format
msgid ""
"Contacting Mandriva Linux web site to get the list of available mirrors..."
@@ -102,7 +77,7 @@ msgstr ""
"Dj' atôtche li waibe da Mandriva Linux po-z aveur li djivêye des muroes k' i "
"gn a"
-#: any.pm:185
+#: any.pm:187
#, c-format
msgid ""
"Failed contacting Mandriva Linux web site to get the list of available "
@@ -111,47 +86,47 @@ msgstr ""
"Dji n' a savou atôtchî l' waibe da Mandriva Linux po-z aveur li djivêye des "
"muroes k' i gn a"
-#: any.pm:195
+#: any.pm:197
#, c-format
msgid "Choose a mirror from which to get the packages"
msgstr "Tchoezixhoz on muroe po nd aberweter des pacaedjes foû"
-#: any.pm:225
+#: any.pm:227
#, c-format
msgid "NFS setup"
msgstr "Apontiaedje NFS"
-#: any.pm:226
+#: any.pm:228
#, c-format
msgid "Please enter the hostname and directory of your NFS media"
msgstr "Tapez l' no d' lodjoe eyet l' ridant di vosse sopoirt NFS"
-#: any.pm:230
+#: any.pm:232
#, c-format
msgid "Hostname missing"
msgstr "I manke li no d' lodjoe"
-#: any.pm:231
+#: any.pm:233
#, c-format
msgid "Directory must begin with \"/\""
msgstr "Li ridant doet cmincî avou «/»"
-#: any.pm:235
+#: any.pm:237
#, c-format
msgid "Hostname of the NFS mount ?"
msgstr "No d' lodjoe do montaedje NFS?"
-#: any.pm:236
+#: any.pm:238
#, c-format
msgid "Directory"
msgstr "Ridant"
-#: any.pm:258
+#: any.pm:260
#, c-format
msgid "Supplementary"
msgstr "Di rawete"
-#: any.pm:293
+#: any.pm:295
#, c-format
msgid ""
"Can't find a package list file on this mirror. Make sure the location is "
@@ -160,22 +135,22 @@ msgstr ""
"Dji n' sai trover l' djivêye di fitchîs so ç' muroe ci. Acertinez vs ki "
"l' eplaeçmint est corek."
-#: any.pm:328
+#: any.pm:334
#, c-format
msgid "Looking at packages already installed..."
msgstr "Dji cwir après les pacaedjes ki sont ddja astalés..."
-#: any.pm:362
+#: any.pm:368
#, c-format
msgid "Finding packages to upgrade..."
msgstr "Dji cwir après les pacaedjes a mete a djoû"
-#: any.pm:381
+#: any.pm:387
#, c-format
msgid "Removing packages prior to upgrade..."
msgstr "Dji oistêye des pacaedjes divant d' fé l' metaedje a djoû..."
-#: any.pm:402
+#: any.pm:408
#, c-format
msgid ""
"You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -187,18 +162,18 @@ msgid ""
"please reboot your system and upgrade using the Mandriva update applet."
msgstr ""
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
#, c-format
msgid "Reboot"
msgstr "Renonder l' éndjole"
-#: any.pm:407
+#: any.pm:413
#, c-format
msgid "Proceed"
msgstr ""
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -212,72 +187,72 @@ msgstr ""
"\n"
"Voloz vs vormint oister ces pacaedjes la?\n"
-#: any.pm:815
+#: any.pm:821
#, c-format
msgid "Error reading file %s"
msgstr "Åk n' a nén stî come dji sayive di lére li fitchî %s"
-#: any.pm:1022
+#: any.pm:1028
#, c-format
msgid "The following disk(s) were renamed:"
msgstr "Les plakes shuvantes ont candjî d' no:"
-#: any.pm:1024
+#: any.pm:1030
#, c-format
msgid "%s (previously named as %s)"
msgstr "%s (lomêye divant %s)"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "HTTP"
msgstr "HTTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "FTP"
msgstr "FTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "NFS"
msgstr "NFS"
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
#, c-format
msgid "Network"
msgstr "Rantoele"
-#: any.pm:1104
+#: any.pm:1110
#, c-format
msgid "Please choose a media"
msgstr "Tchoezixhoz on sopoirt s' i vs plait"
-#: any.pm:1120
+#: any.pm:1126
#, c-format
msgid "File already exists. Overwrite it?"
msgstr "Li fitchî egzistêye dedja. El voloz vs sipotchî?"
-#: any.pm:1124
+#: any.pm:1130
#, c-format
msgid "Permission denied"
msgstr "Permission rfuzêye"
-#: any.pm:1172
+#: any.pm:1178
#, c-format
msgid "Bad NFS name"
msgstr "Måva no NFS"
-#: any.pm:1193
+#: any.pm:1199
#, c-format
msgid "Bad media %s"
msgstr "Måva sopoirt %s"
-#: any.pm:1236
+#: any.pm:1242
#, c-format
msgid "Can not make screenshots before partitioning"
msgstr "Dji n' pou nén fé des waitroûlêyes divant l' pårtixhaedje"
-#: any.pm:1244
+#: any.pm:1250
#, c-format
msgid "Screenshots will be available after install in %s"
msgstr "Les waitroûlêyes seront metowes el ridant %s après l' astalaedje"
@@ -288,11 +263,15 @@ msgid "Installation"
msgstr "Astalaedje"
#: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
#, c-format
msgid "Configuration"
msgstr "Apontiaedje"
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
#: install2.pm:168
#, c-format
msgid "You must also format %s"
@@ -317,22 +296,22 @@ msgstr "Metant li rantoele en alaedje"
msgid "Bringing down the network"
msgstr "Dj' arestêye li rantoele"
-#: media.pm:402
+#: media.pm:399
#, c-format
msgid "Please wait, retrieving file"
msgstr ""
-#: media.pm:734
+#: media.pm:718
#, c-format
-msgid "Downloading file %s..."
-msgstr "Aberwetaedje do fitchî %s..."
+msgid "unable to add medium"
+msgstr ""
-#: media.pm:822
+#: media.pm:758
#, c-format
msgid "Copying some packages on disks for future use"
msgstr "Dji copeye sacwants pacaedjes sol deure plake po pus tård"
-#: media.pm:875
+#: media.pm:811
#, c-format
msgid "Copying in progress"
msgstr "Dji copeye..."
@@ -374,27 +353,27 @@ msgstr ""
msgid "An error occurred:"
msgstr "Dj' aroke so ene sacwè"
-#: pkgs.pm:776
+#: pkgs.pm:780
#, c-format
msgid "%d installation transactions failed"
msgstr "I gn a-st avou %d transaccions d' astalaedje k' ont fwait berwete"
-#: pkgs.pm:777
+#: pkgs.pm:781
#, fuzzy, c-format
msgid "Installation of packages failed:"
msgstr "Dj' astale li pacaedje %s"
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
#, c-format
msgid "Workstation"
msgstr "Posse éndjolrece"
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
#, c-format
msgid "Office Workstation"
msgstr "Posse di buro"
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
#, c-format
msgid ""
"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -403,7 +382,7 @@ msgstr ""
"Programes di buro: aspougneus di tecse (OpenOffice.org Writer, Kword), "
"tåvleus (OpenOffice.org Calc, Kspread), håyneus pdf, evnd."
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
#, c-format
msgid ""
"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -412,32 +391,32 @@ msgstr ""
"Programes di buro: aspougneus di tecse (kword, abiword), tåvleus (kspread, "
"gnumeric), håyneus pdf, evnd."
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
#, c-format
msgid "Game station"
msgstr "Posse di djeus"
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
#, c-format
msgid "Amusement programs: arcade, boards, strategy, etc"
msgstr "Programes pasmints d' tins: årcåde, plateas, stratedjeye, evnd."
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
#, c-format
msgid "Multimedia station"
msgstr "Posse multimedia"
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
#, c-format
msgid "Sound and video playing/editing programs"
msgstr "Programes po vey/schoûter/candjî des sons et videyos"
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
#, c-format
msgid "Internet station"
msgstr "Posse pol rantoele daegnrece"
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
#, c-format
msgid ""
"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -446,211 +425,193 @@ msgstr ""
"Eshonna d' usteyes po lére et evoyî des messaedjes (pine, mutt, tin...) et "
"po naivyî so les pådjes waibe"
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
#, c-format
msgid "Network Computer (client)"
msgstr "Copiutrece rantoele (cliyint)"
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
#, c-format
msgid "Clients for different protocols including ssh"
msgstr "Cliyints po les protocoles k' i gn a (ssh avou)"
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
#, c-format
msgid "Tools to ease the configuration of your computer"
msgstr "Usteyes po vos aveur pus åjhey d' apontyî vosse copiutrece"
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
#, c-format
msgid "Console Tools"
msgstr "Usteyes pol conzôle"
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
#, c-format
msgid "Editors, shells, file tools, terminals"
msgstr "Aspougneus, shells, usteyes po fitchîs, terminås"
#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
#, c-format
msgid "Development"
msgstr "Programaedje"
#: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
#, c-format
msgid "C and C++ development libraries, programs and include files"
msgstr "Livreyes di programaedje C et C++, programes et fitchîs *.h"
#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
#, c-format
msgid "Documentation"
msgstr "Documintåcion"
#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
#, c-format
msgid "Books and Howto's on Linux and Free Software"
msgstr "Lives et Howtos so GNU/Linux et les libes programes"
#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
#, c-format
msgid "LSB"
msgstr "LSB"
#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
#, c-format
msgid "Linux Standard Base. Third party applications support"
msgstr "Li «Linux Standard Base». Sopoirt po les programes tîces"
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
#, c-format
msgid "Web Server"
msgstr "Sierveu waibe"
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
#, c-format
msgid "Apache"
msgstr "Apache"
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
#, c-format
msgid "Groupware"
msgstr "Ovraedje e groupe"
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
#, c-format
msgid "Kolab Server"
msgstr "Sierveu Kolab"
#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
#, c-format
msgid "Firewall/Router"
msgstr "Côpe feu/Routeu"
#: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
#, c-format
msgid "Internet gateway"
msgstr "Pasrele pol rantoele daegnrece"
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
#, c-format
msgid "Mail/News"
msgstr "Emilaedje/Copinreyes"
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
#, c-format
msgid "Postfix mail server, Inn news server"
msgstr "Sierveu d' emilaedje postfix, sierveu d' copinreyes INN"
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
#, c-format
msgid "Directory Server"
msgstr "Sierveu d' botins"
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
#, c-format
msgid "FTP Server"
msgstr "Sierveu FTP"
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
#, c-format
msgid "ProFTPd"
msgstr "ProFTPd"
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
#, c-format
msgid "DNS/NIS"
msgstr "DNS/NIS"
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
#, c-format
msgid "Domain Name and Network Information Server"
msgstr "Sierveu di nos d' dominne eyet d' informåcion rantoele"
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
#, c-format
msgid "File and Printer Sharing Server"
msgstr "Sierveu di pårtaedje di fitchîs eyet di scrireces"
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
#, c-format
msgid "NFS Server, Samba server"
msgstr "Sierveu NFS, sierveu Samba"
#: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
#, c-format
msgid "Database"
msgstr "Sierveu, båzes di dnêyes"
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
#, c-format
msgid "PostgreSQL and MySQL Database Server"
msgstr "Sierveu båze di dnêyes PostgreSQL eyet MySQL"
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
#, c-format
msgid "Web/FTP"
msgstr "Sierveu, Waibe/FTP"
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
#, c-format
msgid "Apache, Pro-ftpd"
msgstr "Apache eyet Pro-ftpd"
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
#, c-format
msgid "Mail"
msgstr "Emilaedje"
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
#, c-format
msgid "Postfix mail server"
msgstr "Sierveu d' emilaedje postfix"
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
#, c-format
msgid "PostgreSQL or MySQL database server"
msgstr "Sierveu båze di dnêyes PostgreSQL ou MySQL"
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
#, c-format
msgid "Network Computer server"
msgstr "Copiutrece sierveu sol rantoele"
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
#, c-format
msgid "NFS server, SMB server, Proxy server, ssh server"
msgstr "Sierveu NFS, sierveu SMB, sierveu procsi, sierveu SSH"
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
#, c-format
msgid "Graphical Environment"
msgstr "Evironmint grafike"
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
#, c-format
msgid "KDE Workstation"
msgstr "Posse éndjolrece KDE"
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
#, c-format
msgid ""
"The K Desktop Environment, the basic graphical environment with a collection "
@@ -659,12 +620,12 @@ msgstr ""
"L' evironmint di scribanne KDE, l' evironmint grafike di båze, avou ene "
"ramexhnêye d' usteyes ki vnèt avou"
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
#, c-format
msgid "GNOME Workstation"
msgstr "Posse éndjolrece GNOME"
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
#, c-format
msgid ""
"A graphical environment with user-friendly set of applications and desktop "
@@ -673,7 +634,7 @@ msgstr ""
"Èn evironmint grafike avou on hopea di programes amiståves et d' usteyes pol "
"sicribanne"
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
#, fuzzy, c-format
msgid "LXDE Desktop"
msgstr "Sicribanne IceWm"
@@ -687,54 +648,52 @@ msgstr ""
"Èn evironmint grafike avou on hopea di programes amiståves et d' usteyes pol "
"sicribanne"
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
#, c-format
msgid "Other Graphical Desktops"
msgstr "Ôtes sicribannes grafikes"
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
#, c-format
msgid "Window Maker, Enlightenment, Fvwm, etc"
msgstr "Window Maker, Enlightenment, Fvwm, evnd."
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
#, c-format
msgid "Utilities"
msgstr "Usteyes"
#: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
#, c-format
msgid "SSH Server"
msgstr "Sierveu SSH"
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
#, c-format
msgid "Webmin"
msgstr "Webmin"
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
#, c-format
msgid "Webmin Remote Configuration Server"
msgstr "Sierveu d' apontiaedje då lon Webmin"
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
#, c-format
msgid "Network Utilities/Monitoring"
msgstr "Usteyes rantoele/Corwaitaedje"
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
#, c-format
msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
msgstr "Usteyes di corwaitaedje, contaedje des process, tcpdump, nmap, ..."
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
#, c-format
msgid "Mandriva Wizards"
msgstr "Macreas Mandriva"
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
#, c-format
msgid "Wizards to configure server"
msgstr "Macreas po-z apontyî on sierveu"
@@ -835,17 +794,17 @@ msgstr ""
msgid "Click on images in order to see a bigger preview"
msgstr ""
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
#, c-format
msgid "Package Group Selection"
msgstr "Tchoezi les groupes di pacaedjes"
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
#, c-format
msgid "Individual package selection"
msgstr "Tchoezi tchaeke pacaedje sepårumint"
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
#, c-format
msgid "Total size: %d / %d MB"
msgstr "Grandeu å totå: %d / %d Mo"
@@ -964,12 +923,12 @@ msgstr "Astalåcion minimåle"
msgid "Software Management"
msgstr "Manaedjaedje di programes"
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
#, c-format
msgid "Choose the packages you want to install"
msgstr "Tchoezixhoz les pacaedjes k' vos voloz astaler"
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
#, c-format
msgid "Installing"
msgstr "Astalant"
@@ -996,7 +955,7 @@ msgid_plural "%d packages"
msgstr[0] "%d pacaedje"
msgstr[1] "%d pacaedjes"
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
#, c-format
msgid "Summary"
msgstr "Rascourti éndjolreye"
@@ -1006,7 +965,7 @@ msgstr "Rascourti éndjolreye"
msgid "Configure"
msgstr "Apontyî"
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
#, c-format
msgid "not configured"
msgstr "nén apontyî"
@@ -1016,7 +975,7 @@ msgstr "nén apontyî"
msgid "Media Selection"
msgstr "Tchoezi les groupes di pacaedjes"
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
#, c-format
msgid ""
"The following installation media have been found.\n"
@@ -1026,7 +985,7 @@ msgstr ""
"Si vos vloz passer houte di sacwants d' zels, vos les ploz asteure "
"distchoezi."
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
#, c-format
msgid ""
"You have the option to copy the contents of the CDs onto the hard drive "
@@ -1039,7 +998,7 @@ msgstr ""
"L' astalaedje si frè-st adon a pårti del deure plake, eyet les pacaedjes "
"vont dmorer disponibes on côp ki l' sistinme serè astalé."
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
#, c-format
msgid "Copy whole CDs"
msgstr "Copyî les plakes lazer en etir"
@@ -1059,59 +1018,49 @@ msgstr "Tchoezixhoz li sôre di vosse taprece"
msgid "Here is the full list of available keyboards:"
msgstr "Vochal li djivêye di totes les tapreces k' on pout tchoezi"
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
#, c-format
msgid "Install/Upgrade"
msgstr "Astaler/Mete a djoû"
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
#, c-format
msgid "Is this an install or an upgrade?"
msgstr "C' est ene astalåcion ou on metaedje a djoû?"
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
#, fuzzy, c-format
msgid ""
"_: This is a noun:\n"
"Install"
msgstr "Astalaedje"
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
#, c-format
msgid "Upgrade %s"
msgstr "Metaedje a djoû di %s"
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr ""
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
#, c-format
msgid "Encryption key for %s"
msgstr "Clé d' ecriptaedje po %s"
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
#, c-format
msgid "Cancel installation, reboot system"
msgstr ""
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
#, fuzzy, c-format
msgid "New Installation"
msgstr "Astalaedje"
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
#, c-format
msgid "Upgrade previous installation (not recommended)"
msgstr ""
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
#, c-format
msgid ""
"Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1123,17 +1072,17 @@ msgid ""
"Installation\"."
msgstr ""
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "IDE"
msgstr "IDE"
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "Configuring IDE"
msgstr "Apontiant les éndjins IDE"
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
#, c-format
msgid ""
"No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1143,7 +1092,7 @@ msgstr ""
"continouwrè, mins i vos fårè fé li pårticion d' enondaedje avou DiskDrake po "
"poleur enonder vosse sistinme."
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
#, c-format
msgid ""
"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1154,7 +1103,7 @@ msgstr ""
"mins i vos fårè fé li pårticion d' enondaedje avou DiskDrake po poleur "
"enonder vosse sistinme."
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
#, c-format
msgid ""
"Change your Cd-Rom!\n"
@@ -1169,12 +1118,12 @@ msgstr ""
"Si vos n' l' avoz nén, clitchîz so «Rinoncî» po rinoncî a astaler a pårti\n"
"di ci CDROM chal."
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
#, c-format
msgid "Looking for available packages..."
msgstr "Dji cwir après les pacaedjes k' i gn a"
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
#, c-format
msgid ""
"Your system does not have enough space left for installation or upgrade (%"
@@ -1183,7 +1132,7 @@ msgstr ""
"I gn a pus del plaece assez so vosse sistinme po-z astaler ou mete a djoû (%"
"dMo > %dMo)"
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
#, c-format
msgid ""
"Please choose load or save package selection.\n"
@@ -1192,52 +1141,52 @@ msgstr ""
"Tchoezixhoz si vos vloz tcherdjî ou schaper li tchuze des pacaedjes.\n"
"Li cogne est l' minme ki po les fitchîs fwaits po l' oto-astalaedje."
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Load"
msgstr "Tcherdjî"
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Save"
msgstr "Schaper"
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
#, c-format
msgid "Bad file"
msgstr "Måva fitchî"
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
#, fuzzy, c-format
msgid "KDE"
msgstr "IDE"
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
#, c-format
msgid "GNOME"
msgstr "GNOME"
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
#, fuzzy, c-format
msgid "Desktop Selection"
msgstr "Tchoezi les groupes di pacaedjes"
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
#, c-format
msgid "You can choose your workstation desktop profile."
msgstr ""
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
#, c-format
msgid "Selected size is larger than available space"
msgstr "Li grandeu tchoezeye est pus grande kel plaece ki dmeure"
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
#, c-format
msgid "Type of install"
msgstr "Sôre d' astalaedje"
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
#, c-format
msgid ""
"You have not selected any group of packages.\n"
@@ -1246,84 +1195,84 @@ msgstr ""
"Vos n' avoz tchoezi nou groupe di pacaedjes\n"
"Tchoezixhoz li sôre d' astalåcion minimom ki vos vloz"
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
#, c-format
msgid "With X"
msgstr "Avou X11"
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
#, c-format
msgid "With basic documentation (recommended!)"
msgstr "Avou li documintåcion di båze (ricomandé!)"
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
#, c-format
msgid "Truly minimal install (especially no urpmi)"
msgstr "Astalåcion vormint minimom (i gn a nén di urpmi)"
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
#, c-format
msgid "Preparing installation"
msgstr "Dj' aprestêye l' astalaedje"
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
#, c-format
msgid "Installing package %s"
msgstr "Dj' astale li pacaedje %s"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "There was an error ordering packages:"
msgstr "Åk n' a nén stî come dj' arindjive les pacaedjes:"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "Go on anyway?"
msgstr "Dji continouwe tot l' minme?"
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
#, c-format
msgid "Retry"
msgstr "Rissayî"
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
#, c-format
msgid "Skip this package"
msgstr "Passer houte di ç' pacaedje ci"
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
#, c-format
msgid "Skip all packages from medium \"%s\""
msgstr "Passer houte di tos les pacaedjes do sopoirt «%s»"
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
#, c-format
msgid "Go back to media and packages selection"
msgstr "Rivni al tchuze des pacaedjes et des sopoirts"
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
#, c-format
msgid "There was an error installing package %s."
msgstr "Åk n' a nén stî come dj' astaléve li pacaedje %s."
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
#, c-format
msgid "Post-install configuration"
msgstr "Apontiaedje di post-astalåcion"
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
#, c-format
msgid "Please ensure the Update Modules media is in drive %s"
msgstr ""
"Acertinez vs ki l' sopoirt di metaedje a djoû des modules est dins l' lijheu "
"%s"
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
#, c-format
msgid "Updates"
msgstr "Metaedjes a djoû"
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
#, c-format
msgid ""
"You now have the opportunity to download updated packages. These packages\n"
@@ -1343,28 +1292,28 @@ msgstr ""
"\n"
"Voloz vs astaler les pacaedjes metous a djoû?"
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
#, c-format
msgid "%s on %s"
msgstr "%s so %s"
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
#, c-format
msgid "Hardware"
msgstr "Éndjolreye"
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
#, c-format
msgid "Sound card"
msgstr "Cåte son"
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
#, c-format
msgid "Do you have an ISA sound card?"
msgstr "Avoz vs ene cåte son ISA?"
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
#, c-format
msgid ""
"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1373,69 +1322,69 @@ msgstr ""
"Enondez «alsaconf» ou «sndconfig» après l' astalåcion po-z apontyî vosse cåte "
"son"
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
#, c-format
msgid "No sound card detected. Try \"harddrake\" after installation"
msgstr "Nole cåte son di detectêye. Sayîz «harddrake» après l' astalåcion"
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
#, c-format
msgid "Graphical interface"
msgstr "Eterface grafike"
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
#, c-format
msgid "Network & Internet"
msgstr "Rantoele locåle & daegnrece"
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
#, c-format
msgid "Proxies"
msgstr "Procsis"
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
#, c-format
msgid "configured"
msgstr "apontyî"
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
#, c-format
msgid "Security Level"
msgstr "Livea di såvrité"
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
#, c-format
msgid "Firewall"
msgstr "Côpe feu"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "activated"
msgstr "metou en alaedje"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "disabled"
msgstr "dismetou"
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
#, c-format
msgid "You have not configured X. Are you sure you really want this?"
msgstr ""
"Vos n' avoz nén apontyî X11 (li sistinme di håynaedje grafike).\n"
"Estoz vs seur di voleur çoula?"
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
#, c-format
msgid "Preparing bootloader..."
msgstr "Dj' aprestêye l' enondrece"
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
#, c-format
msgid "Be patient, this may take a while..."
msgstr ""
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
#, c-format
msgid ""
"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1448,7 +1397,7 @@ msgstr ""
"mins vos dvroz eployî BootX ou ôte tchoi po-z enonder voste éndjole. "
"L' årgumint a passer å nawea pol pårticion raecene est: root=%s"
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
#, c-format
msgid ""
"In this security level, access to the files in the Windows partition is "
@@ -1457,17 +1406,17 @@ msgstr ""
"Dins ç' livea di såvrité chal, l' accès åzès fitchîs des pårticions Windows "
"n' est possibe ki po l' manaedjeu di l' éndjole."
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr "Metoz ene blanke plakete divins li lijheu %s"
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
#, c-format
msgid "Creating auto install floppy..."
msgstr "Dji fé li plakete d' enondaedje otomatike"
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
#, c-format
msgid ""
"Some steps are not completed.\n"
@@ -1478,7 +1427,7 @@ msgstr ""
"\n"
"Voloz vs vormint cwiter asteure?"
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
#, c-format
msgid "Congratulations"
msgstr "Complumints"
@@ -1622,6 +1571,9 @@ msgid ""
"Exit"
msgstr "Moussî foû"
+#~ msgid "Downloading file %s..."
+#~ msgstr "Aberwetaedje do fitchî %s..."
+
#~ msgid ""
#~ "You have selected the following server(s): %s\n"
#~ "\n"
diff --git a/perl-install/install/share/po/zh_CN.po b/perl-install/install/share/po/zh_CN.po
index 96c203d73..639022f89 100644
--- a/perl-install/install/share/po/zh_CN.po
+++ b/perl-install/install/share/po/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: DrakX 2008 Spring\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
"PO-Revision-Date: 2008-03-22 13:46+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: Mandriva Linux i18n Team <cooker-i18n@mandrivalinux.org>\n"
@@ -17,31 +17,6 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr "U 盘上的桌面"
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr "100%% 开放源代码的 Mandriva Linux 发行版"
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr "用 Mandriva One 轻松探索 Linux"
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr "Mandriva Linux 桌面旗舰产品,附带完善的售后服务支持"
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr "Mandriva 在手,应用无忧"
-
#: any.pm:109
#, c-format
msgid "Do you have further supplementary media?"
@@ -81,92 +56,92 @@ msgstr "网络 (FTP)"
msgid "Network (NFS)"
msgstr "网络 (NFS)"
-#: any.pm:163
+#: any.pm:165
#, c-format
msgid "URL of the mirror?"
msgstr "镜像的 URL?"
-#: any.pm:169
+#: any.pm:171
#, c-format
msgid "URL must start with ftp:// or http://"
msgstr "URL 必须以 ftp:// 或 http:// 开始"
-#: any.pm:180
+#: any.pm:182
#, c-format
msgid ""
"Contacting Mandriva Linux web site to get the list of available mirrors..."
msgstr "正在连接 Mandriva Linux 网站获得可用镜像的列表..."
-#: any.pm:185
+#: any.pm:187
#, c-format
msgid ""
"Failed contacting Mandriva Linux web site to get the list of available "
"mirrors"
msgstr "连接 Mandriva Linux 网站以获得可用镜像的列表失败"
-#: any.pm:195
+#: any.pm:197
#, c-format
msgid "Choose a mirror from which to get the packages"
msgstr "选择一个镜像网站来取得软件包"
-#: any.pm:225
+#: any.pm:227
#, c-format
msgid "NFS setup"
msgstr "NFS 设置"
-#: any.pm:226
+#: any.pm:228
#, c-format
msgid "Please enter the hostname and directory of your NFS media"
msgstr "请输入您 NFS 介质的主机名和目录"
-#: any.pm:230
+#: any.pm:232
#, c-format
msgid "Hostname missing"
msgstr "缺少主机名"
-#: any.pm:231
+#: any.pm:233
#, c-format
msgid "Directory must begin with \"/\""
msgstr "目录必须以“/”开头"
-#: any.pm:235
+#: any.pm:237
#, c-format
msgid "Hostname of the NFS mount ?"
msgstr "NFS 挂载的主机名?"
-#: any.pm:236
+#: any.pm:238
#, c-format
msgid "Directory"
msgstr "目录"
-#: any.pm:258
+#: any.pm:260
#, c-format
msgid "Supplementary"
msgstr "赠品"
-#: any.pm:293
+#: any.pm:295
#, c-format
msgid ""
"Can't find a package list file on this mirror. Make sure the location is "
"correct."
msgstr "无法在此镜像上找到软件包列表文件。请确定位置正确。"
-#: any.pm:328
+#: any.pm:334
#, c-format
msgid "Looking at packages already installed..."
msgstr "正在查找已经安装过的软件包..."
-#: any.pm:362
+#: any.pm:368
#, c-format
msgid "Finding packages to upgrade..."
msgstr "正在寻找可升级的程序..."
-#: any.pm:381
+#: any.pm:387
#, c-format
msgid "Removing packages prior to upgrade..."
msgstr "正在删除由于更新所致的软件包..."
-#: any.pm:402
+#: any.pm:408
#, c-format
msgid ""
"You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -185,18 +160,18 @@ msgstr ""
"使\n"
"用 Mandriva 更新小程序升级。"
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
#, c-format
msgid "Reboot"
msgstr "重新启动"
-#: any.pm:407
+#: any.pm:413
#, c-format
msgid "Proceed"
msgstr ""
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -209,72 +184,72 @@ msgstr ""
"\n"
"您确定要删除这些软件包吗?\n"
-#: any.pm:815
+#: any.pm:821
#, c-format
msgid "Error reading file %s"
msgstr "请取文件 %s 出错"
-#: any.pm:1022
+#: any.pm:1028
#, c-format
msgid "The following disk(s) were renamed:"
msgstr "下列盘片已重命名:"
-#: any.pm:1024
+#: any.pm:1030
#, c-format
msgid "%s (previously named as %s)"
msgstr "%s(以前的名称为 %s)"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "HTTP"
msgstr "HTTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "FTP"
msgstr "FTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "NFS"
msgstr "NFS"
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
#, c-format
msgid "Network"
msgstr "网络"
-#: any.pm:1104
+#: any.pm:1110
#, c-format
msgid "Please choose a media"
msgstr "请选择介质"
-#: any.pm:1120
+#: any.pm:1126
#, c-format
msgid "File already exists. Overwrite it?"
msgstr "文件已经存在。覆盖吗?"
-#: any.pm:1124
+#: any.pm:1130
#, c-format
msgid "Permission denied"
msgstr "没有权限"
-#: any.pm:1172
+#: any.pm:1178
#, c-format
msgid "Bad NFS name"
msgstr "无效的 NFS 名称"
-#: any.pm:1193
+#: any.pm:1199
#, c-format
msgid "Bad media %s"
msgstr "无效的介质 %s"
-#: any.pm:1236
+#: any.pm:1242
#, c-format
msgid "Can not make screenshots before partitioning"
msgstr "无法在分区完成之前进行屏幕捕捉"
-#: any.pm:1244
+#: any.pm:1250
#, c-format
msgid "Screenshots will be available after install in %s"
msgstr "安装完成后, 所有的屏幕抓图都会保存到 %s 之中"
@@ -285,11 +260,15 @@ msgid "Installation"
msgstr "安装"
#: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
#, c-format
msgid "Configuration"
msgstr "配置"
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
#: install2.pm:168
#, c-format
msgid "You must also format %s"
@@ -314,22 +293,22 @@ msgstr "正在启动网络"
msgid "Bringing down the network"
msgstr "正在禁用网络"
-#: media.pm:402
+#: media.pm:399
#, c-format
msgid "Please wait, retrieving file"
msgstr "请稍候,正在获取文件"
-#: media.pm:734
+#: media.pm:718
#, c-format
-msgid "Downloading file %s..."
-msgstr "正在下载文件 %s..."
+msgid "unable to add medium"
+msgstr ""
-#: media.pm:822
+#: media.pm:758
#, c-format
msgid "Copying some packages on disks for future use"
msgstr "正在将软件包复制到磁盘中以备后用"
-#: media.pm:875
+#: media.pm:811
#, c-format
msgid "Copying in progress"
msgstr "复制进行中"
@@ -373,27 +352,27 @@ msgstr ""
msgid "An error occurred:"
msgstr "发生了一个错误"
-#: pkgs.pm:776
+#: pkgs.pm:780
#, c-format
msgid "%d installation transactions failed"
msgstr "%d 个安装交易失败"
-#: pkgs.pm:777
+#: pkgs.pm:781
#, fuzzy, c-format
msgid "Installation of packages failed:"
msgstr "正在安装软件包 %s"
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
#, c-format
msgid "Workstation"
msgstr "工作站"
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
#, c-format
msgid "Office Workstation"
msgstr "办公工作站"
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
#, c-format
msgid ""
"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -402,7 +381,7 @@ msgstr ""
"办公程序: 字处理(OpenOffice.org Writer、Kword), 电子表格(OpenOffice.org "
"Calc、Kspread)、PDF 阅读器等"
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
#, c-format
msgid ""
"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -410,262 +389,244 @@ msgid ""
msgstr ""
"办公程序: 字处理(kword、abiword), 电子表格(kspread、gnumeric)、pdf 阅读器等"
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
#, c-format
msgid "Game station"
msgstr "游戏机"
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
#, c-format
msgid "Amusement programs: arcade, boards, strategy, etc"
msgstr "游戏程序: 街机、棋盘、战略等等"
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
#, c-format
msgid "Multimedia station"
msgstr "多媒体工作站"
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
#, c-format
msgid "Sound and video playing/editing programs"
msgstr "声音和视频播放/编辑程序"
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
#, c-format
msgid "Internet station"
msgstr "Internet 工作站"
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
#, c-format
msgid ""
"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
"Web"
msgstr "一组工具, 用于收发电子邮件及新闻组(mutt, tin..), 浏览网站"
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
#, c-format
msgid "Network Computer (client)"
msgstr "网络计算机(客户端)"
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
#, c-format
msgid "Clients for different protocols including ssh"
msgstr "SSH 等不同协议客户端"
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
#, c-format
msgid "Tools to ease the configuration of your computer"
msgstr "简化计算机配置的工具"
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
#, c-format
msgid "Console Tools"
msgstr "控制台工具"
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
#, c-format
msgid "Editors, shells, file tools, terminals"
msgstr "编辑器, shell, 文件工具, 终端"
#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
#, c-format
msgid "Development"
msgstr "开发"
#: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
#, c-format
msgid "C and C++ development libraries, programs and include files"
msgstr "C 和 C++ 开发库, 程序及头文件"
#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
#, c-format
msgid "Documentation"
msgstr "文档"
#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
#, c-format
msgid "Books and Howto's on Linux and Free Software"
msgstr "有关 Linux 和自由软件的书籍和指南"
#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
#, c-format
msgid "LSB"
msgstr "LSB"
#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
#, c-format
msgid "Linux Standard Base. Third party applications support"
msgstr "Linux Standard Base。第三方应用程序支持"
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
#, c-format
msgid "Web Server"
msgstr "Web 服务器"
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
#, c-format
msgid "Apache"
msgstr "Apache"
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
#, c-format
msgid "Groupware"
msgstr "群件"
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
#, c-format
msgid "Kolab Server"
msgstr "Kolab 服务器"
#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
#, c-format
msgid "Firewall/Router"
msgstr "防火墙/路由器"
#: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
#, c-format
msgid "Internet gateway"
msgstr "Internet 网关"
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
#, c-format
msgid "Mail/News"
msgstr "邮件/新闻"
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
#, c-format
msgid "Postfix mail server, Inn news server"
msgstr "Postfix 邮件服务器、Inn 新闻服务器"
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
#, c-format
msgid "Directory Server"
msgstr "目录服务器"
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
#, c-format
msgid "FTP Server"
msgstr "FTP 服务器"
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
#, c-format
msgid "ProFTPd"
msgstr "ProFTPd"
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
#, c-format
msgid "DNS/NIS"
msgstr "DNS/NIS"
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
#, c-format
msgid "Domain Name and Network Information Server"
msgstr "域名和网络信息服务器"
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
#, c-format
msgid "File and Printer Sharing Server"
msgstr "文件和打印机共享服务器"
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
#, c-format
msgid "NFS Server, Samba server"
msgstr "NFS 服务器、Samba 服务器"
#: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
#, c-format
msgid "Database"
msgstr "数据库"
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
#, c-format
msgid "PostgreSQL and MySQL Database Server"
msgstr "PostgreSQL 和 MySQL 数据库服务"
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
#, c-format
msgid "Web/FTP"
msgstr "Web/FTP"
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
#, c-format
msgid "Apache, Pro-ftpd"
msgstr "Apache 和 Pro-ftpd"
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
#, c-format
msgid "Mail"
msgstr "邮件"
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
#, c-format
msgid "Postfix mail server"
msgstr "Postfix 邮件服务器"
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
#, c-format
msgid "PostgreSQL or MySQL database server"
msgstr "PostgreSQL 或 MySQL 数据库服务"
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
#, c-format
msgid "Network Computer server"
msgstr "网络计算机服务器"
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
#, c-format
msgid "NFS server, SMB server, Proxy server, ssh server"
msgstr "NFS 服务器, SMB 服务器, 代理服务器, SSH 服务器"
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
#, c-format
msgid "Graphical Environment"
msgstr "图形环境"
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
#, c-format
msgid "KDE Workstation"
msgstr "KDE 工作站"
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
#, c-format
msgid ""
"The K Desktop Environment, the basic graphical environment with a collection "
"of accompanying tools"
msgstr "KDE 桌面环境, 基本的图形环境和一组配套的工具"
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
#, c-format
msgid "GNOME Workstation"
msgstr "GNOME 工作站"
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
#, c-format
msgid ""
"A graphical environment with user-friendly set of applications and desktop "
"tools"
msgstr "配备了用户友善的应用程序与桌面工具的图形环境"
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
#, fuzzy, c-format
msgid "LXDE Desktop"
msgstr "KDE 桌面"
@@ -677,54 +638,52 @@ msgid ""
"applications and desktop tools"
msgstr "配备了用户友善的应用程序与桌面工具的图形环境"
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
#, c-format
msgid "Other Graphical Desktops"
msgstr "其它图形桌面"
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
#, c-format
msgid "Window Maker, Enlightenment, Fvwm, etc"
msgstr "Window Maker、Enlightenment、Fvwm 等"
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
#, c-format
msgid "Utilities"
msgstr "工具"
#: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
#, c-format
msgid "SSH Server"
msgstr "SSH 服务器"
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
#, c-format
msgid "Webmin"
msgstr "Webmin"
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
#, c-format
msgid "Webmin Remote Configuration Server"
msgstr "Webmin 远程配置服务器"
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
#, c-format
msgid "Network Utilities/Monitoring"
msgstr "网络工具/监视"
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
#, c-format
msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
msgstr "监视工具、进程统计、tcpdump、nmap……"
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
#, c-format
msgid "Mandriva Wizards"
msgstr "Mandriva 向导"
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
#, c-format
msgid "Wizards to configure server"
msgstr "服务器配置向导"
@@ -822,17 +781,17 @@ msgstr "这是“%s”桌面的预览。"
msgid "Click on images in order to see a bigger preview"
msgstr "单击图像可查看更大的预览"
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
#, c-format
msgid "Package Group Selection"
msgstr "程序组选择"
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
#, c-format
msgid "Individual package selection"
msgstr "选择单个软件包"
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
#, c-format
msgid "Total size: %d / %d MB"
msgstr "总共大小: %d / %d MB"
@@ -949,12 +908,12 @@ msgstr "最小安装"
msgid "Software Management"
msgstr "软件管理"
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
#, c-format
msgid "Choose the packages you want to install"
msgstr "选择您想要安装的软件包"
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
#, c-format
msgid "Installing"
msgstr "安装"
@@ -980,7 +939,7 @@ msgid "%d package"
msgid_plural "%d packages"
msgstr[0] "%d 个软件包"
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
#, c-format
msgid "Summary"
msgstr "摘要"
@@ -990,7 +949,7 @@ msgstr "摘要"
msgid "Configure"
msgstr "配置"
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
#, c-format
msgid "not configured"
msgstr "未配置"
@@ -1000,7 +959,7 @@ msgstr "未配置"
msgid "Media Selection"
msgstr "介质选择"
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
#, c-format
msgid ""
"The following installation media have been found.\n"
@@ -1009,7 +968,7 @@ msgstr ""
"找到了下列安装介质。\n"
"如果您想要跳过其中一些, 请不要选中。"
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
#, c-format
msgid ""
"You have the option to copy the contents of the CDs onto the hard drive "
@@ -1021,7 +980,7 @@ msgstr ""
"然后,安装将会从硬盘继续进行。当系统安装完成后,软件包仍然保留,以供日后添加"
"软件使用。"
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
#, c-format
msgid "Copy whole CDs"
msgstr "复制整张光盘"
@@ -1041,59 +1000,49 @@ msgstr "请选择您使用的键盘布局。"
msgid "Here is the full list of available keyboards:"
msgstr "在此列出了可用的全部键盘:"
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
#, c-format
msgid "Install/Upgrade"
msgstr "安装/升级"
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
#, c-format
msgid "Is this an install or an upgrade?"
msgstr "现在要新装还是升级?"
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
#, c-format
msgid ""
"_: This is a noun:\n"
"Install"
msgstr "安装"
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
#, c-format
msgid "Upgrade %s"
msgstr "升级 %s"
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr "不支持从 32 位发行版升级到 64 位发行版"
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr "不支持从 64 位发行版升级到 32 位发行版"
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
#, c-format
msgid "Encryption key for %s"
msgstr "%s 的加密密钥"
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
#, c-format
msgid "Cancel installation, reboot system"
msgstr "取消安装,重新启动系统"
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
#, c-format
msgid "New Installation"
msgstr "全新安装"
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
#, c-format
msgid "Upgrade previous installation (not recommended)"
msgstr "升级先前的安装(不推荐)"
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
#, c-format
msgid ""
"Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1110,17 +1059,17 @@ msgstr ""
"\n"
"警告:您在选择“全新安装”之前应该备份您所有的个人数据。"
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "IDE"
msgstr "IDE"
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "Configuring IDE"
msgstr "配置 IDE"
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
#, c-format
msgid ""
"No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1129,7 +1078,7 @@ msgstr ""
"无法创建启动空间(1MB)!安装将继续, 但如需启动系统, 您可用“Drak 磁盘管理”创建"
"启动分区"
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
#, c-format
msgid ""
"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1139,7 +1088,7 @@ msgstr ""
"您需要创建一个 PPC PReP 启动空间!安装将继续, 但如需启动系统, 您可用“Drak 磁"
"盘管理”创建启动分区"
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
#, c-format
msgid ""
"Change your Cd-Rom!\n"
@@ -1152,19 +1101,19 @@ msgstr ""
"请在驱动器中插入标有“%s”的光盘, 然后单击“确定”。\n"
"如果您没有这张光盘, 请单击“取消”, 放弃安装这张光盘上的软件。"
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
#, c-format
msgid "Looking for available packages..."
msgstr "正在寻找可安装的程序..."
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
#, c-format
msgid ""
"Your system does not have enough space left for installation or upgrade (%"
"dMB > %dMB)"
msgstr "系统的剩余空间不足以完成安装或升级(%d MB > %d MB)"
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
#, c-format
msgid ""
"Please choose load or save package selection.\n"
@@ -1173,134 +1122,134 @@ msgstr ""
"请选择装入或保存软件包选择息。\n"
"格式与自动安装生成的文件一样。"
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Load"
msgstr "装入"
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Save"
msgstr "保存"
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
#, c-format
msgid "Bad file"
msgstr "文件有错"
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
#, c-format
msgid "KDE"
msgstr "KDE"
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
#, c-format
msgid "GNOME"
msgstr "GNOME"
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
#, c-format
msgid "Desktop Selection"
msgstr "桌面选择"
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
#, c-format
msgid "You can choose your workstation desktop profile."
msgstr "您可以选择您的工作站配置文件:"
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
#, c-format
msgid "Selected size is larger than available space"
msgstr "您选择的超过可用空间"
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
#, c-format
msgid "Type of install"
msgstr "安装类型"
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
#, c-format
msgid ""
"You have not selected any group of packages.\n"
"Please choose the minimal installation you want:"
msgstr "您没有选择任何的组件, 请选择最小安装:"
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
#, c-format
msgid "With X"
msgstr "安装 X"
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
#, c-format
msgid "With basic documentation (recommended!)"
msgstr "安装基础文档(建议!)"
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
#, c-format
msgid "Truly minimal install (especially no urpmi)"
msgstr "真正最小安装(注意没有 urpmi 包管理工具)"
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
#, c-format
msgid "Preparing installation"
msgstr "正在准备安装"
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
#, c-format
msgid "Installing package %s"
msgstr "正在安装软件包 %s"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "There was an error ordering packages:"
msgstr "排列软件包时出错: "
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "Go on anyway?"
msgstr "真的要继续?"
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
#, c-format
msgid "Retry"
msgstr "重试"
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
#, c-format
msgid "Skip this package"
msgstr "跳过此软件包"
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
#, c-format
msgid "Skip all packages from medium \"%s\""
msgstr "跳过介质“%s”中的全部软件包"
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
#, c-format
msgid "Go back to media and packages selection"
msgstr "返回介质和软件包选择"
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
#, c-format
msgid "There was an error installing package %s."
msgstr "安装软件包 %s 时出错。"
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
#, c-format
msgid "Post-install configuration"
msgstr "安装后的配置"
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
#, c-format
msgid "Please ensure the Update Modules media is in drive %s"
msgstr "请确定更新模块介质位于驱动器 %s"
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
#, c-format
msgid "Updates"
msgstr "更新"
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
#, c-format
msgid ""
"You now have the opportunity to download updated packages. These packages\n"
@@ -1319,95 +1268,95 @@ msgstr ""
"\n"
"您是否要安装升级包?"
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
#, c-format
msgid "%s on %s"
msgstr "位于 %2$s 上的 %1$s"
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
#, c-format
msgid "Hardware"
msgstr "硬件"
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
#, c-format
msgid "Sound card"
msgstr "声卡"
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
#, c-format
msgid "Do you have an ISA sound card?"
msgstr "您有 ISA 声卡吗?"
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
#, c-format
msgid ""
"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
"card"
msgstr "安装之后运行“alsaconf”或“sndconfig”来配置您的声卡"
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
#, c-format
msgid "No sound card detected. Try \"harddrake\" after installation"
msgstr "没有检测到声卡。请在安装之后尝试“Drak 硬件配置”。"
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
#, c-format
msgid "Graphical interface"
msgstr "图形界面"
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
#, c-format
msgid "Network & Internet"
msgstr "网络和 Internet"
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
#, c-format
msgid "Proxies"
msgstr "代理服务器"
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
#, c-format
msgid "configured"
msgstr "已配置"
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
#, c-format
msgid "Security Level"
msgstr "安全级别"
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
#, c-format
msgid "Firewall"
msgstr "防火墙"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "activated"
msgstr "已激活"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "disabled"
msgstr "已禁用"
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
#, c-format
msgid "You have not configured X. Are you sure you really want this?"
msgstr "您还没有配置过 X。您真的想要这样吗?"
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
#, c-format
msgid "Preparing bootloader..."
msgstr "正在准备引导程序..."
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
#, c-format
msgid "Be patient, this may take a while..."
msgstr ""
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
#, c-format
msgid ""
"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1419,24 +1368,24 @@ msgstr ""
"续, 不过您需要使用 BootX 或其它方式启动您的机器。根文件系统的内核参数是:"
"root=%s"
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
#, c-format
msgid ""
"In this security level, access to the files in the Windows partition is "
"restricted to the administrator."
msgstr "在此安全级别中, 只有管理员才能访问 Windows 分区中的文件。"
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr "请在驱动器 %s 中插入一张空白软盘"
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
#, c-format
msgid "Creating auto install floppy..."
msgstr "正在创建自动安装软盘..."
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
#, c-format
msgid ""
"Some steps are not completed.\n"
@@ -1447,7 +1396,7 @@ msgstr ""
"\n"
"您真的要现在退出吗?"
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
#, c-format
msgid "Congratulations"
msgstr "恭喜"
@@ -1591,6 +1540,30 @@ msgid ""
"Exit"
msgstr "退出"
+#~ msgid "Your desktop on a USB key"
+#~ msgstr "U 盘上的桌面"
+
+#~ msgid "The 100%% open source Mandriva Linux distribution"
+#~ msgstr "100%% 开放源代码的 Mandriva Linux 发行版"
+
+#~ msgid "Explore Linux easily with Mandriva One"
+#~ msgstr "用 Mandriva One 轻松探索 Linux"
+
+#~ msgid "A full Mandriva Linux desktop, with support"
+#~ msgstr "Mandriva Linux 桌面旗舰产品,附带完善的售后服务支持"
+
+#~ msgid "Mandriva: distributions for everybody's needs"
+#~ msgstr "Mandriva 在手,应用无忧"
+
+#~ msgid "Downloading file %s..."
+#~ msgstr "正在下载文件 %s..."
+
+#~ msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
+#~ msgstr "不支持从 32 位发行版升级到 64 位发行版"
+
+#~ msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
+#~ msgstr "不支持从 64 位发行版升级到 32 位发行版"
+
#~ msgid ""
#~ "You have selected the following server(s): %s\n"
#~ "\n"
diff --git a/perl-install/install/share/po/zh_TW.po b/perl-install/install/share/po/zh_TW.po
index cbb3d3b3d..0304325e4 100644
--- a/perl-install/install/share/po/zh_TW.po
+++ b/perl-install/install/share/po/zh_TW.po
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: DrakX\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
"PO-Revision-Date: 2008-10-01 10:02+0800\n"
"Last-Translator: # You-Cheng Hsieh <yochenhsieh@gmail.com>\n"
"Language-Team: Traditional Chinese <zh@li.org>\n"
@@ -32,31 +32,6 @@ msgstr ""
"X-Poedit-Country: TAIWAN\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr "您的桌面就在 USB 隨身碟中"
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr "100%% 開放原始碼的 Mandriva Linux 發行版"
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr "利用 Mandriva One 方便地探索 Linux"
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr "完整的 Mandriva Linux 桌面,包含技術支援"
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr "Mandriva:適合所有人需求的發行版"
-
#: any.pm:109
#, c-format
msgid "Do you have further supplementary media?"
@@ -96,92 +71,92 @@ msgstr "網路 (FTP)"
msgid "Network (NFS)"
msgstr "網路 (NFS)"
-#: any.pm:163
+#: any.pm:165
#, c-format
msgid "URL of the mirror?"
msgstr "映像站的 URL?"
-#: any.pm:169
+#: any.pm:171
#, c-format
msgid "URL must start with ftp:// or http://"
msgstr "URL 開頭必須是 ftp:// 或 http://"
-#: any.pm:180
+#: any.pm:182
#, c-format
msgid ""
"Contacting Mandriva Linux web site to get the list of available mirrors..."
msgstr "正在連結到 Mandriva Linux 網站查詢可用的映射站台..."
-#: any.pm:185
+#: any.pm:187
#, c-format
msgid ""
"Failed contacting Mandriva Linux web site to get the list of available "
"mirrors"
msgstr "無法連結到 Mandriva Linux 網站取得可用的映射站台"
-#: any.pm:195
+#: any.pm:197
#, c-format
msgid "Choose a mirror from which to get the packages"
msgstr "選取要用來抓取程式套件檔的 FTP 映射站台"
-#: any.pm:225
+#: any.pm:227
#, c-format
msgid "NFS setup"
msgstr "設定 NFS"
-#: any.pm:226
+#: any.pm:228
#, c-format
msgid "Please enter the hostname and directory of your NFS media"
msgstr "請輸入您的 NFS 媒介的主機和目錄名稱"
-#: any.pm:230
+#: any.pm:232
#, c-format
msgid "Hostname missing"
msgstr "沒有主機名稱"
-#: any.pm:231
+#: any.pm:233
#, c-format
msgid "Directory must begin with \"/\""
msgstr "目錄必須以「/」開始"
-#: any.pm:235
+#: any.pm:237
#, c-format
msgid "Hostname of the NFS mount ?"
msgstr "NFS 掛載點的主機名稱?"
-#: any.pm:236
+#: any.pm:238
#, c-format
msgid "Directory"
msgstr "目錄"
-#: any.pm:258
+#: any.pm:260
#, c-format
msgid "Supplementary"
msgstr "補充"
-#: any.pm:293
+#: any.pm:295
#, c-format
msgid ""
"Can't find a package list file on this mirror. Make sure the location is "
"correct."
msgstr "無法在這個映像站上找到套件列表檔。請確定位址是正確的。"
-#: any.pm:328
+#: any.pm:334
#, c-format
msgid "Looking at packages already installed..."
msgstr "正在查看已經安裝過的套件..."
-#: any.pm:362
+#: any.pm:368
#, c-format
msgid "Finding packages to upgrade..."
msgstr "正在搜尋要升級的套件..."
-#: any.pm:381
+#: any.pm:387
#, c-format
msgid "Removing packages prior to upgrade..."
msgstr "移除套件以更新..."
-#: any.pm:402
+#: any.pm:408
#, c-format
msgid ""
"You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -198,18 +173,18 @@ msgstr ""
"要升級為 KDE 3.5 並保留您的個人設定,請重新啟動您的系統\n"
"並使用 Mandriva 更新軟體升級。"
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
#, c-format
msgid "Reboot"
msgstr "重新開機"
-#: any.pm:407
+#: any.pm:413
#, c-format
msgid "Proceed"
msgstr "進行"
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:596
+#: any.pm:602
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -222,72 +197,72 @@ msgstr ""
"\n"
"您確定要移除這些套件嗎?\n"
-#: any.pm:815
+#: any.pm:821
#, c-format
msgid "Error reading file %s"
msgstr "讀取檔案 %s 時發生錯誤"
-#: any.pm:1022
+#: any.pm:1028
#, c-format
msgid "The following disk(s) were renamed:"
msgstr "下列磁碟已經改名:"
-#: any.pm:1024
+#: any.pm:1030
#, c-format
msgid "%s (previously named as %s)"
msgstr "%s (原本為 %s)"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "HTTP"
msgstr "HTTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "FTP"
msgstr "FTP"
-#: any.pm:1081
+#: any.pm:1087
#, c-format
msgid "NFS"
msgstr "NFS"
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
#, c-format
msgid "Network"
msgstr "網路"
-#: any.pm:1104
+#: any.pm:1110
#, c-format
msgid "Please choose a media"
msgstr "請選擇一個媒介"
-#: any.pm:1120
+#: any.pm:1126
#, c-format
msgid "File already exists. Overwrite it?"
msgstr "檔案已經存在了。要覆蓋它嗎?"
-#: any.pm:1124
+#: any.pm:1130
#, c-format
msgid "Permission denied"
msgstr "權限不足"
-#: any.pm:1172
+#: any.pm:1178
#, c-format
msgid "Bad NFS name"
msgstr "錯誤的 NFS 名稱"
-#: any.pm:1193
+#: any.pm:1199
#, c-format
msgid "Bad media %s"
msgstr "損壞的媒介 %s"
-#: any.pm:1236
+#: any.pm:1242
#, c-format
msgid "Can not make screenshots before partitioning"
msgstr "在尚未進行分割前無法提供畫面捕捉功能"
-#: any.pm:1244
+#: any.pm:1250
#, c-format
msgid "Screenshots will be available after install in %s"
msgstr "在安裝後您可以於 %s 取得螢幕截圖"
@@ -298,11 +273,15 @@ msgid "Installation"
msgstr "安裝"
#: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
#, c-format
msgid "Configuration"
msgstr "組態設定"
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
#: install2.pm:168
#, c-format
msgid "You must also format %s"
@@ -327,22 +306,22 @@ msgstr "啟動網路"
msgid "Bringing down the network"
msgstr "關閉網路"
-#: media.pm:402
+#: media.pm:399
#, c-format
msgid "Please wait, retrieving file"
msgstr "請稍候,正在取回檔案"
-#: media.pm:734
+#: media.pm:718
#, c-format
-msgid "Downloading file %s..."
-msgstr "正在下載檔案 %s..."
+msgid "unable to add medium"
+msgstr ""
-#: media.pm:822
+#: media.pm:758
#, c-format
msgid "Copying some packages on disks for future use"
msgstr "正在複製一些程式套件到磁碟以供稍後使用"
-#: media.pm:875
+#: media.pm:811
#, c-format
msgid "Copying in progress"
msgstr "複製進行中"
@@ -386,27 +365,27 @@ msgstr ""
msgid "An error occurred:"
msgstr "發生一個錯誤"
-#: pkgs.pm:776
+#: pkgs.pm:780
#, c-format
msgid "%d installation transactions failed"
msgstr "有 %d 個安裝業務失敗"
-#: pkgs.pm:777
+#: pkgs.pm:781
#, fuzzy, c-format
msgid "Installation of packages failed:"
msgstr "正在安裝套件 %s"
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
#, c-format
msgid "Workstation"
msgstr "工作站"
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
#, c-format
msgid "Office Workstation"
msgstr "辦公軟體平台"
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
#, c-format
msgid ""
"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -415,7 +394,7 @@ msgstr ""
"辦公軟體:文書處理軟體 (OpenOffice.org Writer、Kword)、試算表 (OpenOffice."
"org Calc、Kspread)、PDF 檢視器等等"
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
#, c-format
msgid ""
"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -424,262 +403,244 @@ msgstr ""
"辦公軟體:文書處理軟體 (kword、abiword)、試算表 (kspread、gnumeric)、PDF 檢視"
"器等等"
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
#, c-format
msgid "Game station"
msgstr "遊戲平台"
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
#, c-format
msgid "Amusement programs: arcade, boards, strategy, etc"
msgstr "娛樂的一些程式:紙牌、益智、動作、策略等"
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
#, c-format
msgid "Multimedia station"
msgstr "多媒體平台"
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
#, c-format
msgid "Sound and video playing/editing programs"
msgstr "音效以及影像撥放編輯程式"
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
#, c-format
msgid "Internet station"
msgstr "網際網路平台"
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
#, c-format
msgid ""
"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
"Web"
msgstr "包含讀信、寄信和閱讀新聞群組 (mutt、tin ..) 以及網路瀏覽的工具"
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
#, c-format
msgid "Network Computer (client)"
msgstr "網路電腦 (客戶端)"
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
#, c-format
msgid "Clients for different protocols including ssh"
msgstr "包含 ssh 等其他不同通訊協定的用戶端程式"
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
#, c-format
msgid "Tools to ease the configuration of your computer"
msgstr "讓您方便設定您系統的工具"
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
#, c-format
msgid "Console Tools"
msgstr "Console 工具"
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
#, c-format
msgid "Editors, shells, file tools, terminals"
msgstr "編輯器、shell、檔案工具、終端機"
#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
#, c-format
msgid "Development"
msgstr "程式開發"
#: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
#, c-format
msgid "C and C++ development libraries, programs and include files"
msgstr "C/C++ 發展環境,包含編譯器、程式庫與及一些引入檔"
#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
#, c-format
msgid "Documentation"
msgstr "文件檔案"
#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
#, c-format
msgid "Books and Howto's on Linux and Free Software"
msgstr "Linux 系統與自由軟體的書籍、HOWTO 文件"
#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
#, c-format
msgid "LSB"
msgstr "LSB"
#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
#, c-format
msgid "Linux Standard Base. Third party applications support"
msgstr "LSB 的支援,包含第三類協力廠商軟體支援"
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
#, c-format
msgid "Web Server"
msgstr "網頁伺服器 (Web)"
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
#, c-format
msgid "Apache"
msgstr "Apache"
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
#, c-format
msgid "Groupware"
msgstr "群組軟體"
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
#, c-format
msgid "Kolab Server"
msgstr "Kolab 伺服器"
#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
#, c-format
msgid "Firewall/Router"
msgstr "防火牆/路由器"
#: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
#, c-format
msgid "Internet gateway"
msgstr "網際網路閘道器"
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
#, c-format
msgid "Mail/News"
msgstr "郵件/新聞"
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
#, c-format
msgid "Postfix mail server, Inn news server"
msgstr "Postfix 郵件伺服器,Inn 新聞伺服器"
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
#, c-format
msgid "Directory Server"
msgstr "目錄伺服器"
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
#, c-format
msgid "FTP Server"
msgstr "FTP 伺服器"
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
#, c-format
msgid "ProFTPd"
msgstr "ProFTPd"
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
#, c-format
msgid "DNS/NIS"
msgstr "DNS/NIS"
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
#, c-format
msgid "Domain Name and Network Information Server"
msgstr "網域名稱與網路資訊伺服器"
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
#, c-format
msgid "File and Printer Sharing Server"
msgstr "檔案與列印分享伺服器"
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
#, c-format
msgid "NFS Server, Samba server"
msgstr "NFS 伺服器、Samba 伺服器"
#: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
#, c-format
msgid "Database"
msgstr "資料庫軟體"
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
#, c-format
msgid "PostgreSQL and MySQL Database Server"
msgstr "PostgreSQL 與 MySQL 資料庫伺服器"
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
#, c-format
msgid "Web/FTP"
msgstr "Web/FTP"
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
#, c-format
msgid "Apache, Pro-ftpd"
msgstr "Apache、ProFTPD"
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
#, c-format
msgid "Mail"
msgstr "電子郵件"
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
#, c-format
msgid "Postfix mail server"
msgstr "Postfix 郵件伺服器"
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
#, c-format
msgid "PostgreSQL or MySQL database server"
msgstr "PostgreSQL、MySQL 資料庫"
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
#, c-format
msgid "Network Computer server"
msgstr "網路伺服器"
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
#, c-format
msgid "NFS server, SMB server, Proxy server, ssh server"
msgstr "NFS 伺服器、SMB 伺服器、Proxy 伺服器、SSH 伺服器"
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
#, c-format
msgid "Graphical Environment"
msgstr "圖形環境"
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
#, c-format
msgid "KDE Workstation"
msgstr "KDE 工作站"
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
#, c-format
msgid ""
"The K Desktop Environment, the basic graphical environment with a collection "
"of accompanying tools"
msgstr "K 桌面環境,包含許多好用的圖型介面工具程式"
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
#, c-format
msgid "GNOME Workstation"
msgstr "GNOME 工作站"
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
#, c-format
msgid ""
"A graphical environment with user-friendly set of applications and desktop "
"tools"
msgstr "包含友善的應用程式、桌面軟體的圖型化使用環境"
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
#, c-format
msgid "LXDE Desktop"
msgstr "LXDE 桌面"
@@ -691,54 +652,52 @@ msgid ""
"applications and desktop tools"
msgstr "包含友善的應用程式、桌面軟體的圖型化使用環境"
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
#, c-format
msgid "Other Graphical Desktops"
msgstr "其他圖型桌面軟體"
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
#, c-format
msgid "Window Maker, Enlightenment, Fvwm, etc"
msgstr "Window Maker、Enlightenment、Fvwm 等"
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
#, c-format
msgid "Utilities"
msgstr "工具軟體"
#: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
#, c-format
msgid "SSH Server"
msgstr "SSH 伺服主機"
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
#, c-format
msgid "Webmin"
msgstr "Webmin"
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
#, c-format
msgid "Webmin Remote Configuration Server"
msgstr "Webmin 遠端設定伺服器"
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
#, c-format
msgid "Network Utilities/Monitoring"
msgstr "網路工具/監控"
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
#, c-format
msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
msgstr "監控工具、程序管理、tcpdump、nmap..."
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
#, c-format
msgid "Mandriva Wizards"
msgstr "Mandriva 精靈"
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
#, c-format
msgid "Wizards to configure server"
msgstr "用來設定伺服器的精靈"
@@ -836,17 +795,17 @@ msgstr "這是 '%s' 桌面的預覽。"
msgid "Click on images in order to see a bigger preview"
msgstr "在影像上點選以觀看較大的預覽畫面"
-#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
#, c-format
msgid "Package Group Selection"
msgstr "套件群組選擇"
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
#, c-format
msgid "Individual package selection"
msgstr "單一套件選取"
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
#, c-format
msgid "Total size: %d / %d MB"
msgstr "總共大小: %d / %d MB"
@@ -963,12 +922,12 @@ msgstr "最小安裝"
msgid "Software Management"
msgstr "軟體套件管理"
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
#, c-format
msgid "Choose the packages you want to install"
msgstr "選擇您想要安裝的套件"
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
#, c-format
msgid "Installing"
msgstr "正在安裝"
@@ -994,7 +953,7 @@ msgid "%d package"
msgid_plural "%d packages"
msgstr[0] "%d 個套件"
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
#, c-format
msgid "Summary"
msgstr "總結"
@@ -1004,7 +963,7 @@ msgstr "總結"
msgid "Configure"
msgstr "設定"
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
#, c-format
msgid "not configured"
msgstr "未被設定"
@@ -1014,7 +973,7 @@ msgstr "未被設定"
msgid "Media Selection"
msgstr "選擇安裝媒介"
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
#, c-format
msgid ""
"The following installation media have been found.\n"
@@ -1023,7 +982,7 @@ msgstr ""
"已經找到下列的安裝媒介。\n"
"如果您想略過它們,您現在可以將它們取消選取。"
-#: steps_gtk.pm:746 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
#, c-format
msgid ""
"You have the option to copy the contents of the CDs onto the hard drive "
@@ -1034,7 +993,7 @@ msgstr ""
"您可以選擇在安裝前先將光碟的內容複製到硬碟。\n"
"接著將會由硬碟繼續安裝,而且這些套件在安裝完畢之後仍然可以繼續使用。"
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
#, c-format
msgid "Copy whole CDs"
msgstr "複製整張光碟"
@@ -1054,59 +1013,49 @@ msgstr "請選取鍵盤排列的樣式。"
msgid "Here is the full list of available keyboards:"
msgstr "以下是所有可用的鍵盤清單:"
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
#, c-format
msgid "Install/Upgrade"
msgstr "安裝/升級"
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
#, c-format
msgid "Is this an install or an upgrade?"
msgstr "這是安裝或是升級?"
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
#, c-format
msgid ""
"_: This is a noun:\n"
"Install"
msgstr "安裝"
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
#, c-format
msgid "Upgrade %s"
msgstr "升級 %s"
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr "不支援從 32 位元升級至 64 位元的發行版"
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr "不支援從 64 位元升級至 32 位元的發行版"
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
#, c-format
msgid "Encryption key for %s"
msgstr "加密金鑰於 %s"
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
#, c-format
msgid "Cancel installation, reboot system"
msgstr "取消安裝,重新開機"
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
#, c-format
msgid "New Installation"
msgstr "新的安裝"
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
#, c-format
msgid "Upgrade previous installation (not recommended)"
msgstr "升級之前的安裝 (不建議)"
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
#, c-format
msgid ""
"Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1123,17 +1072,17 @@ msgstr ""
"\n"
"警告:您應該在選擇「新的安裝」之前先備份所有個人資料。"
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "IDE"
msgstr "IDE"
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
#, c-format
msgid "Configuring IDE"
msgstr "正在設定 IDE"
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
#, c-format
msgid ""
"No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1142,7 +1091,7 @@ msgstr ""
"沒有足夠的可用空間安裝 bootstrap!安裝還是會繼續,但是您必須在 DiskDrake\n"
"中建立 bootstrap 分割來啟動您的系統"
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
#, c-format
msgid ""
"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1152,7 +1101,7 @@ msgstr ""
"您需要建立一個 PPC PReP 開機 bootstrap!安裝還是會繼續,但是您必須在 "
"DiskDrake 中建立 bootstrap 分割來啟動您的系統"
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
#, c-format
msgid ""
"Change your Cd-Rom!\n"
@@ -1164,19 +1113,19 @@ msgstr ""
"請插入標示為 \"%s\" 的光碟於您的光碟機中,完成後請按下確定。\n"
"若是您沒有這片光碟,請點選取消以略過這一片光碟的安裝。"
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
#, c-format
msgid "Looking for available packages..."
msgstr "正在搜尋可以用的套件..."
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
#, c-format
msgid ""
"Your system does not have enough space left for installation or upgrade (%"
"dMB > %dMB)"
msgstr "您的系統剩餘的空間不足以安裝或升級 (%dMB > %dMB)"
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
#, c-format
msgid ""
"Please choose load or save package selection.\n"
@@ -1185,52 +1134,52 @@ msgstr ""
"請選擇要載入或者儲存套件選擇到磁片上。\n"
"它使用與自動安裝所產生的磁片相同的格式。"
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Load"
msgstr "載入"
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
#, c-format
msgid "Save"
msgstr "儲存"
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
#, c-format
msgid "Bad file"
msgstr "損壞的檔案"
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
#, c-format
msgid "KDE"
msgstr "KDE"
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
#, c-format
msgid "GNOME"
msgstr "GNOME"
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
#, c-format
msgid "Desktop Selection"
msgstr "桌面環境選擇"
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
#, c-format
msgid "You can choose your workstation desktop profile."
msgstr "您可以選擇您工作站的桌面環境:"
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
#, c-format
msgid "Selected size is larger than available space"
msgstr "所選取的大小超過可用的空間"
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
#, c-format
msgid "Type of install"
msgstr "安裝類型"
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
#, c-format
msgid ""
"You have not selected any group of packages.\n"
@@ -1239,82 +1188,82 @@ msgstr ""
"您並未選取任何套件群組。\n"
"請選擇您想要的最小安裝:"
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
#, c-format
msgid "With X"
msgstr "包含 X 環境"
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
#, c-format
msgid "With basic documentation (recommended!)"
msgstr "包含基本的說明文件 (建議的!)"
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
#, c-format
msgid "Truly minimal install (especially no urpmi)"
msgstr "真正最小安裝 (尤其無 urpmi)"
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
#, c-format
msgid "Preparing installation"
msgstr "正在準備安裝"
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
#, c-format
msgid "Installing package %s"
msgstr "正在安裝套件 %s"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "There was an error ordering packages:"
msgstr "排列套件時發生錯誤:"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
#, c-format
msgid "Go on anyway?"
msgstr "無論如何都要繼續嗎?"
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
#, c-format
msgid "Retry"
msgstr "重試"
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
#, c-format
msgid "Skip this package"
msgstr "略過這個套件"
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
#, c-format
msgid "Skip all packages from medium \"%s\""
msgstr "略過所有 %s 媒體的套件"
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
#, c-format
msgid "Go back to media and packages selection"
msgstr "回到媒體與套件選擇"
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
#, c-format
msgid "There was an error installing package %s."
msgstr "安裝 %s 套件時發生錯誤。"
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
#, c-format
msgid "Post-install configuration"
msgstr "安裝後的設定"
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
#, c-format
msgid "Please ensure the Update Modules media is in drive %s"
msgstr "請確定更新模組媒介位於磁碟機 %s 中"
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
#, c-format
msgid "Updates"
msgstr "更新"
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
#, c-format
msgid ""
"You now have the opportunity to download updated packages. These packages\n"
@@ -1333,95 +1282,95 @@ msgstr ""
"\n"
"您想要安裝更新嗎?"
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
#, c-format
msgid "%s on %s"
msgstr "%2$s 上的 %1$s"
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
#, c-format
msgid "Hardware"
msgstr "硬體"
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
#, c-format
msgid "Sound card"
msgstr "音效卡"
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
#, c-format
msgid "Do you have an ISA sound card?"
msgstr "您有 ISA 音效卡嗎?"
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
#, c-format
msgid ""
"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
"card"
msgstr "請在安裝完畢後,執行 \"alsaconf\" 或 \"sndconfig\" 來設定您的音效卡"
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
#, c-format
msgid "No sound card detected. Try \"harddrake\" after installation"
msgstr "沒偵測到任何音效卡。請在安裝後嘗試 \"harddrake\" 進行設定"
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
#, c-format
msgid "Graphical interface"
msgstr "圖形介面"
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
#, c-format
msgid "Network & Internet"
msgstr "網路與網際網路"
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
#, c-format
msgid "Proxies"
msgstr "代理伺服器"
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
#, c-format
msgid "configured"
msgstr "已設定"
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
#, c-format
msgid "Security Level"
msgstr "安全層級"
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
#, c-format
msgid "Firewall"
msgstr "防火牆"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "activated"
msgstr "已啟用"
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
#, c-format
msgid "disabled"
msgstr "已停用"
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
#, c-format
msgid "You have not configured X. Are you sure you really want this?"
msgstr "您尚未設定 X。您確定您真的要這樣做?"
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
#, c-format
msgid "Preparing bootloader..."
msgstr "正在準備開機載入程式..."
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
#, c-format
msgid "Be patient, this may take a while..."
msgstr "請耐心等候,這要花一些時間..."
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
#, c-format
msgid ""
"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1434,24 +1383,24 @@ msgstr ""
"安裝還是會繼續下去,不過您將需要使用 bootX 或某些其他方法來啟動您的機器。"
"root fs 的核心參數是:root=%s"
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
#, c-format
msgid ""
"In this security level, access to the files in the Windows partition is "
"restricted to the administrator."
msgstr "在這個安全層級中,只有管理者能夠存取位於 Windows 分割區的檔案。"
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr "請在 %s 中插入一片空白磁片"
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
#, c-format
msgid "Creating auto install floppy..."
msgstr "正在製作自動安裝磁片..."
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
#, c-format
msgid ""
"Some steps are not completed.\n"
@@ -1462,7 +1411,7 @@ msgstr ""
"\n"
"您確定要結束安裝程式?"
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
#, c-format
msgid "Congratulations"
msgstr "恭喜"
@@ -1605,3 +1554,27 @@ msgid ""
"_: Keep these entry short\n"
"Exit"
msgstr "離開"
+
+#~ msgid "Your desktop on a USB key"
+#~ msgstr "您的桌面就在 USB 隨身碟中"
+
+#~ msgid "The 100%% open source Mandriva Linux distribution"
+#~ msgstr "100%% 開放原始碼的 Mandriva Linux 發行版"
+
+#~ msgid "Explore Linux easily with Mandriva One"
+#~ msgstr "利用 Mandriva One 方便地探索 Linux"
+
+#~ msgid "A full Mandriva Linux desktop, with support"
+#~ msgstr "完整的 Mandriva Linux 桌面,包含技術支援"
+
+#~ msgid "Mandriva: distributions for everybody's needs"
+#~ msgstr "Mandriva:適合所有人需求的發行版"
+
+#~ msgid "Downloading file %s..."
+#~ msgstr "正在下載檔案 %s..."
+
+#~ msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
+#~ msgstr "不支援從 32 位元升級至 64 位元的發行版"
+
+#~ msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
+#~ msgstr "不支援從 64 位元升級至 32 位元的發行版"