summaryrefslogtreecommitdiffstats
path: root/perl-install/standalone/drakgw
diff options
context:
space:
mode:
Diffstat (limited to 'perl-install/standalone/drakgw')
-rwxr-xr-xperl-install/standalone/drakgw1
1 files changed, 1 insertions, 0 deletions
diff --git a/perl-install/standalone/drakgw b/perl-install/standalone/drakgw
index 8183cca78..5fcbe5f3c 100755
--- a/perl-install/standalone/drakgw
+++ b/perl-install/standalone/drakgw
@@ -398,6 +398,7 @@ sub gw_configure() {
my $_wait_configuring = $in->wait_message(N("Configuring..."),
N("Configuring firewall..."));
+ $shorewall->{disabled} = 0;
$shorewall->{masq_subnet} = "$lan_intf->{NETWORK}/$lan_intf->{NETMASK}";
network::shorewall::write($shorewall);
'>-rw-r--r--images/NEWS35
-rw-r--r--images/dracut.conf4
-rwxr-xr-ximages/make_boot_img140
-rwxr-xr-ximages/update_kernel38
-rw-r--r--kernel/list_modules.pm3
-rw-r--r--kernel/modules.pl35
-rw-r--r--mdk-stage1/.gitignore13
-rw-r--r--mdk-stage1/Makefile54
-rw-r--r--mdk-stage1/Makefile.common24
-rw-r--r--mdk-stage1/NEWS13
-rw-r--r--mdk-stage1/init.c177
-rw-r--r--mdk-stage1/ka.c2
-rw-r--r--mdk-stage1/probing.c3
-rw-r--r--mdk-stage1/stage1.c37
-rw-r--r--mdk-stage1/tools.c59
-rw-r--r--mdk-stage1/tools.h2
-rw-r--r--mdk-stage1/utils.c8
-rw-r--r--mdk-stage1/utils.h2
-rw-r--r--perl-install/.perl_checker1
-rw-r--r--perl-install/Makefile.config4
-rw-r--r--perl-install/Makefile.drakxtools1
-rw-r--r--perl-install/NEWS124
-rw-r--r--perl-install/any.pm50
-rwxr-xr-xperl-install/c/stuff.xs.pl22
-rw-r--r--perl-install/common.pm4
-rw-r--r--perl-install/dbus_object.pm10
-rw-r--r--perl-install/detect_devices.pm10
-rw-r--r--perl-install/devices.pm2
-rw-r--r--perl-install/diskdrake/hd_gtk.pm84
-rw-r--r--perl-install/diskdrake/smbnfs_gtk.pm24
-rw-r--r--perl-install/fs/partitioning_wizard.pm115
-rw-r--r--perl-install/harddrake/sound.pm235
-rw-r--r--perl-install/install/Makefile2
-rw-r--r--perl-install/install/NEWS115
-rw-r--r--perl-install/install/any.pm6
-rw-r--r--perl-install/install/gtk.pm47
-rw-r--r--perl-install/install/help/po/sl.po43
-rw-r--r--perl-install/install/help/po/tr.po277
-rw-r--r--perl-install/install/install2.pm15
-rw-r--r--perl-install/install/media.pm5
-rw-r--r--perl-install/install/pixmaps/left-background.pngbin220817 -> 220814 bytes-rw-r--r--perl-install/install/share/gdb-inst22
-rw-r--r--perl-install/install/share/list.xml88
-rw-r--r--perl-install/install/share/po/.tx/config8
-rw-r--r--perl-install/install/share/po/DrakX.pot470
-rw-r--r--perl-install/install/share/po/af.po427
-rw-r--r--perl-install/install/share/po/am.po423
-rw-r--r--perl-install/install/share/po/ar.po445
-rw-r--r--perl-install/install/share/po/ast.po429
-rw-r--r--perl-install/install/share/po/az.po425
-rw-r--r--perl-install/install/share/po/be.po427
-rw-r--r--perl-install/install/share/po/bg.po425
-rw-r--r--perl-install/install/share/po/bn.po427
-rw-r--r--perl-install/install/share/po/br.po445
-rw-r--r--perl-install/install/share/po/bs.po429
-rw-r--r--perl-install/install/share/po/ca.po429
-rw-r--r--perl-install/install/share/po/cs.po429
-rw-r--r--perl-install/install/share/po/cy.po429
-rw-r--r--perl-install/install/share/po/da.po427
-rw-r--r--perl-install/install/share/po/de.po428
-rw-r--r--perl-install/install/share/po/el.po429
-rw-r--r--perl-install/install/share/po/eo.po425
-rw-r--r--perl-install/install/share/po/es.po478
-rw-r--r--perl-install/install/share/po/et.po431
-rw-r--r--perl-install/install/share/po/eu.po429
-rw-r--r--perl-install/install/share/po/fa.po423
-rw-r--r--perl-install/install/share/po/fi.po428
-rw-r--r--perl-install/install/share/po/fr.po766
-rw-r--r--perl-install/install/share/po/fur.po423
-rw-r--r--perl-install/install/share/po/ga.po423
-rw-r--r--perl-install/install/share/po/gl.po429
-rw-r--r--perl-install/install/share/po/he.po425
-rw-r--r--perl-install/install/share/po/hi.po425
-rw-r--r--perl-install/install/share/po/hr.po427
-rw-r--r--perl-install/install/share/po/hu.po428
-rw-r--r--perl-install/install/share/po/id.po693
-rw-r--r--perl-install/install/share/po/is.po426
-rw-r--r--perl-install/install/share/po/it.po429
-rw-r--r--perl-install/install/share/po/ja.po425
-rw-r--r--perl-install/install/share/po/ko.po423
-rw-r--r--perl-install/install/share/po/ky.po429
-rw-r--r--perl-install/install/share/po/lt.po427
-rw-r--r--perl-install/install/share/po/ltg.po429
-rw-r--r--perl-install/install/share/po/lv.po427
-rw-r--r--perl-install/install/share/po/mk.po431
-rw-r--r--perl-install/install/share/po/mn.po423
-rw-r--r--perl-install/install/share/po/ms.po423
-rw-r--r--perl-install/install/share/po/mt.po423
-rw-r--r--perl-install/install/share/po/nb.po429
-rw-r--r--perl-install/install/share/po/nl.po456
-rw-r--r--perl-install/install/share/po/nn.po428
-rw-r--r--perl-install/install/share/po/pa_IN.po423
-rw-r--r--perl-install/install/share/po/pl.po469
-rw-r--r--perl-install/install/share/po/pt.po429
-rw-r--r--perl-install/install/share/po/pt_BR.po640
-rw-r--r--perl-install/install/share/po/ro.po427
-rw-r--r--perl-install/install/share/po/ru.po468
-rw-r--r--perl-install/install/share/po/sc.po425
-rw-r--r--perl-install/install/share/po/sk.po425
-rw-r--r--perl-install/install/share/po/sl.po435
-rw-r--r--perl-install/install/share/po/sq.po427
-rw-r--r--perl-install/install/share/po/sr.po429
-rw-r--r--perl-install/install/share/po/sr@Latn.po429
-rw-r--r--perl-install/install/share/po/sv.po428
-rw-r--r--perl-install/install/share/po/ta.po423
-rw-r--r--perl-install/install/share/po/tg.po427
-rw-r--r--perl-install/install/share/po/th.po423
-rw-r--r--perl-install/install/share/po/tl.po427
-rw-r--r--perl-install/install/share/po/tr.po432
-rw-r--r--perl-install/install/share/po/uk.po437
-rw-r--r--perl-install/install/share/po/uz.po429
-rw-r--r--perl-install/install/share/po/uz@cyrillic.po429
-rw-r--r--perl-install/install/share/po/vi.po427
-rw-r--r--perl-install/install/share/po/wa.po429
-rw-r--r--perl-install/install/share/po/zh_CN.po425
-rw-r--r--perl-install/install/share/po/zh_TW.po425
-rw-r--r--perl-install/install/share/runinstall2.sh2
-rw-r--r--perl-install/install/share/symlinks7
-rw-r--r--perl-install/install/steps.pm9
-rw-r--r--perl-install/install/steps_gtk.pm106
-rw-r--r--perl-install/install/steps_interactive.pm2
-rw-r--r--perl-install/interactive/gtk.pm177
-rw-r--r--perl-install/mygtk3.pm1658
-rw-r--r--perl-install/pixmaps/banner-blue-part.pngbin325 -> 233 bytes-rw-r--r--perl-install/pkgs.pm2
-rw-r--r--perl-install/services.pm47
-rw-r--r--perl-install/share/diskdrake.css68
-rw-r--r--perl-install/share/diskdrake.rc65
-rw-r--r--perl-install/share/po/.tx/config8
-rw-r--r--perl-install/share/po/af.po95
-rw-r--r--perl-install/share/po/am.po67
-rw-r--r--perl-install/share/po/ar.po92
-rw-r--r--perl-install/share/po/az.po93
-rw-r--r--perl-install/share/po/be.po63
-rw-r--r--perl-install/share/po/bg.po72
-rw-r--r--perl-install/share/po/bn.po93
-rw-r--r--perl-install/share/po/br.po76
-rw-r--r--perl-install/share/po/bs.po96
-rw-r--r--perl-install/share/po/ca.po93
-rw-r--r--perl-install/share/po/cs.po93
-rw-r--r--perl-install/share/po/cy.po93
-rw-r--r--perl-install/share/po/da.po93
-rw-r--r--perl-install/share/po/de.po93
-rw-r--r--perl-install/share/po/el.po101
-rw-r--r--perl-install/share/po/eo.po75
-rw-r--r--perl-install/share/po/es.po93
-rw-r--r--perl-install/share/po/et.po277
-rw-r--r--perl-install/share/po/eu.po95
-rw-r--r--perl-install/share/po/fa.po93
-rw-r--r--perl-install/share/po/fi.po93
-rw-r--r--perl-install/share/po/fr.po97
-rw-r--r--perl-install/share/po/fur.po63
-rw-r--r--perl-install/share/po/ga.po63
-rw-r--r--perl-install/share/po/gl.po93
-rw-r--r--perl-install/share/po/he.po93
-rw-r--r--perl-install/share/po/hi.po93
-rw-r--r--perl-install/share/po/hr.po67
-rw-r--r--perl-install/share/po/hu.po95
-rw-r--r--perl-install/share/po/id.po1532
-rw-r--r--perl-install/share/po/is.po93
-rw-r--r--perl-install/share/po/it.po94
-rw-r--r--perl-install/share/po/ja.po93
-rw-r--r--perl-install/share/po/ko.po63
-rw-r--r--perl-install/share/po/ky.po93
-rw-r--r--perl-install/share/po/libDrakX.pot58
-rw-r--r--perl-install/share/po/lt.po63
-rw-r--r--perl-install/share/po/ltg.po94
-rw-r--r--perl-install/share/po/lv.po95
-rw-r--r--perl-install/share/po/mk.po94
-rw-r--r--perl-install/share/po/mn.po63
-rw-r--r--perl-install/share/po/ms.po79
-rw-r--r--perl-install/share/po/mt.po93
-rw-r--r--perl-install/share/po/nb.po91
-rw-r--r--perl-install/share/po/nl.po161
-rw-r--r--perl-install/share/po/nn.po91
-rw-r--r--perl-install/share/po/pa_IN.po93
-rw-r--r--perl-install/share/po/pl.po93
-rw-r--r--perl-install/share/po/pt.po93
-rw-r--r--perl-install/share/po/pt_BR.po518
-rw-r--r--perl-install/share/po/ro.po93
-rw-r--r--perl-install/share/po/ru.po1946
-rw-r--r--perl-install/share/po/sc.po75
-rw-r--r--perl-install/share/po/sk.po93
-rw-r--r--perl-install/share/po/sl.po99
-rw-r--r--perl-install/share/po/sq.po95
-rw-r--r--perl-install/share/po/sr.po93
-rw-r--r--perl-install/share/po/sr@Latn.po93
-rw-r--r--perl-install/share/po/sv.po95
-rw-r--r--perl-install/share/po/ta.po75
-rw-r--r--perl-install/share/po/tg.po96
-rw-r--r--perl-install/share/po/th.po63
-rw-r--r--perl-install/share/po/tl.po93
-rw-r--r--perl-install/share/po/tr.po100
-rwxr-xr-xperl-install/share/po/translation_size.pl14
-rw-r--r--perl-install/share/po/uk.po97
-rw-r--r--perl-install/share/po/uz.po68
-rw-r--r--perl-install/share/po/uz@cyrillic.po66
-rw-r--r--perl-install/share/po/vi.po93
-rw-r--r--perl-install/share/po/wa.po95
-rw-r--r--perl-install/share/po/zh_CN.po93
-rw-r--r--perl-install/share/po/zh_TW.po1134
-rw-r--r--perl-install/share/themes-galaxy.css31
-rwxr-xr-xperl-install/standalone/diskdrake2
-rwxr-xr-xperl-install/standalone/display_help22
-rwxr-xr-xperl-install/standalone/display_help_gtk372
-rwxr-xr-xperl-install/standalone/drakautoinst64
-rwxr-xr-xperl-install/standalone/drakboot38
-rwxr-xr-xperl-install/standalone/drakbug38
-rwxr-xr-xperl-install/standalone/drakclock282
-rwxr-xr-xperl-install/standalone/drakdvb24
-rwxr-xr-xperl-install/standalone/drakedm2
-rwxr-xr-xperl-install/standalone/drakfloppy52
-rwxr-xr-xperl-install/standalone/drakfont125
-rwxr-xr-xperl-install/standalone/drakhelp2
-rwxr-xr-xperl-install/standalone/drakperm41
-rwxr-xr-xperl-install/standalone/draksec112
-rwxr-xr-xperl-install/standalone/draksound2
-rwxr-xr-xperl-install/standalone/drakups40
-rwxr-xr-xperl-install/standalone/drakxservices2
-rwxr-xr-xperl-install/standalone/drakxtv2
-rwxr-xr-xperl-install/standalone/finish-install2
-rwxr-xr-xperl-install/standalone/harddrake2219
-rwxr-xr-xperl-install/standalone/localedrake2
-rwxr-xr-xperl-install/standalone/logdrake106
-rw-r--r--perl-install/standalone/po/.tx/config8
-rw-r--r--perl-install/standalone/po/af.po76
-rw-r--r--perl-install/standalone/po/am.po74
-rw-r--r--perl-install/standalone/po/ar.po78
-rw-r--r--perl-install/standalone/po/az.po78
-rw-r--r--perl-install/standalone/po/be.po72
-rw-r--r--perl-install/standalone/po/bg.po76
-rw-r--r--perl-install/standalone/po/bn.po76
-rw-r--r--perl-install/standalone/po/br.po76
-rw-r--r--perl-install/standalone/po/bs.po78
-rw-r--r--perl-install/standalone/po/ca.po78
-rw-r--r--perl-install/standalone/po/cs.po78
-rw-r--r--perl-install/standalone/po/cy.po78
-rw-r--r--perl-install/standalone/po/da.po78
-rw-r--r--perl-install/standalone/po/de.po78
-rw-r--r--perl-install/standalone/po/el.po142
-rw-r--r--perl-install/standalone/po/eo.po68
-rw-r--r--perl-install/standalone/po/es.po160
-rw-r--r--perl-install/standalone/po/et.po145
-rw-r--r--perl-install/standalone/po/eu.po78
-rw-r--r--perl-install/standalone/po/fa.po76
-rw-r--r--perl-install/standalone/po/fi.po78
-rw-r--r--perl-install/standalone/po/fr.po155
-rw-r--r--perl-install/standalone/po/fur.po62
-rw-r--r--perl-install/standalone/po/ga.po68
-rw-r--r--perl-install/standalone/po/gl.po78
-rw-r--r--perl-install/standalone/po/he.po78
-rw-r--r--perl-install/standalone/po/hi.po76
-rw-r--r--perl-install/standalone/po/hr.po68
-rw-r--r--perl-install/standalone/po/hu.po78
-rw-r--r--perl-install/standalone/po/id.po548
-rw-r--r--perl-install/standalone/po/is.po78
-rw-r--r--perl-install/standalone/po/it.po78
-rw-r--r--perl-install/standalone/po/ja.po80
-rw-r--r--perl-install/standalone/po/ko.po68
-rw-r--r--perl-install/standalone/po/ky.po76
-rw-r--r--perl-install/standalone/po/libDrakX-standalone.pot38
-rw-r--r--perl-install/standalone/po/lt.po68
-rw-r--r--perl-install/standalone/po/ltg.po76
-rw-r--r--perl-install/standalone/po/lv.po68
-rw-r--r--perl-install/standalone/po/mk.po76
-rw-r--r--perl-install/standalone/po/mn.po74
-rw-r--r--perl-install/standalone/po/ms.po68
-rw-r--r--perl-install/standalone/po/mt.po76
-rw-r--r--perl-install/standalone/po/nb.po78
-rw-r--r--perl-install/standalone/po/nl.po145
-rw-r--r--perl-install/standalone/po/nn.po78
-rw-r--r--perl-install/standalone/po/pa_IN.po78
-rw-r--r--perl-install/standalone/po/pl.po248
-rw-r--r--perl-install/standalone/po/pt.po78
-rw-r--r--perl-install/standalone/po/pt_BR.po536
-rw-r--r--perl-install/standalone/po/ro.po74
-rw-r--r--perl-install/standalone/po/ru.po78
-rw-r--r--perl-install/standalone/po/sc.po54
-rw-r--r--perl-install/standalone/po/sk.po78
-rw-r--r--perl-install/standalone/po/sl.po78
-rw-r--r--perl-install/standalone/po/sq.po76
-rw-r--r--perl-install/standalone/po/sr.po76
-rw-r--r--perl-install/standalone/po/sr@Latn.po76
-rw-r--r--perl-install/standalone/po/sv.po78
-rw-r--r--perl-install/standalone/po/ta.po70
-rw-r--r--perl-install/standalone/po/tg.po76
-rw-r--r--perl-install/standalone/po/th.po68
-rw-r--r--perl-install/standalone/po/tl.po76
-rw-r--r--perl-install/standalone/po/tr.po145
-rw-r--r--perl-install/standalone/po/uk.po80
-rw-r--r--perl-install/standalone/po/uz.po76
-rw-r--r--perl-install/standalone/po/uz@cyrillic.po76
-rw-r--r--perl-install/standalone/po/vi.po78
-rw-r--r--perl-install/standalone/po/wa.po78
-rw-r--r--perl-install/standalone/po/zh_CN.po78
-rw-r--r--perl-install/standalone/po/zh_TW.po441
-rw-r--r--perl-install/standalone/polkit/Makefile7
-rw-r--r--perl-install/standalone/polkit/org.mageia.draksec.rules11
-rwxr-xr-xperl-install/standalone/scannerdrake2
-rw-r--r--perl-install/timezone.pm19
-rw-r--r--perl-install/ugtk2.pm4
-rw-r--r--perl-install/ugtk3.pm1488
-rwxr-xr-xperl-install/unused/migrate-ugtk2-to-mygtk2.pl6
-rw-r--r--rescue/.gitignore1
-rw-r--r--rescue/Makefile4
-rw-r--r--rescue/NEWS9
-rw-r--r--rescue/aliases11
-rwxr-xr-xrescue/bin/drvinst (renamed from rescue/drvinst)0
-rwxr-xr-xrescue/bin/guessmounts (renamed from rescue/guessmounts)0
-rwxr-xr-xrescue/bin/install_bootloader (renamed from rescue/install_bootloader)0
-rwxr-xr-xrescue/bin/lsparts (renamed from rescue/lsparts)0
-rwxr-xr-xrescue/bin/rescue-doc (renamed from rescue/rescue-doc)0
-rwxr-xr-xrescue/bin/restore_ms_boot (renamed from rescue/restore_ms_boot)0
-rw-r--r--rescue/dirs9
-rw-r--r--rescue/list.xml134
-rwxr-xr-xrescue/make_rescue_img34
-rwxr-xr-xrescue/sbin/partimage_whole_disk (renamed from rescue/partimage_whole_disk)0
-rw-r--r--rescue/tree/etc/hostname1
-rw-r--r--rescue/tree/etc/inittab16
-rw-r--r--rescue/tree/etc/passwd3
-rwxr-xr-xrescue/tree/etc/rc.reboot8
-rwxr-xr-xrescue/tree/etc/rc.sysinit87
-rwxr-xr-xrescue/tree/sbin/fakeshutdown39
-rwxr-xr-xrescue/tree/usr/bin/login (renamed from rescue/tree/bin/login)0
-rwxr-xr-xrescue/tree/usr/bin/mageia-rescue35
-rw-r--r--rescue/tree/usr/lib/CVS.0
-rw-r--r--rescue/tree/usr/lib/modules-load.d/mageia-rescue.conf17
-rwxr-xr-xrescue/tree/usr/lib/restore-image-lib.sh (renamed from rescue/restore-image-lib.sh)0
-rw-r--r--rescue/tree/usr/lib/systemd/system/rescue.service20
-rw-r--r--rescue/tree/usr/lib/systemd/system/systemd-udevd.service.d/dracut-rules.conf1
-rwxr-xr-xrescue/tree/usr/sbin/diskdrake-resize (renamed from rescue/diskdrake-resize)0
-rwxr-xr-xrescue/tree/usr/sbin/genpasswd (renamed from rescue/genpasswd)0
-rwxr-xr-xrescue/tree/usr/sbin/grabjournallogs (renamed from rescue/grabjournallogs)0
-rwxr-xr-xrescue/tree/usr/sbin/restore-image.sh (renamed from rescue/restore-image.sh)0
-rwxr-xr-xrescue/tree/usr/sbin/startssh (renamed from rescue/startssh)0
-rw-r--r--rescue/tree/usr/share/symlinks9
-rw-r--r--tools/Makefile2
-rwxr-xr-xtools/drakx-in-chroot13
-rwxr-xr-xtools/install-xml-file-list4
341 files changed, 30565 insertions, 27087 deletions
diff --git a/Makefile b/Makefile
index 79744281d..450240d46 100644
--- a/Makefile
+++ b/Makefile
@@ -19,8 +19,6 @@ install_only:
make -C rescue install STAGE2_DEST=$(STAGE2_DEST)
make -C advertising install ROOTDEST=$(ROOTDEST)
- LC_ALL=C svn info ChangeLog | egrep '^Revision|^Last Changed Date' > $(STAGE2_DEST)/VERSION
-
clean:
# force taking new rpms from repository
rm -rf images/RPMS
diff --git a/images/Makefile b/images/Makefile
index 18956e2cf..142cfd577 100644
--- a/images/Makefile
+++ b/images/Makefile
@@ -1,6 +1,6 @@
include ../Makefile.config
-VERSION=1.93
+VERSION=2.4
PRODUCT=drakx-installer-images
KERNELS=$(shell rpm -qf /lib/modules/3.*)
@@ -8,7 +8,12 @@ IMAGES_DEST = $(ROOTDEST)/install/images
all: images
-images: all.kernels
+boot.iso: images/boot.iso
+
+images/boot.iso: all.kernels/.list make_boot_img
+ DISTRIB_DESCR=$(DISTRIB_DESCR) DISTRIB_VERSION=$(DISTRIB_VERSION) ./make_boot_img images/boot.iso
+
+images: all.kernels/.list
DISTRIB_DESCR=$(DISTRIB_DESCR) DISTRIB_VERSION=$(DISTRIB_VERSION) ./make_boot_img
rm -rf images/alternatives
if [ `ls images/*.img-* 2>/dev/null | wc -l` -gt 0 ]; then \
@@ -16,7 +21,7 @@ images: all.kernels
fi
cd images ; md5sum *.{img,iso}* > MD5SUM
-all.kernels: update_kernel ../kernel/list_modules.pm
+all.kernels/.list: update_kernel
./update_kernel $(KERNELS)
dist: tar
@@ -26,7 +31,7 @@ tar:
$(info $(PRODUCT)-$(VERSION).tar.xz is ready)
clean:
- rm -rf images isolinux all.kernels modules.description
+ rm -rf images isolinux all.kernels modules.description build
find . -name "*~" -o -name ".#*" | xargs rm -f
install:
@@ -37,3 +42,5 @@ install:
rm -rf $(ROOTDEST)/isolinux
cp -af isolinux $(ROOTDEST)
endif
+
+.PHONY: boot.iso install clean dist tar images
diff --git a/images/NEWS b/images/NEWS
index c82f1e4c9..1ec90f9b7 100644
--- a/images/NEWS
+++ b/images/NEWS
@@ -1,3 +1,38 @@
+Version 2.4 - 15 December 2013 by Anne Nicolas
+
+- remove buggy control caracters (#11602)
+- use audit=0 in rescue isolinux config to allow systemd-nspawn to work smoothly
+
+Version 2.3 - 2 December 2013 by Thierry Vignaud
+
+- include "sdhci-acpi" for eMMC (mga#11812)
+
+Version 2.2 - 13 November 2013 by Colin Guthrie
+
+- pass the modules we want in modules.alias, but not in the initrd through to
+ dracut via an environment variable
+- add BOOT_AUTOMATIC_METHOD to inject command line params into boot.iso syslinux
+
+Version 2.1 - 5 November 2013 by Colin Guthrie
+
+- revert back to static per-arch isolinux.cfg files
+
+Version 2.00 - 2 November 2013 by Thomas Backlund
+
+- ensure initrd is created with 644 perms (normally 600 for security reasons)
+- fix 32-bit isolinux wrapper (s/i586/i386)
+
+Version 1.95 - 2 November 2013 by Colin Guthrie
+
+- omit the dracut network module now that we include our own networking kernel modules
+- add a dracut.conf rather than adding lots of command line options
+- ensure initrd is xz compressed
+- include network modules as specified by kernel/list_modules.pm
+
+Version 1.94 - 29 October 2013 by Colin Guthrie
+
+- adapt to a dracut based stage1
+
Version 1.93 - 14 October 2013 by Thierry Vignaud
- sync with kernel-3.12
diff --git a/images/dracut.conf b/images/dracut.conf
new file mode 100644
index 000000000..a1fd05e18
--- /dev/null
+++ b/images/dracut.conf
@@ -0,0 +1,4 @@
+hostonly=no
+nofscks=yes
+omit_dracutmodules+=" dash modsign systemd plymouth btrfs crypt lvm cifs resume rootfs-block biosdevname usrmount shutdown network "
+compress=xz
diff --git a/images/make_boot_img b/images/make_boot_img
index 35a00cc30..613affd9a 100755
--- a/images/make_boot_img
+++ b/images/make_boot_img
@@ -62,10 +62,10 @@ foreach my $img (@images) {
} elsif ($img =~ /boot.iso/) {
boot_iso($img, \@kernels);
} elsif ($extension eq 'rdz') {
- initrd($type, $I, "$img-$_") foreach @kernels;
+ initrd($type, $I, "$img-$_", $_) foreach @kernels;
} elsif ($extension eq 'img') {
print STDERR "calling boot_img_$arch for $img\n";
- $::{"boot_img_$arch"}->($type, $I, "$img-$_", "all.kernels/$_/vmlinuz") foreach @kernels;
+ $::{"boot_img_$arch"}->($type, $I, "$img-$_", $_, "all.kernels/$_/vmlinuz") foreach @kernels;
rename("$img-$kernels[0]", $img);
} else {
die "unknown image $img";
@@ -106,7 +106,7 @@ sub syslinux_msg {
$tree->[0] eq 'document' or die "bad file $msg_xml_file\n";
my $text = xml_tree2syslinux('default', $tree->[1]);
- pack("C*", 0x0E, 0x80, 0x03, 0x00) . " "
+ " "
. $text . join('', @more_text)
. "\n" . syslinux_color('red') . "[F1-Help] [F2-Advanced Help]" . syslinux_color('default') . "\n";
}
@@ -143,71 +143,31 @@ EOF
$header . ($b_gfxboot ? $header_gfxboot : $header_non_gfxboot) . join('', @l);
}
+sub trim {
+ return $_[0] =~ s/^\s+|\s+$//rg;
+}
+
sub initrd {
- my ($type, $I, $img) = @_;
- my $stage1_root = $ENV{USE_LOCAL_STAGE1} ? "../mdk-stage1" : "/usr/$lib/drakx-installer-binaries";
+ my ($type, $I, $img, $kernel) = @_;
+ my $stage1_binary = $ENV{USE_LOCAL_STAGE1} ? trim(`realpath ../mdk-stage1/stage1`) : "";
+ my $init_binary = $ENV{USE_LOCAL_STAGE1} ? trim(`realpath ../mdk-stage1/init`) : "";
my ($ext) = $img =~ /rdz-(.*)/ or die "bad initrd name ($img)";
+ my $modules = " mgainstaller ";
+ my $drivers = `perl ../kernel/modules.pl list_needed_modules $kernel | xargs`;
+ my $fakedrivers = `perl ../kernel/modules.pl list_fake_modules $kernel | xargs`;
- _ "rm -rf $tmp_initrd";
- mkdir_p("$tmp_initrd$_") foreach qw(/etc /firmware /lib /modules /sbin /tmp /var);
- symlink "../modules", "$tmp_initrd/lib/modules";
- symlink "../firmware", "$tmp_initrd/lib/firmware";
-
- symlink "/proc/mounts", "$tmp_initrd/etc/mtab";
- symlink "../tmp", "$tmp_initrd/var/run";
- _ "install -D /usr/share/terminfo/l/linux $tmp_initrd/usr/share/terminfo/l/linux";
- foreach ('pcitable', 'usbtable') {
- _ "install -D /usr/share/ldetect-lst/$_.gz $tmp_initrd/usr/share/ldetect-lst/$_.gz";
- }
- _ "install -D /usr/share/pci.ids $tmp_initrd/usr/share/pci.ids";
- foreach ("dkms-modules.alias", "fallback-modules.alias", "/lib/module-init-tools/ldetect-lst-modules.alias") {
- my $file = m!^/! ? $_ : "/usr/share/ldetect-lst/$_";
- _ "install -D $file $tmp_initrd$file";
- }
- foreach my $firm (glob_("all.kernels$I/$ext/firmware/*")) {
- my $dest=$firm;
- $dest =~ s|all.kernels$I/$ext/||;
- _ "cp -a $firm $tmp_initrd/$dest";
- }
-
- _ "install $stage1_root/init $tmp_initrd/";
- _ "install $stage1_root/stage1 $tmp_initrd/sbin/";
- foreach ('pppd', 'pppoe') {
- _ "install /usr/sbin/${_}-diet $tmp_initrd/sbin/$_";
- }
-
- if ($arch !~ /ppc|ia64/) {
- mkdir_p("$tmp_initrd/etc/pcmcia");
- _ "cp -a /etc/pcmcia/config.opts $tmp_initrd/etc/pcmcia";
- }
- {
- my $modz = "all.kernels$I/$ext";
- mkdir_p("$tmp_initrd/modules/$ext");
- __ "tar xC $tmp_initrd/modules/$ext -f $modz/${type}_modules.tar";
- _ "cp -f $modz/modules.$_ $tmp_initrd/modules/$ext" foreach qw(order builtin);
- substInFile { s,.*/,, } "$tmp_initrd/modules/$ext/modules.order";
- _ "depmod -b $tmp_initrd $ext";
- # depmod keeps only available modules in modules.alias, but we want them all
- _ "cp -f $modz/modules.alias $modz/modules.description $tmp_initrd/modules/$ext";
- }
- mkdir_p("$tmp_initrd/$_") foreach qw(dev proc sys var/tmp tmp/stage2);
- # ka deploy need some files in all.rdz
if ($ENV{DEBUGSTAGE1} || $ENV{BUILD_KA}) {
- symlink("/sbin", "$tmp_initrd/bin");
- cp_af("/bin/busybox.static", "$tmp_initrd/sbin/busybox");
- my @funct = map { /functions:/ .. /^$/ ? do { s/\s//g; split /,/ } : () } `busybox.static`;
- shift @funct;
- symlink('busybox', $tmp_initrd . "/sbin/$_") foreach @funct;
- }
- if ($ENV{BUILD_KA}) {
- mkdir_p("$tmp_initrd/ka");
- cp_af("/usr/bin/ka-d-client", "$tmp_initrd/ka/ka-d-client");
+ $modules="$modules busybox ";
}
+ $modules="$modules mgakadeploy " if ($ENV{BUILD_KA});
- _ "(cd $tmp_initrd; find . | cpio -o -c --quiet) | xz --check=crc32 --lzma2=dict=512KiB > $img";
- _ "rm -rf $tmp_initrd";
+ mkdir_p("build/dracut.conf.d");
+ # TODO if --nofscks and --no-hostonly are switched, dracut gives an error - fix or report upstream
+ __ "DRAKX_STAGE1_BINARY=$stage1_binary DRAKX_INIT_BINARY=$init_binary DRAKX_FAKE_MODULES='$fakedrivers' dracut --conf dracut.conf --confdir ./build/dracut.conf.d --add ' $modules ' --add-drivers ' $drivers ' '$img' '$kernel'";
+ chmod(0644, $img);
}
+
sub entries_append {
my ($type) = @_;
@@ -220,7 +180,7 @@ sub entries_append {
vgahi => "vga=791",
text => "text",
# patch => "patch $default_vga",
- rescue => "rescue",
+ rescue => "audit=0 rescue",
);
my @entries = (
(map { $_->[0] => "$automatic$default_acpi $_->[1]" } group_by2(@simple_entries)),
@@ -252,17 +212,17 @@ sub remove_ending_zero {
}
sub boot_img_i386 {
- my ($type, $I, $img, $kernel) = @_;
+ my ($type, $I, $img, $kernel, $vmlinuz) = @_;
_ "rm -rf $tmp_mnt"; mkdir $tmp_mnt;
- _ "cat $kernel > $tmp_mnt/vmlinuz";
+ _ "cat $vmlinuz > $tmp_mnt/vmlinuz";
output("$tmp_mnt/help.msg", syslinux_msg('help.msg.xml'));
output("$tmp_mnt/advanced.msg", syslinux_msg('advanced.msg.xml'));
(my $rdz = $img) =~ s/\.img/.rdz/;
(my $initrd_type = $type) =~ s/-changedisk//;
- initrd($initrd_type, $I, $rdz);
+ initrd($initrd_type, $I, $rdz, $kernel);
my $short_type = substr($type, 0, 8);
output("$tmp_mnt/syslinux.cfg",
@@ -287,7 +247,7 @@ sub boot_img_i386 {
sub boot_img_x86_64 { &boot_img_i386 }
sub boot_img_alpha {
- my ($type, $I, $img) = @_;
+ my ($type, $I, $img, $kernel, $_vmlinuz) = @_;
__ "$sudo umount $tmp_mnt 2>/dev/null";
_ "dd if=/dev/zero of=$img bs=1k count=1440";
@@ -295,7 +255,7 @@ sub boot_img_alpha {
_ "/sbin/e2writeboot $img /boot/bootlx";
_ "$sudo mount -t ext2 $img $tmp_mnt -o loop";
_ "cp -f vmlinux.gz $tmp_mnt";
- -f "$type.rdz" ? _ "cp -f $type.rdz $tmp_mnt" : initrd($type, $I, "$tmp_mnt/$type.rdz");
+ -f "$type.rdz" ? _ "cp -f $type.rdz $tmp_mnt" : initrd($type, $I, "$tmp_mnt/$type.rdz", $kernel);
mkdir "$tmp_mnt/etc", 0777;
output("$tmp_mnt/etc/aboot.conf",
@@ -307,14 +267,14 @@ sub boot_img_alpha {
}
sub boot_img_ia64 {
- my ($type, $_I, $img, $kernel) = @_;
+ my ($type, $_I, $img, $kernel, $vmlinuz) = @_;
my $rdz = $img; $rdz =~ s/\.img/.rdz/;
__ "$sudo umount $tmp_mnt 2>/dev/null";
_ "dd if=/dev/zero of=$img bs=1k count=16384";
_ "mkdosfs $img";
_ "$sudo mount -t vfat $img $tmp_mnt -o loop,umask=000";
- _ "$sudo cp -f $kernel $tmp_mnt/vmlinux";
+ _ "$sudo cp -f $vmlinuz $tmp_mnt/vmlinux";
_ "cp -f $rdz $tmp_mnt/$type.rdz";
_ "$sudo cp -f tools/ia64/elilo.efi $tmp_mnt";
output("$tmp_mnt/elilo.conf", qq(
@@ -338,7 +298,7 @@ image=vmlinux
}
sub boot_img_sparc {
- my ($type, $I, $_img) = @_;
+ my ($type, $I, $_img, $kernel, $_vmlinuz) = @_;
if ($type =~ /^live(.*)/) {
#- hack to produce directly into /export the needed file for cdrom boot.
my $dir = "/export";
@@ -347,7 +307,7 @@ sub boot_img_sparc {
_ "mkdir -p $dir/$boot";
_ "cp -f /boot/cd.b /boot/second.b $dir/$boot";
_ "cp -f vmlinux$1 $dir/$boot/vmlinux$1";
- -f "live$1.rdz" ? _ "cp -f live$1.rdz $dir/$boot" : initrd($type, $I, "$dir/$boot/live$1.rdz");
+ -f "live$1.rdz" ? _ "cp -f live$1.rdz $dir/$boot" : initrd($type, $I, "$dir/$boot/live$1.rdz", $kernel);
output("$dir/$boot/silo.conf", qq(
partition=1
@@ -427,7 +387,7 @@ To Build a Bootable CD-ROM, try:
my $setarch = $1 ? "sparc64" : "sparc32";
_ "mkdir -p $dir/$boot";
- -f "$type.rdz" or initrd($type, $I, "$type.rdz");
+ -f "$type.rdz" or initrd($type, $I, "$type.rdz", $kernel);
_ "cp -f vmlinux$1.aout $dir/$boot/$type.img";
_ "$setarch kernel$1/src/arch/sparc$1/boot/piggyback $dir/$boot/$type.img kernel$1/boot/System.map $type.rdz";
} elsif ($type =~ /^tftp(.*)/) {
@@ -443,7 +403,7 @@ To Build a Bootable CD-ROM, try:
_ "mkdir -p $dir";
_ "cp -f /boot/fd.b /boot/second.b $dir";
_ "cp -f vmlinuz$I $dir/vmlinux$I.gz";
- -f "$type.rdz" ? _ "cp -f $type.rdz $dir" : initrd($type, $I, "$dir/$type.rdz");
+ -f "$type.rdz" ? _ "cp -f $type.rdz $dir" : initrd($type, $I, "$dir/$type.rdz", $kernel);
output("$dir/boot.msg", "
Welcome to Mageia $ENV{DISTRIB_VERSION}
@@ -474,16 +434,16 @@ image=/vmlinux$I.gz
}
sub boot_img_ppc {
- my ($_type, $I, $_img, $_kernel) = @_;
+ my ($_type, $I, $_img, $kernel, $_vmlinuz) = @_;
foreach (glob("all.kernels/*")) {
my $ext = basename($_);
if ($ext =~ /legacy/) {
- initrd("all", $I, "images/all.rdz-$ext");
+ initrd("all", $I, "images/all.rdz-$ext", $kernel);
_ "mv images/all.rdz-$ext images/all.rdz-legacy";
_ "cp $_/vmlinuz images/vmlinux-legacy";
}
elsif ($ext =~ /2.6/) {
- initrd("all", $I, "images/all.rdz-$ext");
+ initrd("all", $I, "images/all.rdz-$ext", $kernel);
_ "mv images/all.rdz-$ext images/all.rdz";
_ "cp $_/vmlinuz images/vmlinux";
}
@@ -696,9 +656,9 @@ sub syslinux_all_files {
$default_vga =~ /788/ or die 'we rely on vga=788 for bootsplash';
each_index {
- mkdir "$dir/alt$::i", 0777;
+ mkdir "$dir/$arch", 0777;
_ "cp all.kernels/$_/vmlinuz $dir/$arch";
- initrd('all', '', "images/all.rdz-$_");
+ initrd('all', '', "images/all.rdz-$_", $_);
rename("images/all.rdz-$_", "$dir/$arch/all.rdz");
} @$kernels;
@@ -715,9 +675,15 @@ sub isolinux {
syslinux_all_files('isolinux', $kernels);
- _ "cp $isolinux_bin ../isolinux/isolinux.bin";
- _ "cp /usr/lib/syslinux/gfxboot.c32 ../isolinux/gfxboot.c32";
- output("../isolinux/isolinux.cfg", syslinux_cfg_all('cdrom', 1));
+ _ "cp $isolinux_bin isolinux/isolinux.bin";
+ _ "cp /usr/lib/syslinux/ifcpu.c32 isolinux/ifcpu.c32";
+ _ "cp /usr/lib/syslinux/ldlinux.c32 isolinux/ldlinux.c32";
+ _ "cp /usr/lib/syslinux/libcom32.c32 isolinux/libcom32.c32";
+ _ "cp /usr/lib/syslinux/libgpl.c32 isolinux/libgpl.c32";
+ _ "cp /usr/lib/syslinux/libmenu.c32 isolinux/libmenu.c32";
+ _ "cp /usr/lib/syslinux/libutil.c32 isolinux/libutil.c32";
+ _ "cp /usr/lib/syslinux/gfxboot.c32 isolinux/gfxboot.c32";
+ output("isolinux/isolinux.cfg", syslinux_cfg_all('cdrom', 1));
xbox_stage1() if arch() =~ /i.86/;
}
@@ -729,7 +695,7 @@ sub xbox_stage1() {
eval { rm_rf($dir) }; mkdir_p($dir);
_ "cp all.kernels/$xbox_kernel/vmlinuz $dir";
- initrd('all', '', "images/all.rdz-$xbox_kernel");
+ initrd('all', '', "images/all.rdz-$xbox_kernel", $xbox_kernel);
rename("images/all.rdz-$xbox_kernel", "$dir/initrd");
_ "cp /usr/share/cromwell/xromwell-installer.xbe $dir/default.xbe";
@@ -748,7 +714,13 @@ sub boot_iso {
output('.boot_iso/VERSION', VERSION($kernels));
# for the boot iso, use standard isolinux
- _ "cp /usr/lib/syslinux/isolinux.bin .boot_iso/isolinux/isolinux.bin";
+ _ "cp $isolinux_bin .boot_iso/isolinux/isolinux.bin";
+ _ "cp /usr/lib/syslinux/ifcpu.c32 .boot_iso/isolinux/ifcpu.c32";
+ _ "cp /usr/lib/syslinux/ldlinux.c32 .boot_iso/isolinux/ldlinux.c32";
+ _ "cp /usr/lib/syslinux/libcom32.c32 .boot_iso/isolinux/libcom32.c32";
+ _ "cp /usr/lib/syslinux/libgpl.c32 .boot_iso/isolinux/libgpl.c32";
+ _ "cp /usr/lib/syslinux/libmenu.c32 .boot_iso/isolinux/libmenu.c32";
+ _ "cp /usr/lib/syslinux/libutil.c32 .boot_iso/isolinux/libutil.c32";
my $with_gfxboot = 0;
_ "cp /usr/share/gfxboot/themes/Mageia/install/* .boot_iso/isolinux" if $with_gfxboot;
@@ -758,6 +730,10 @@ sub boot_iso {
output('.boot_iso/isolinux/isolinux.cfg', syslinux_cfg_all('', $with_gfxboot));
+ if ($ENV{BOOT_AUTOMATIC_METHOD}) {
+ _ "sed -i 's#\\(append .*\\)\\(splash quiet\\|rescue\\)\$#\\1\\2 automatic=$ENV{BOOT_AUTOMATIC_METHOD}#' .boot_iso/isolinux/isolinux.cfg"
+ }
+
_ "genisoimage -r -f -J -cache-inodes -V 'Mga Boot ISO' -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table -o $iso .boot_iso";
_ "isohybrid -o 1 $iso";
rm_rf('.boot_iso');
diff --git a/images/update_kernel b/images/update_kernel
index 934f5195e..a16513eac 100755
--- a/images/update_kernel
+++ b/images/update_kernel
@@ -15,18 +15,14 @@ use list_modules;
my $rpm = 'rpm --nosignature';
-@ARGV or die "usage: ./update_kernel [--move] (<kernel rpm> ... | <installed kernel name> ...)\n";
+@ARGV or die "usage: ./update_kernel <installed kernel name> ...\n";
eval { rm_rf('all.kernels') }; #- remove old things
mkdir 'all.kernels';
my @kernels = map {
my $kern_ver = rpm2version($_);
- if (/\.rpm$/) {
- extract_kernel($_, $kern_ver);
- } else {
extract_installed_rpm('', $kern_ver);
- }
$kern_ver;
} @ARGV;
@@ -41,40 +37,10 @@ sub rpm2version {
`$rpm $opt $kernel_rpm` =~ m!/boot/vmlinuz-(.*)! && $1 or die "can't find vmlinuz in $kernel_rpm (is it installed?)\n";
}
-sub extract_kernel {
- my ($kernel_rpm, $kern_ver) = @_;
-
- my $dir = "all.kernels/$kern_ver";
-
- warn "Extracting kernel $kern_ver\n";
-
- eval { rm_rf($dir) };
- mkdir_p("$dir/modules");
- sys("rpm2cpio $kernel_rpm | (cd $dir ; cpio -id)");
-
- extract_installed_rpm($dir, $kern_ver);
-
- eval { rm_rf("$dir$_") } foreach qw(/boot /lib /usr);
-}
-
sub extract_installed_rpm {
my ($installed_dir, $kern_ver) = @_;
my $local_dir = "all.kernels/$kern_ver";
- mkdir_p("$local_dir/modules");
+ mkdir_p("$local_dir");
sys('cp', "$installed_dir/boot/vmlinuz-$kern_ver", "$local_dir/vmlinuz");
- sys("cp $installed_dir/lib/modules/$kern_ver/modules.* $local_dir");
-
- open(my $F, "find $installed_dir/lib/modules/$kern_ver -name '*.ko.?z' |");
- my $file; while ($file = <$F>) {
- chomp($file);
- system('cp', $file, "$local_dir/modules/" . basename($file)) == 0
- or warn "conflict for $file\n";
- }
-
- sys('perl', '../kernel/modules.pl', 'remove_unneeded_modules', $kern_ver);
- sys('perl', '../kernel/modules.pl', 'get_firmwares', $kern_ver);
- sys('perl', '../kernel/modules.pl', 'make_modules_per_image', $kern_ver);
-
- rm_rf("$local_dir/modules");
}
diff --git a/kernel/list_modules.pm b/kernel/list_modules.pm
index c4ee7674d..63a382012 100644
--- a/kernel/list_modules.pm
+++ b/kernel/list_modules.pm
@@ -332,7 +332,8 @@ our %l = (
other => [
qw(defxx ide-floppy ide-tape loop lp nbd sg st),
qw(parport_pc parport_serial),
- qw(btaudio mmc_block),
+ qw(btaudio),
+ qw(mmc_block sdhci-acpi), # eMMC
'cryptoloop',
if_(arch() =~ /sparc/, 'openprom'),
diff --git a/kernel/modules.pl b/kernel/modules.pl
index b64c92fa2..70d6ed0bd 100644
--- a/kernel/modules.pl
+++ b/kernel/modules.pl
@@ -41,36 +41,33 @@ sub modules() {
@nls_modules, map { category2modules($_) } split(' ', $images_cat);
}
-sub get_firmwares() {
+sub list_needed_modules {
my ($kern_ver) = @_;
- foreach (all("all.kernels/$kern_ver/modules")) {
- foreach(`/sbin/modinfo -Ffirmware "all.kernels/$kern_ver/modules/$_"`) {
- mkdir_p(dirname("all.kernels/$kern_ver/firmware/$_"));
- eval { cp_af("/lib/firmware/$_", "all.kernels/$kern_ver/firmware/$_"); };
- }
- }
-}
-
-sub remove_unneeded_modules {
- my ($kern_ver) = @_;
-
- load_dependencies("all.kernels/$kern_ver/modules.dep");
+ load_dependencies("/lib/modules/$kern_ver/modules.dep");
my @all = modules();
my @all_with_deps = map { dependencies_closure($_) } @all;
- my %wanted_modules = map { (list_modules::modname2filename($_) . ".ko.xz" => 1) } @all_with_deps;
- foreach (all("all.kernels/$kern_ver/modules")) {
- $wanted_modules{$_} or unlink "all.kernels/$kern_ver/modules/$_";
+ my %wanted_modules = map { (list_modules::modname2filename($_) => 1) } @all_with_deps;
+ foreach (`find /lib/modules/$kern_ver -name '*.ko.?z'`) {
+ my $modfile = basename($_);
+ $modfile =~ s/\.ko\.xz//;
+ $wanted_modules{$modfile} and print "$modfile\n";
}
}
-sub make_modules_per_image {
+sub list_fake_modules {
my ($kern_ver) = @_;
- my $dir = "all.kernels/$kern_ver/modules";
+ load_dependencies("/lib/modules/$kern_ver/modules.dep");
- system("cd $dir ; tar cf ../all_modules.tar *.ko.*") == 0 or die "tar failed\n";
+ my @all = map { category2modules($_) } split(' ', 'multimedia/*');
+ my %wanted_modules = map { (list_modules::modname2filename($_) => 1) } @all;
+ foreach (`find /lib/modules/$kern_ver -name '*.ko.?z'`) {
+ my $modfile = basename($_);
+ $modfile =~ s/\.ko\.xz//;
+ $wanted_modules{$modfile} and print "$modfile\n";
+ }
}
sub get_main_modules() {
diff --git a/mdk-stage1/.gitignore b/mdk-stage1/.gitignore
new file mode 100644
index 000000000..fe2469cea
--- /dev/null
+++ b/mdk-stage1/.gitignore
@@ -0,0 +1,13 @@
+*.o
+dhcp-client
+init
+probe-modules
+rescue-gui
+stage1
+pci-resource/pci-ids.h
+usb-resource/usb-ids.h
+pcmcia-resource/pcmcia-ids.h
+pcmcia/lex_config.c
+pcmcia/libpcmcia.a
+pcmcia/yacc_config.c
+pcmcia/yacc_config.h
diff --git a/mdk-stage1/Makefile b/mdk-stage1/Makefile
index ddb5cfda1..1f47002f4 100644
--- a/mdk-stage1/Makefile
+++ b/mdk-stage1/Makefile
@@ -15,7 +15,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-VERSION=1.82
+VERSION=2.0
PRODUCT=drakx-installer-binaries
#
@@ -59,9 +59,7 @@ COMPILE = $(CC) $(DEFS) $(CFLAGS)
INIT_DEFS =
INITSRC = init.c
-ifneq (DIETLIBC, $(L))
INIT_DEFS += $(GLIBC_INCLUDES)
-endif
STAGE1_DEFS=-DDISABLE_KA
@@ -70,35 +68,19 @@ INITOBJS = $(subst .c,.o,$(INITSRC))
#- frontends
NEWT_FRONTEND_SRC = newt-frontend.c
-NEWT_FRONTEND_LIBS = libnewt.a libslang.a
+NEWT_FRONTEND_LIBS = -lnewt -lslang
STDIO_FRONTEND_SRC = stdio-frontend.c
STDIO_FRONTEND_LIBS =
-STDIO_FRONTEND_LIBS =
FRONTEND_OBJS = $(subst .c,.o,$($(F)_FRONTEND_SRC))
-ifeq (DIETLIBC, $(L))
-FRONTEND_LINK = $(FRONTEND_OBJS) $(patsubst %,/usr/lib/dietlibc/lib-$(ARCH)/%,$($(F)_FRONTEND_LIBS))
-else
FRONTEND_LINK = $(FRONTEND_OBJS) $($(F)_FRONTEND_LIBS)
-endif
-STAGE1_STATIC_LIBS =
-STAGE1_STATIC_USR_LIBS = libz.a libldetect.a libkmod.a libpci.a liblzma.a libsysfs.a
-STAGE1_OWN_LIBS =
-ifeq (DIETLIBC, $(L))
-STAGE1_OWN_LIBS = $(patsubst %,/usr/lib/dietlibc/lib-$(ARCH)/%,$(STAGE1_STATIC_USR_LIBS) $(STAGE1_STATIC_LIBS))
-else
-STAGE1_OWN_LIBS = $(patsubst %,/usr/$(LIB)/%,$(STAGE1_STATIC_USR_LIBS)) $(patsubst %,/$(LIB)/%,$(STAGE1_STATIC_LIBS))
-endif
+STAGE1_OWN_LIBS = -lz -lldetect -lkmod -lpci -llzma -lsysfs
-ifeq (DIETLIBC, $(L))
-STAGE1_NETWORK_LIBS = /usr/lib/dietlibc/lib-$(ARCH)/librpc.a
-else
-STAGE1_NETWORK_LIBS = /usr/$(LIB)/libresolv.a
-endif
+STAGE1_NETWORK_LIBS = -lresolv
#- stage1 itself
STAGE1SRC = stage1.c log.c utils.c params.c tools.c modules.c probing.c mount.c automatic.c frontend-common.c lomount.c thirdparty.c zlibsupport.c
@@ -158,16 +140,16 @@ dirs:
[ "$$n" = "." ] || make -C $$n || exit 1 ;\
done
-init: $(INITOBJS) $(STAGE1_LIBC)
- $(DIET) $(CC) $(LDFLAGS) -o $@ $^
+init: $(INITOBJS)
+ $(CC) $(LDFLAGS) -o $@ $^
$(STRIPCMD) $@
-stage1: $(STAGE1OBJS-FULL) $(STAGE1_OWN_LIBS) $(STAGE1_NETWORK_LIBS) $(FRONTEND_LINK) $(PCMCIA_LIB) $(STAGE1_LIBC)
- $(DIET) $(CC) $(LDFLAGS) -o $@ $^
+stage1: $(STAGE1OBJS-FULL) $(STAGE1_OWN_LIBS) $(STAGE1_NETWORK_LIBS) $(FRONTEND_LINK) $(PCMCIA_LIB)
+ $(CC) $(LDFLAGS) -o $@ $^
$(STRIPCMD) $@
-dhcp-client: $(STAGE1OBJS-NETWORK-STANDALONE) $(STAGE1_OWN_LIBS) $(STAGE1_NETWORK_LIBS) $(FRONTEND_LINK) $(STAGE1_LIBC)
- $(DIET) $(CC) $(LDFLAGS) -o $@ $^
+dhcp-client: $(STAGE1OBJS-NETWORK-STANDALONE) $(STAGE1_OWN_LIBS) $(STAGE1_NETWORK_LIBS) $(FRONTEND_LINK)
+ $(CC) $(LDFLAGS) -o $@ $^
$(STRIPCMD) $@
@@ -175,16 +157,16 @@ $(INITOBJS): %.o: %.c
$(COMPILE) $(INIT_DEFS) -c $<
$(STAGE1OBJS-NETWORK): %-NETWORK.o: %.c
- $(DIET) $(COMPILE) $(INCLUDES) $(NETWORK_DEFS) $(PCMCIA_DEFS) $(USB_DEFS_GEN) -DENABLE_ADDITIONAL_MODULES -c $< -o $@
+ $(COMPILE) $(INCLUDES) $(NETWORK_DEFS) $(PCMCIA_DEFS) $(USB_DEFS_GEN) -DENABLE_ADDITIONAL_MODULES -c $< -o $@
$(STAGE1OBJS-NETWORK-STANDALONE): %-NETWORK-STANDALONE.o: %.c
- $(DIET) $(COMPILE) $(INCLUDES) $(NETWORK_STANDALONE_DEFS) $(USB_DEFS_GEN) -c $< -o $@
+ $(COMPILE) $(INCLUDES) $(NETWORK_STANDALONE_DEFS) $(USB_DEFS_GEN) -c $< -o $@
$(STAGE1OBJS-FULL): %-FULL.o: %.c
- $(DIET) $(COMPILE) $(INCLUDES) -DSPAWN_SHELL $(USB_DEFS_GEN) $(PCMCIA_DEFS) $(STAGE1_DEFS) -c $< -o $@
+ $(COMPILE) $(INCLUDES) -DSPAWN_SHELL $(USB_DEFS_GEN) $(PCMCIA_DEFS) $(STAGE1_DEFS) -c $< -o $@
.c.o:
- $(DIET) $(COMPILE) $(INCLUDES) -c $<
+ $(COMPILE) $(INCLUDES) -c $<
clean: localclean
@@ -196,12 +178,12 @@ localclean:
rm -f *.o .depend *.rdz *.img $(BINS)
-rescue-gui: rescue-gui.o frontend-common.o params.o utils.o log.o automatic.o $(FRONTEND_LINK) $(STAGE1_LIBC)
- $(DIET) $(CC) $(LDFLAGS) -o $@ $^
+rescue-gui: rescue-gui.o frontend-common.o params.o utils.o log.o automatic.o $(FRONTEND_LINK)
+ $(CC) $(LDFLAGS) -o $@ $^
$(STRIPCMD) $@
-probe-modules: probe-modules.o probing-FULL.o modules-FULL.o params-FULL.o utils-FULL.o log-FULL.o automatic-FULL.o frontend-common-FULL.o stdio-frontend.o zlibsupport-FULL.o $(STAGE1_OWN_LIBS) $(PCMCIA_LIB) $(STAGE1_LIBC)
- $(DIET) $(CC) $(LDFLAGS) -o $@ $^
+probe-modules: probe-modules.o probing-FULL.o modules-FULL.o params-FULL.o utils-FULL.o log-FULL.o automatic-FULL.o frontend-common-FULL.o stdio-frontend.o zlibsupport-FULL.o $(STAGE1_OWN_LIBS) $(PCMCIA_LIB)
+ $(CC) $(LDFLAGS) -o $@ $^
$(STRIPCMD) $@
dist: tar
diff --git a/mdk-stage1/Makefile.common b/mdk-stage1/Makefile.common
index 34c010905..629d27619 100644
--- a/mdk-stage1/Makefile.common
+++ b/mdk-stage1/Makefile.common
@@ -27,21 +27,7 @@ else
F = NEWT
endif
-# diet libc syscalls are broken on mips
-ifneq (mips, $(ARCH))
-# diet libc eabi support is mostly broken
-ifneq (arm, $(ARCH))
-DIET = $(shell test -x /usr/bin/diet && echo diet)
-endif
-endif
-
-
-ifeq ($(DIET), diet)
- #- default lib is dietlibc (honoured by main Makefile whenever possible)
-L = DIETLIBC
-else
L = GLIBC
-endif
ifdef DEBUG
OPTFLAGS = -g -DDEBUG
@@ -58,15 +44,9 @@ CFLAGS += -Werror
endif
endif
-DIETLIBC_INCLUDES = -I/usr/lib/dietlibc/include -I.
-DIETLIBC_LIBC = /usr/lib/dietlibc/lib-$(ARCH)/libcompat.a
-GLIBC_INCLUDES = -I.
-INCLUDES = $($(L)_INCLUDES)
-
-GLIBC_LDFLAGS = -static
-LDFLAGS = $($(L)_LDFLAGS)
+INCLUDES = -I.
-STAGE1_LIBC = $($(L)_LIBC)
+LDFLAGS =
ifdef DEBUG
STRIPCMD = echo not stripping
diff --git a/mdk-stage1/NEWS b/mdk-stage1/NEWS
index ab6c848f7..fcb911d77 100644
--- a/mdk-stage1/NEWS
+++ b/mdk-stage1/NEWS
@@ -1,3 +1,16 @@
+- support dynamic linking only
+
+2.0
+- kernel modules and firmware is needed during stage2, so move and symlink
+ (symlinks are only for if you umount state2 /usr and want a still working initrd)
+ mga#11600 mga#11601
+
+1.83
+- do initrd symlinking in 'init' rather than 'stage1' (stage1 is now run earlier)
+- build init and stage1 as a shared library (due to bugs in directory handling
+ in dietlibc as exposed in libkmod but also because glibc is already include in
+ dracut)
+
1.82
- detect new kernel-3.12 modules
diff --git a/mdk-stage1/init.c b/mdk-stage1/init.c
index 3f912c2ac..7cec1076b 100644
--- a/mdk-stage1/init.c
+++ b/mdk-stage1/init.c
@@ -22,6 +22,7 @@
#include <stdlib.h>
#include <unistd.h>
#include <stdio.h>
+#include <dirent.h>
#include <string.h>
#include <sys/types.h>
#include <sys/socket.h>
@@ -56,7 +57,6 @@ static inline long reboot(unsigned int command)
#endif
-#define BINARY "/sbin/stage1"
#define BINARY_STAGE2 "/usr/bin/runinstall2"
@@ -378,7 +378,86 @@ int in_reboot(void)
return 0;
}
-int exit_value_proceed = 66;
+int recursive_remove(char *file);
+int recursive_remove(char *file)
+{
+ struct stat sb;
+
+ if (lstat(file, &sb) != 0) {
+ printf("failed to stat %s: %d\n", file, errno);
+ return -1;
+ }
+
+ /* only descend into subdirectories if device is same as dir */
+ if (S_ISDIR(sb.st_mode)) {
+ char * strBuf = alloca(strlen(file) + 1024);
+ DIR * dir;
+ struct dirent * d;
+
+ if (!(dir = opendir(file))) {
+ printf("error opening %s: %d\n", file, errno);
+ return -1;
+ }
+ while ((d = readdir(dir))) {
+ if (!strcmp(d->d_name, ".") || !strcmp(d->d_name, ".."))
+ continue;
+
+ strcpy(strBuf, file);
+ strcat(strBuf, "/");
+ strcat(strBuf, d->d_name);
+
+ if (recursive_remove(strBuf) != 0) {
+ closedir(dir);
+ return -1;
+ }
+ }
+ closedir(dir);
+
+ if (rmdir(file)) {
+ printf("failed to rmdir %s: %d\n", file, errno);
+ return -1;
+ }
+ } else {
+ if (unlink(file) != 0) {
+ printf("failed to remove %s: %d\n", file, errno);
+ return -1;
+ }
+ }
+ return 0;
+}
+
+
+int create_initial_fs_symlinks(char* symlinks)
+{
+ FILE *f;
+ char buf[5000];
+
+ if (!(f = fopen(symlinks, "rb"))) {
+ printf("Error opening symlink definitions file '%s'\n", symlinks);
+ return -1;
+ }
+ while (fgets(buf, sizeof(buf), f)) {
+ char oldpath[500], newpath[500];
+ struct stat sb;
+
+ buf[strlen(buf)-1] = '\0'; // trim \n
+ if (sscanf(buf, "%s %s", oldpath, newpath) != 2) {
+ sprintf(oldpath, "%s%s", STAGE2_LOCATION, buf);
+ sprintf(newpath, "%s", buf);
+ }
+ if (lstat(newpath, &sb) == 0)
+ recursive_remove(newpath);
+ printf("Creating symlink %s -> %s\n", oldpath, newpath);
+ if (symlink(oldpath, newpath)) {
+ printf("Error creating symlink\n");
+ return -1;
+ }
+ }
+ fclose(f);
+ return 0;
+}
+
+
int exit_value_restart = 0x35;
int main(int argc, char **argv)
@@ -386,7 +465,6 @@ int main(int argc, char **argv)
pid_t installpid, childpid;
int wait_status;
int fd;
- int counter = 0;
int abnormal_termination = 0;
if (argc > 1 && argv[1][0] >= '0' && argv[1][0] <= '9') {
@@ -404,24 +482,6 @@ int main(int argc, char **argv)
printf("*** TESTING MODE *** (pid is %d)\n", getpid());
- if (!testing) {
- if (mount("/proc", "/proc", "proc", 0, NULL))
- fatal_error("Unable to mount proc filesystem");
- if (mount("none", "/sys", "sysfs", 0, NULL))
- fatal_error("Unable to mount sysfs filesystem");
- if (mount("none", "/sys/kernel/debug", "debugfs", MS_NOSUID, "mode=0755"))
- fatal_error("Unable to mount debugfs filesystem");
- if (mount("none", "/dev", "devtmpfs", 0, NULL))
- fatal_error("Unable to mount dev filesystem");
- mkdir("/dev/pts", 0755);
- if (mount("/dev/pts", "/dev/pts", "devpts", MS_NOSUID|MS_NOEXEC, "gid=5,mode=0620"))
- fatal_error("Unable to mount /dev/pts devpts filesystem");
- mkdir("/dev/shm", 0755);
- if (mount("/dev/shm", "/dev/shm", "tmpfs", MS_NOSUID|MS_NODEV, "mode=1777"))
- fatal_error("Unable to mount /dev/shm tmpfs filesystem");
- }
-
-
/* ignore Control-C and keyboard stop signals */
signal(SIGINT, SIG_IGN);
signal(SIGTSTP, SIG_IGN);
@@ -454,57 +514,66 @@ int main(int argc, char **argv)
if (!testing)
doklog();
- /* Go into normal init mode - keep going, and then do a orderly shutdown
- when:
+ if (create_initial_fs_symlinks(STAGE2_LOCATION "/usr/share/symlinks") != 0)
+ fatal_error("Fatal error finishing initialization (could not create symlinks).");
- 1) install exits
- 2) we receive a SIGHUP
- */
+ /* kernel modules and firmware is needed by stage2, so move them to the root */
+ if (rename("/usr/lib/modules", "/modules"))
+ fatal_error("Cannot rename modules folder");
- do {
- if (counter == 1) {
- printf("proceeding, please wait...\n");
- }
+ if (rename("/usr/lib/firmware", "/firmware"))
+ fatal_error("Cannot rename firmware folder");
- if (!(installpid = fork())) {
- /* child */
- char * child_argv[2];
- child_argv[0] = counter == 0 ? BINARY : BINARY_STAGE2;
- child_argv[1] = NULL;
+ /* Add some symlinks so stage1 is still valid on it's own - not strictly needed */
+ if (symlink("/modules", "/usr/lib/modules"))
+ fatal_error("Cannot symlink modules folder");
- execve(child_argv[0], child_argv, env);
- printf("error in exec of %s :-( [%d]\n", child_argv[0], errno);
- return 0;
- }
+ if (symlink("/firmware", "/usr/lib/firmware"))
+ fatal_error("Cannot symlink firmware folder");
- do {
- childpid = wait4(-1, &wait_status, 0, NULL);
- } while (childpid != installpid);
+ if (mount(STAGE2_LOCATION "/usr", "/usr", "none", MS_BIND|MS_RDONLY, NULL))
+ fatal_error("Unable to bind mount /usr filesystem from rescue or installer stage2");
- counter++;
- } while (WIFEXITED(wait_status) && WEXITSTATUS(wait_status) == exit_value_restart);
- /* allow Ctrl Alt Del to reboot */
- reboot(LINUX_REBOOT_CMD_CAD_ON);
+ if (access("/run/drakx/run-init", R_OK) == 0) {
+ /* This is typically used in rescue mode */
+ char * child_argv[2] = { "/sbin/init", NULL };
- if (in_reboot()) {
- // any exitcode is valid if we're in_reboot
- } else if (WIFEXITED(wait_status) && WEXITSTATUS(wait_status) == exit_value_proceed) {
kill(klog_pid, 9);
printf("proceeding, please wait...\n");
+ execve(child_argv[0], child_argv, env);
+ fatal_error("failed to exec /sbin/init");
+ }
+
+ /* This is installer mode */
+ do {
+ printf("proceeding, please wait...\n");
- {
- char * child_argv[2] = { "/sbin/init", NULL };
+ if (!(installpid = fork())) {
+ /* child */
+ char * child_argv[2] = { BINARY_STAGE2, NULL };
execve(child_argv[0], child_argv, env);
+ printf("error in exec of %s :-( [%d]\n", child_argv[0], errno);
+ return 0;
}
- fatal_error("failed to exec /sbin/init");
- } else if (!WIFEXITED(wait_status) || WEXITSTATUS(wait_status) != 0) {
+
+ do {
+ childpid = wait4(-1, &wait_status, 0, NULL);
+ } while (childpid != installpid);
+ } while (WIFEXITED(wait_status) && WEXITSTATUS(wait_status) == exit_value_restart);
+
+ /* allow Ctrl Alt Del to reboot */
+ reboot(LINUX_REBOOT_CMD_CAD_ON);
+
+ if (in_reboot()) {
+ // any exitcode is valid if we're in_reboot
+ } else if (!WIFEXITED(wait_status) || WEXITSTATUS(wait_status) != 0) {
printf("exited abnormally :-( ");
if (WIFSIGNALED(wait_status))
printf("-- received signal %d", WTERMSIG(wait_status));
printf("\n");
abnormal_termination = 1;
- }
+ }
if (!abnormal_termination) {
int i;
diff --git a/mdk-stage1/ka.c b/mdk-stage1/ka.c
index 670abe5af..7b9d98fbe 100644
--- a/mdk-stage1/ka.c
+++ b/mdk-stage1/ka.c
@@ -44,7 +44,7 @@ static void my_pause(void) {
static enum return_type ka_wait_for_stage2(int count)
{
char * ramdisk = "/dev/ram3"; /* warning, verify that this file exists in the initrd*/
- char * ka_launch[] = { "/ka/ka-d-client", "-w","-s","getstage2","-e","(cd /tmp/stage2; tar -x -f - )", NULL }; /* The command line for ka_launch */
+ char * ka_launch[] = { "/ka/ka-d-client", "-w","-s","getstage2","-e","(cd " STAGE2_LOCATION "; tar -x -f - )", NULL }; /* The command line for ka_launch */
char * mkfs_launch[] = { "/sbin/mke2fs", "-m", "0", ramdisk, NULL}; /* The mkfs command for formating the ramdisk */
log_message("KA: Preparing to receive stage 2....");
diff --git a/mdk-stage1/probing.c b/mdk-stage1/probing.c
index 1cdadd591..61a605651 100644
--- a/mdk-stage1/probing.c
+++ b/mdk-stage1/probing.c
@@ -111,7 +111,7 @@ void net_discovered_interface(char * intf_name)
}
if (!intf_name) {
if (net_intf_too_early_ptr >= net_intf_too_early_number) {
- log_message("NET: was expecting another network interface (broken net module?)");
+ log_message("NET: was expecting another network interface (broken net module?) [%d >= %d]", net_intf_too_early_ptr, net_intf_too_early_number);
return;
}
net_descriptions[net_descr_number].intf_name = net_intf_too_early_name[net_intf_too_early_ptr++];
@@ -283,6 +283,7 @@ void discovered_device(enum driver_type type, const char * description, const ch
#endif
#ifndef DISABLE_NETWORK
if (type == NETWORK_DEVICES) {
+ log_message("NET: Loading driver for network device %s", description);
wait_message("Loading driver for network device:\n \n%s", description);
prepare_intf_descr(description);
failed = my_modprobe(driver, NETWORK_DEVICES, NULL);
diff --git a/mdk-stage1/stage1.c b/mdk-stage1/stage1.c
index 4bed00057..94bb1e0df 100644
--- a/mdk-stage1/stage1.c
+++ b/mdk-stage1/stage1.c
@@ -121,7 +121,7 @@ static pid_t shell_pid = 0;
static void spawn_shell(void)
{
int fd;
- char * shell_name[] = { "/sbin/sh", NULL };
+ char * shell_name[] = { "/bin/sh", NULL };
log_message("spawning a shell");
@@ -344,39 +344,8 @@ static void method_select_and_prepare(void)
}
#endif
-static enum return_type create_initial_fs_symlinks(char* symlinks)
-{
- FILE *f;
- char buf[5000];
-
- if (scall(!(f = fopen(symlinks, "rb")), "fopen"))
- return RETURN_ERROR;
- while (fgets(buf, sizeof(buf), f)) {
- char oldpath[500], newpath[500];
- buf[strlen(buf)-1] = '\0'; // trim \n
- if (sscanf(buf, "%s %s", oldpath, newpath) != 2) {
- sprintf(oldpath, "%s%s", STAGE2_LOCATION, buf);
- sprintf(newpath, "%s", buf);
- }
- recursiveRemove_if_it_exists(newpath);
- log_message("creating symlink %s -> %s", oldpath, newpath);
- if (scall(symlink(oldpath, newpath), "symlink"))
- return RETURN_ERROR;
- }
- fclose(f);
- return RETURN_OK;
-}
-
void finish_preparing(void)
{
- recursiveRemove("/init");
-
- if (create_initial_fs_symlinks(STAGE2_LOCATION "/usr/share/symlinks") != RETURN_OK)
- stg1_fatal_message("Fatal error finishing initialization.");
-
- /* /tmp/syslog is used by the second init, so it must be copied now, not in stage2 */
- /* we remove it to ensure the old one is not copied over it in stage2 */
-
#ifdef SPAWN_SHELL
if (shell_pid != 0) {
int fd;
@@ -468,7 +437,7 @@ int main(int argc __attribute__ ((unused)), char **argv __attribute__ ((unused))
if (IS_RESCUE)
return 66; /* ask init to exec new init */
- else
- return 0x35; /* ask init to run stage2 binary */
+
+ return 0;
#endif
}
diff --git a/mdk-stage1/tools.c b/mdk-stage1/tools.c
index aca40c971..78108d6a9 100644
--- a/mdk-stage1/tools.c
+++ b/mdk-stage1/tools.c
@@ -148,65 +148,6 @@ enum return_type copy_file(char * from, char * to, void (*callback_func)(int ove
}
}
-enum return_type recursiveRemove(char *file)
-{
- struct stat sb;
-
- if (lstat(file, &sb) != 0) {
- log_message("failed to stat %s: %d", file, errno);
- return RETURN_ERROR;
- }
-
- /* only descend into subdirectories if device is same as dir */
- if (S_ISDIR(sb.st_mode)) {
- char * strBuf = alloca(strlen(file) + 1024);
- DIR * dir;
- struct dirent * d;
-
- if (!(dir = opendir(file))) {
- log_message("error opening %s: %d", file, errno);
- return RETURN_ERROR;
- }
- while ((d = readdir(dir))) {
- if (!strcmp(d->d_name, ".") || !strcmp(d->d_name, ".."))
- continue;
-
- strcpy(strBuf, file);
- strcat(strBuf, "/");
- strcat(strBuf, d->d_name);
-
- if (recursiveRemove(strBuf) != 0) {
- closedir(dir);
- return RETURN_ERROR;
- }
- }
- closedir(dir);
-
- if (rmdir(file)) {
- log_message("failed to rmdir %s: %d", file, errno);
- return RETURN_ERROR;
- }
- } else {
- if (unlink(file) != 0) {
- log_message("failed to remove %s: %d", file, errno);
- return RETURN_ERROR;
- }
- }
- return RETURN_OK;
-}
-
-enum return_type recursiveRemove_if_it_exists(char *file)
-{
- struct stat sb;
-
- if (lstat(file, &sb) != 0) {
- /* if file doesn't exist, simply return OK */
- return RETURN_OK;
- }
-
- return recursiveRemove(file);
-}
-
enum return_type mount_compressed_image(char *compressed_image, char *location_mount)
{
if (lomount(compressed_image, location_mount, NULL, 1)) {
diff --git a/mdk-stage1/tools.h b/mdk-stage1/tools.h
index 1b08e42ca..87c0c1d49 100644
--- a/mdk-stage1/tools.h
+++ b/mdk-stage1/tools.h
@@ -29,8 +29,6 @@ int image_has_stage2();
enum return_type create_IMAGE_LOCATION(char *location_full);
int ramdisk_possible(void);
enum return_type copy_file(char * from, char * to, void (*callback_func)(int overall));
-enum return_type recursiveRemove(char *file);
-enum return_type recursiveRemove_if_it_exists(char *file);
enum return_type preload_mount_compressed_fd(int compressed_fd, int image_size, char *image_name, char *location_mount);
enum return_type mount_compressed_image(char *compressed_image, char *location_mount);
enum return_type mount_compressed_image_may_preload(char *image_name, char *location_mount, int preload);
diff --git a/mdk-stage1/utils.c b/mdk-stage1/utils.c
index af5ee9af3..d861877e4 100644
--- a/mdk-stage1/utils.c
+++ b/mdk-stage1/utils.c
@@ -162,14 +162,6 @@ char * asprintf_(const char *msg, ...)
return strdup("");
}
-int scall_(int retval, char * msg, char * file, int line)
-{
- char tmp[5000];
- sprintf(tmp, "%s(%s:%d) failed", msg, file, line);
- if (retval)
- log_perror(tmp);
- return retval;
-}
void lowercase(char *s)
{
diff --git a/mdk-stage1/utils.h b/mdk-stage1/utils.h
index d42c52d06..b8a77b0ad 100644
--- a/mdk-stage1/utils.h
+++ b/mdk-stage1/utils.h
@@ -27,9 +27,7 @@ void add_to_env(char * name, char * value);
char ** list_directory(char * direct);
int string_array_length(char ** a);
char * asprintf_(const char *msg, ...);
-int scall_(int retval, char * msg, char * file, int line);
char *my_dirname(char *path);
-#define scall(retval, msg) scall_(retval, msg, __FILE__, __LINE__)
void lowercase(char *s);
#define ptr_begins_static_str(pointer,static_str) (!strncmp(pointer,static_str,sizeof(static_str)-1))
diff --git a/perl-install/.perl_checker b/perl-install/.perl_checker
index 2f8eb3a6c..2a0d70d41 100644
--- a/perl-install/.perl_checker
+++ b/perl-install/.perl_checker
@@ -22,6 +22,7 @@ Gtk2::Gdk::Keysyms
Gtk2::Helper
Gtk2::Pango
Gtk2::SimpleList
+Gtk3
I18N::Langinfo
IO::Handle
IO::Select
diff --git a/perl-install/Makefile.config b/perl-install/Makefile.config
index d4823ff04..308d6ad27 100644
--- a/perl-install/Makefile.config
+++ b/perl-install/Makefile.config
@@ -1,5 +1,5 @@
# -*- Makefile -*-
-VERSION:=15.68.1
+VERSION:=16.17
SUDO = sudo
TMPDIR = /tmp
@@ -14,7 +14,7 @@ STANDALONEPMS_ = adduserdrake bootloader-config display_help display_installer_h
STANDALONEPMS = $(STANDALONEPMS_:%=standalone/%)
ALLPMS = $(PMS) $(STANDALONEPMS)
PERL = perl
-LOCALFILES = $(patsubst %, ../tools/%,serial_probe/serial_probe xhost+)
+LOCALFILES = $(patsubst %, ../tools/%,serial_probe/serial_probe)
DIRS = c resize_fat #po
CFLAGS = -Wall
override CFLAGS += -pipe
diff --git a/perl-install/Makefile.drakxtools b/perl-install/Makefile.drakxtools
index 54f43e4cb..1ef2bf6d1 100644
--- a/perl-install/Makefile.drakxtools
+++ b/perl-install/Makefile.drakxtools
@@ -56,6 +56,7 @@ install:
for i in $(PMS_DIRS); do install -d $(LIBDEST)/$$i ; install -m 644 $$i/*.pm $(LIBDEST)/$$i/;done
install -m 644 pixmaps/*.* $(PIXDIR)
install -m 644 share/*.rc $(DATADIR)/$(NAME)
+ install -m 644 share/*.css $(DATADIR)/$(NAME)
install -d $(PREFIX)/etc/security
echo 'RESTRICT=yes' > $(PREFIX)/etc/security/fileshare.conf
diff --git a/perl-install/NEWS b/perl-install/NEWS
index f733849a8..fee6909ff 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,127 @@
+- draksec:
+ o use expanders for clarity
+
+Version 16.17 - 20 December 2013
+
+- drakfont:
+ o fix a crash (mga#12057)
+
+Version 16.16 - 16 December 2013
+
+- fix a drakx crash (mga#6031)
+
+Version 16.15 - 12 December 2013
+
+- workaround a gtk+3 issue resulting in blacked embbeded tools with some
+ locales (eg: pl/uk) (mga#11969)
+
+Version 16.13 - 10 December 2013
+
+- localedrake:
+ o fix crash when selecting an input method (mga#11939)
+
+Version 16.12 - 9 December 2013
+
+- partitioning wizard:
+ o log failures (mga#11924)
+ o workaround a crash (mga#11924)
+
+Version 16.11 - 6 December 2013
+
+- fix a crash in rpmdrake when package list is empty (mga#11901)
+
+Version 16.8 - 5 December 2013
+
+- prevent drakxtools-backend to require Glib::Object::Introspection (mga#11842)
+
+Version 16.7 - 5 December 2013
+
+- diskdrake:
+ o fix a crash when creating partitions (mga#11876)
+
+Version 16.6 - 4 December 2013
+
+- fix blue background behind left panel text (mga#11866)
+ (for not yet released gtk3 mcc)
+
+Version 16.5 - 3 December 2013
+
+- diskdrake:
+ o detect eMMc block devices (Luc Menut, mga#11812)
+ o fix a crash in partitioning wizard (mga#11820)
+ o show labels on partition buttons again but ellipsized (mga#11858)
+
+Version 16.4 - 2 December 2013
+
+- fix banners not being blue anymore with Oxygen-gtk theme (kbo#328270)
+- diskdrake:
+ o fix diskdrake colorized partition tabs with Adwaita (bgo#719624)
+
+Version 16.3 - 30 November 2013
+
+- harddrake:
+ o fix starting after draksound drop OSS/ALSA switch
+
+Version 16.2 - 29 November 2013
+
+- diskdrake:
+ o fix dialog keeping growing when switching tabs (mga#11822):
+ move partition labels to toolips
+- draksound:
+ o do not offer to switch to OSS
+ o do not offer to switch to another driver if there's none
+ o do not offer to pick a random driver when we've a default one
+- finish-install:
+ o no more run urpmi.update when adding media
+ (uneeded with urpmi-7.27+)
+- mygtk3 layer:
+ o add support for RadioMenuItems for rpmdrake
+- ugtk3 layer:
+ o make shrinking window work again (eg: draknfs)
+
+Version 16.1 - 28 November 2013
+
+- mcc:
+ o restore galaxy RC file, thus fixing left panel text color (mga#11773)
+ o fix Gtk2 banners' text position (mga#11778)
+- Banners:
+ o align text to left instead of centering it
+ o text is rendered as blue again
+- diskdrake:
+ o prevent looping forever when sizing partition tabs
+- logdrake:
+ o fix Gtk3::TextView::get_window() passed too few parameters (mga#11807)
+
+Version 16.0 - 23 November 2013
+
+- switch from Gtk+-2 to Gtk+-3:
+ o Banners: most themes work OK but Oxygen-gtk3...
+ o diskdrake: most themes work OK but Oxygen-gtk3...
+ o drakclock cannot temporary changes the clock
+ o notifications work again for net_applet
+- detect_devices:
+ fix ids to be numeric
+- drakxservices:
+ o simplify: just use tooltips for service descriptions"
+- drakclock:
+ o assume chrony rather than ntp when neither is installed
+- draksec:
+ o make sure to restart polkitd after writing rules
+ o support polkit rules editing for permissions overrides
+
+Version 15.73.1 - 19 November 2013
+
+- add chrony support to drakclock mga#11092
+
+Version 15.73 - 12 November 2013
+
+- polkit: fix wrappers to properly escape arguments when calling the binary
+
+Version 15.72 - 9 November 2013
+
+- dont remove radeon-firmware or any network related firmwares as we dont
+ know when some hw gets plugged that needs it
+
Version 15.68 - 14 October 2013
- fix path to urpmi.update (so it works without mgaonline installed mga#11125)
diff --git a/perl-install/any.pm b/perl-install/any.pm
index 27bae9ac1..3e90bc32f 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -663,7 +663,6 @@ sub get_autologin() {
my %desktop_to_dm = (
GNOME => 'gdm',
KDE4 => 'kdm',
- xfce4 => 'gdm',
LXDE => 'lxdm',
);
my %dm_canonical = (
@@ -947,18 +946,25 @@ sub sessions_with_order() {
sub urpmi_add_all_media {
my ($in, $o_previous_release) = @_;
- my $binary = find { whereis_binary($_, $::prefix) } if_(check_for_xserver(), 'gurpmi.addmedia'), 'urpmi.addmedia' or return;
+ my $binary = find { whereis_binary($_, $::prefix) } if_(check_for_xserver(), 'gurpmi.addmedia'), 'urpmi.addmedia';
+ if (!$binary) {
+ log::l("urpmi.addmedia not found!");
+ return;
+ }
#- configure urpmi media if network is up
require network::tools;
- return if !network::tools::has_network_connection();
+ if (!network::tools::has_network_connection()) {
+ log::l("no network connexion!");
+ return;
+ }
my $wait;
my @options = ('--distrib', '--mirrorlist', '$MIRRORLIST');
if ($binary eq 'urpmi.addmedia') {
$wait = $in->wait_message(N("Please wait"), N("Please wait, adding media..."));
} elsif ($in->isa('interactive::gtk')) {
push @options, '--silent-success';
- mygtk2::flush();
+ mygtk3::flush();
}
my $reason = join(',', $o_previous_release ?
@@ -970,18 +976,6 @@ sub urpmi_add_all_media {
my $log_file = '/root/drakx/updates.log';
my $val = run_program::rooted($::prefix, $binary, '>>', $log_file, '2>>', $log_file, @options);
- if ($val) {
- #- enable Nonfree/Tainted repositories if a package having a matching name is installed
- #- FIXME: this only works for Nonfree for now thanks to kernel-firmware-nonfree
- #- for Tainted to work and for better Nonfree support, we should search in package releases as well
- foreach my $media (qw(Nonfree Tainted)) {
- $in->do_pkgs->are_installed("*" . lc($media) . "*") or next;
- foreach my $type (qw(Release Updates)) {
- run_program::rooted($::prefix, '/usr/libexec/urpmi.update', '--no-ignore', "$media $type");
- }
- }
- }
-
undef $wait;
$val;
}
@@ -1021,27 +1015,27 @@ sub display_release_notes {
return;
}
- require Gtk2::WebKit;
- require ugtk2;
- ugtk2->import(':all');
- require mygtk2;
- mygtk2->import('gtknew');
+ require Gtk3::WebKit;
+ require ugtk3;
+ ugtk3->import(':all');
+ require mygtk3;
+ mygtk3->import('gtknew');
my $view = gtknew('WebKit_View', no_popup_menu => 1);
$view->load_html_string($release_notes, '/');
- my $w = ugtk2->new(N("Release Notes"), transient => $::main_window, modal => 1, pop_it => 1);
+ my $w = ugtk3->new(N("Release Notes"), transient => $::main_window, modal => 1, pop_it => 1);
gtkadd($w->{rwindow},
- gtkpack_(Gtk2::VBox->new,
- 1, create_scrolled_window(ugtk2::gtkset_border_width($view, 5),
+ gtkpack_(Gtk3::VBox->new,
+ 1, create_scrolled_window(ugtk3::gtkset_border_width($view, 5),
[ 'never', 'automatic' ],
),
0, gtkpack(create_hbox('end'),
gtknew('Button', text => N("Close"),
- clicked => sub { Gtk2->main_quit })
+ clicked => sub { Gtk3->main_quit })
),
),
);
- mygtk2::set_main_window_size($w->{rwindow});
+ mygtk3::set_main_window_size($w->{rwindow});
$w->{real_window}->grab_focus;
$w->{real_window}->show_all;
$w->main;
@@ -1072,7 +1066,7 @@ sub get_release_notes {
sub run_display_release_notes {
my ($release_notes) = @_;
output('/tmp/release_notes.html', $release_notes);
- system('/usr/bin/display_release_notes.pl');
+ run_program::raw({ detach => 1 }, '/usr/bin/display_release_notes.pl');
}
sub acceptLicense {
@@ -1195,7 +1189,7 @@ sub selectLanguage_standalone {
]);
$locale->{utf8} = !$non_utf8;
lang::set($locale);
- Gtk2->set_locale if $in->isa('interactive::gtk');
+ c::init_setlocale() if $in->isa('interactive::gtk');
lang::lang_changed($locale) if $old_lang ne $locale->{lang};
}
diff --git a/perl-install/c/stuff.xs.pl b/perl-install/c/stuff.xs.pl
index de4800529..7ef772975 100755
--- a/perl-install/c/stuff.xs.pl
+++ b/perl-install/c/stuff.xs.pl
@@ -97,14 +97,14 @@ void log_perror(const char *msg) {
HV* common_pciusb_hash_init(struct pciusb_entry *e) {
HV *rh = (HV *)sv_2mortal((SV *)newHV());
- hv_store(rh, "vendor", 6, newSVnv(e->vendor), 0);
- hv_store(rh, "subvendor", 9, newSVnv(e->subvendor), 0);
- hv_store(rh, "id", 2, newSVnv(e->device), 0);
- hv_store(rh, "subid", 5, newSVnv(e->subdevice), 0);
+ hv_store(rh, "vendor", 6, newSViv(e->vendor), 0);
+ hv_store(rh, "subvendor", 9, newSViv(e->subvendor), 0);
+ hv_store(rh, "id", 2, newSViv(e->device), 0);
+ hv_store(rh, "subid", 5, newSViv(e->subdevice), 0);
hv_store(rh, "driver", 6, newSVpv(e->module ? e->module : "unknown", 0), 0);
hv_store(rh, "description", 11, newSVpv(e->text, 0), 0);
- hv_store(rh, "pci_bus", 7, newSVnv(e->pci_bus), 0);
- hv_store(rh, "pci_device", 10, newSVnv(e->pci_device), 0);
+ hv_store(rh, "pci_bus", 7, newSViv(e->pci_bus), 0);
+ hv_store(rh, "pci_device", 10, newSViv(e->pci_device), 0);
return rh;
}
@@ -281,10 +281,10 @@ pci_probe()
for (i = 0; i < entries.nb; i++) {
struct pciusb_entry *e = &entries.entries[i];
HV * rh = common_pciusb_hash_init(e);
- hv_store(rh, "pci_domain", 10, newSVnv(e->pci_domain), 0);
- hv_store(rh, "pci_function", 12, newSVnv(e->pci_function), 0);
- hv_store(rh, "pci_revision", 12, newSVnv(e->pci_revision), 0);
- hv_store(rh, "is_pciexpress", 13, newSVnv(e->is_pciexpress), 0);
+ hv_store(rh, "pci_domain", 10, newSViv(e->pci_domain), 0);
+ hv_store(rh, "pci_function", 12, newSViv(e->pci_function), 0);
+ hv_store(rh, "pci_revision", 12, newSViv(e->pci_revision), 0);
+ hv_store(rh, "is_pciexpress", 13, newSViv(e->is_pciexpress), 0);
hv_store(rh, "nice_media_type", 15, newSVpv(e->class, 0), 0);
hv_store(rh, "media_type", 10, newSVpv(pci_class2text(e->class_id), 0), 0);
PUSHs(newRV((SV *)rh));
@@ -304,7 +304,7 @@ usb_probe()
struct usb_class_text class_text = usb_class2text(e->class_id);
snprintf(buf, sizeof(buf), "%s|%s|%s", class_text.usb_class_text, class_text.usb_sub_text, class_text.usb_prot_text);
HV * rh = common_pciusb_hash_init(e);
- hv_store(rh, "usb_port", 8, newSVnv(e->usb_port), 0);
+ hv_store(rh, "usb_port", 8, newSViv(e->usb_port), 0);
hv_store(rh, "media_type", 10, newSVpv(buf, 0), 0);
PUSHs(newRV((SV *)rh));
}
diff --git a/perl-install/common.pm b/perl-install/common.pm
index adee703b0..f0dcacff3 100644
--- a/perl-install/common.pm
+++ b/perl-install/common.pm
@@ -69,7 +69,7 @@ sub remove_translate_context {
sub translate {
my $s = translate_real(@_);
- $::one_message_has_been_translated ||= join(':', (caller(1))[1,2]); #- see mygtk2.pm
+ $::one_message_has_been_translated ||= join(':', (caller(1))[1,2]); #- see mygtk3.pm
remove_translate_context($s);
}
@@ -84,7 +84,7 @@ sub to_utf8 {
$str;
}
-#- This is needed because text printed by Gtk2 will always be encoded
+#- This is needed because text printed by Gtk3 will always be encoded
#- in UTF-8;
#- we first check if LC_ALL is defined, because if it is, changing
#- only LC_COLLATE will have no effect.
diff --git a/perl-install/dbus_object.pm b/perl-install/dbus_object.pm
index dc9df0d54..5c59de7e0 100644
--- a/perl-install/dbus_object.pm
+++ b/perl-install/dbus_object.pm
@@ -44,20 +44,20 @@ sub safe_call_method {
@ret;
}
-sub set_gtk2_watch {
+sub set_gtk3_watch {
my ($o) = @_;
- set_gtk2_watch_helper($o->{bus});
+ set_gtk3_watch_helper($o->{bus});
}
-sub set_gtk2_watch_helper {
+sub set_gtk3_watch_helper {
my ($bus) = @_;
$bus->{connection}->set_watch_callbacks(sub {
my ($con, $watch) = @_;
my $flags = $watch->get_flags;
require Net::DBus::Binding::Watch;
- require Gtk2::Helper;
+ require Gtk3::Helper;
if ($flags & &Net::DBus::Binding::Watch::READABLE) {
- Gtk2::Helper->add_watch($watch->get_fileno, 'in', sub {
+ Gtk3::Helper->add_watch($watch->get_fileno, 'in', sub {
$watch->handle(&Net::DBus::Binding::Watch::READABLE);
$con->dispatch;
1;
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index 6f70c92d2..184a1db31 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -33,7 +33,7 @@ sub get() {
#- 2. The first SCSI device if SCSI exists. Or
#- 3. The first RAID device if RAID exists.
- getIDE(), getSCSI(), getXenBlk(), getVirtIO(), getDAC960(), getCompaqSmartArray(), getATARAID();
+ getIDE(), getSCSI(), getMmcBlk(), getXenBlk(), getVirtIO(), getDAC960(), getCompaqSmartArray(), getATARAID();
}
sub hds() { grep { may_be_a_hd($_) } get() }
sub tapes() { grep { $_->{media_type} eq 'tape' } get() }
@@ -401,6 +401,14 @@ sub getVirtIO() {
glob("/sys/bus/virtio/devices/*/block/*");
}
+sub getMmcBlk() {
+ -d '/sys/bus/mmc/devices' or return;
+ map {
+ { device => basename($_), info => "MMC block device", media_type => 'hd', bus => 'mmc' };
+ }
+ glob("/sys/bus/mmc/devices/*/block/*");
+}
+
# cpu_name : arch() =~ /^alpha/ ? "cpu " :
# arch() =~ /^ppc/ ? "processor" : "vendor_id"
diff --git a/perl-install/devices.pm b/perl-install/devices.pm
index 5162bd602..8ea66bd82 100644
--- a/perl-install/devices.pm
+++ b/perl-install/devices.pm
@@ -212,7 +212,7 @@ sub make($) {
sub simple_partition_scan {
my ($part) = @_;
- $part->{device} =~ /((?:[hsv]|xv)d[a-z])(\d+)$/;
+ $part->{device} =~ /((?:[hsv]|xv)d[a-z]|mmcblk\d+p)(\d+)$/;
}
sub part_number {
my ($part) = @_;
diff --git a/perl-install/diskdrake/hd_gtk.pm b/perl-install/diskdrake/hd_gtk.pm
index 89d46dbfd..7ad48ab82 100644
--- a/perl-install/diskdrake/hd_gtk.pm
+++ b/perl-install/diskdrake/hd_gtk.pm
@@ -4,8 +4,8 @@ use diagnostics;
use strict;
use common;
-use mygtk2 qw(gtknew);
-use ugtk2 qw(:helpers :wrappers :create);
+use mygtk3 qw(gtknew);
+use ugtk3 qw(:helpers :wrappers :create);
use partition_table;
use fs::type;
use detect_devices;
@@ -45,10 +45,12 @@ notebook current_kind[]
=cut
sub load_theme() {
- my $rc = "/usr/share/libDrakX/diskdrake.rc";
- -r $rc or $rc = dirname(__FILE__) . "/../diskdrake.rc";
- -r $rc or $rc = dirname(__FILE__) . "/../share/diskdrake.rc";
- Gtk2::Rc->parse($rc);
+ my $css = "/usr/share/libDrakX/diskdrake.css";
+ -r $css or $css = dirname(__FILE__) . "/../diskdrake.css";
+ -r $css or $css = dirname(__FILE__) . "/../share/diskdrake.css";
+ my $pl = Gtk3::CssProvider->new;
+ $pl->load_from_path($css);
+ my $cx = Gtk3::StyleContext::add_provider_for_screen(Gtk3::Gdk::Screen::get_default(), $pl, Gtk3::STYLE_PROVIDER_PRIORITY_APPLICATION);
}
sub main {
@@ -58,26 +60,27 @@ sub main {
local $in->{grab} = 1;
- $w = ugtk2->new(N("Partitioning"));
- mygtk2::register_main_window($w->{real_window}) if !$::isEmbedded && !$::isInstall;
+ $w = ugtk3->new(N("Partitioning"));
+ mygtk3::register_main_window($w->{real_window}) if !$::isEmbedded && !$::isInstall;
load_theme();
+ $w->{window}->signal_connect('style-updated' => \&load_theme);
# TODO
# is_empty_array_ref($all_hds->{raids}) or raid::stopAll;
# updateLoopback();
gtkadd($w->{window},
- gtkpack_(Gtk2::VBox->new(0,7),
+ gtkpack_(Gtk3::VBox->new(0,7),
0, gtknew(($::isInstall ? ('Title1', 'label') : ('Label_Left', 'text'))
=> N("Click on a partition, choose a filesystem type then choose an action"),
# workaround infamous 6 years old gnome bug #101968:
- width => mygtk2::get_label_width()
+ width => mygtk3::get_label_width()
),
- 1, (my $notebook_widget = Gtk2::Notebook->new),
+ 1, (my $notebook_widget = Gtk3::Notebook->new),
0, (my $per_kind_action_box = gtknew('HButtonBox', layout => 'edge')),
0, (my $per_kind_action_box2 = gtknew('HButtonBox', layout => 'end')),
- 0, Gtk2::HSeparator->new,
+ 0, Gtk3::HSeparator->new,
0, (my $general_action_box = gtknew('HBox', spacing => 5)),
),
);
@@ -109,13 +112,21 @@ sub main {
$current_entry = '';
$update_all->();
});
- # ensure partitions bar is properlyz size on first display:
+ # ensure partitions bar is properly sized on first display:
$notebook_widget->signal_connect(realize => $update_all);
$w->sync;
+ # workaround for $notebook_widget being realized too early:
+ if (!$done_button) {
+ $notebook_widget->set_current_page(-1);
+ $notebook_widget->set_current_page(0);
+ $update_all->(2);
+ }
$done_button->grab_focus;
- $in->ask_from_list_(N("Read carefully"), N("Please make a backup of your data first"),
- [ N_("Exit"), N_("Continue") ], N_("Continue")) eq N_("Continue") or return
- if $::isStandalone;
+ if (!$::testing) {
+ $in->ask_from_list_(N("Read carefully"), N("Please make a backup of your data first"),
+ [ N_("Exit"), N_("Continue") ], N_("Continue")) eq N_("Continue") or return
+ if $::isStandalone;
+ }
undef $initializing;
$w->main;
@@ -132,6 +143,7 @@ sub try_ {
my $dm_active_before = ($current_entry && $current_entry->{dm_active} && $current_entry->{dm_name});
my $v = eval { $f->($in, @args, $all_hds) };
if (my $err = $@) {
+ warn $err, "\n", backtrace() if $in->isa('interactive::gtk');
$in->ask_warn(N("Error"), formatError($err));
}
my $refresh = 0;
@@ -150,7 +162,7 @@ sub try_ {
}
$update_all->($refresh);
- Gtk2->main_quit if $v && member($name, 'Done');
+ Gtk3->main_quit if $v && member($name, 'Done');
}
sub get_action_box_size() {
@@ -164,11 +176,11 @@ sub add_kind2notebook {
my ($notebook_widget, $kind) = @_;
die if $kind->{main_box};
- $kind->{display_box} = gtkset_size_request(Gtk2::HBox->new(0,0), $width, $height);
- $kind->{action_box} = gtkset_size_request(Gtk2::VBox->new, get_action_box_size());
- $kind->{info_box} = Gtk2::VBox->new(0,0);
+ $kind->{display_box} = gtkset_size_request(Gtk3::HBox->new(0,0), $width, $height);
+ $kind->{action_box} = gtkset_size_request(Gtk3::VBox->new, get_action_box_size());
+ $kind->{info_box} = Gtk3::VBox->new(0,0);
my $box =
- gtkpack_(Gtk2::VBox->new(0,7),
+ gtkpack_(Gtk3::VBox->new(0,7),
0, $kind->{display_box},
0, filesystems_button_box(),
1, $kind->{info_box});
@@ -176,7 +188,7 @@ sub add_kind2notebook {
1, $box,
0, $kind->{action_box},
]);
- ugtk2::add2notebook($notebook_widget, $kind->{name}, $kind->{main_box});
+ ugtk3::add2notebook($notebook_widget, $kind->{name}, $kind->{main_box});
push @notebook, $kind;
$kind;
}
@@ -203,7 +215,7 @@ sub general_action_box {
N_("Done"));
my $box_end = gtknew('HButtonBox', layout => 'end', spacing => 5);
foreach my $s (@actions) {
- my $button = Gtk2::Button->new(translate($s));
+ my $button = Gtk3::Button->new(translate($s));
$done_button = $button if $s eq 'Done';
gtkadd($box_end, gtksignal_connect($button, clicked => sub { try($s) }));
}
@@ -217,12 +229,12 @@ sub per_kind_action_box {
foreach my $s (diskdrake::interactive::hd_possible_actions_base($in)) {
gtkadd($box,
- gtksignal_connect(Gtk2::Button->new(translate($s)),
+ gtksignal_connect(Gtk3::Button->new(translate($s)),
clicked => sub { try($s, kind2hd($kind)) }));
}
foreach my $s (diskdrake::interactive::hd_possible_actions_extra($in)) {
gtkadd($box2,
- gtksignal_connect(Gtk2::Button->new(translate($s)),
+ gtksignal_connect(Gtk3::Button->new(translate($s)),
clicked => sub { try($s, kind2hd($kind)) }));
}
}
@@ -233,18 +245,18 @@ sub per_entry_action_box {
if ($entry) {
my @buttons = map {
my $s = $_;
- my $w = Gtk2::Button->new(translate($s));
+ my $w = Gtk3::Button->new(translate($s));
$w->signal_connect(clicked => sub { try($s, kind2hd($kind), $entry) });
$w;
} diskdrake::interactive::part_possible_actions($in, kind2hd($kind), $entry, $all_hds);
- gtkadd($box, create_scrolled_window(gtkpack__(Gtk2::VBox->new, @buttons), undef, 'none')) if @buttons;
+ gtkadd($box, create_scrolled_window(gtkpack__(Gtk3::VBox->new, @buttons), undef, 'none')) if @buttons;
} else {
my $txt = !$::isStandalone && fsedit::is_one_big_fat_or_NT($all_hds->{hds}) ?
N("You have one big Microsoft Windows partition.
I suggest you first resize that partition
(click on it, then click on \"Resize\")") : N("Please click on a partition");
- gtkpack($box, gtktext_insert(Gtk2::TextView->new, $txt));
+ gtkpack($box, gtktext_insert(Gtk3::TextView->new, $txt));
}
}
@@ -315,10 +327,12 @@ sub create_automatic_notebooks {
sub create_buttons4partitions {
my ($kind, $totalsectors, @parts) = @_;
- $width = first($w->{window}->window->get_size) - first(get_action_box_size()) - 25 if $w->{window}->window;
+ $width = $w->{window}->get_allocated_width - first(get_action_box_size()) - 60 if $w->{window}->get_window;
my $ratio = $totalsectors ? ($width - @parts * $minwidth) / $totalsectors : 1;
- while (1) {
+ my $i = 1;
+ while ($i < 30) {
+ $i++;
my $totalwidth = sum(map { $_->{size} * $ratio + $minwidth } @parts);
$totalwidth <= $width and last;
$ratio /= $totalwidth / $width * 1.1;
@@ -336,9 +350,11 @@ sub create_buttons4partitions {
my $p = find { $entry->{dm_name} eq $_->{dmcrypt_name} } @{$all_hds->{dmcrypts}};
$entry = $p if $p;
}
- my $info = $entry->{mntpoint} || $entry->{device_LABEL};
+ my $info = $entry->{mntpoint} || $entry->{device_LABEL} || '';
$info .= "\n" . ($entry->{size} ? formatXiB($entry->{size}, 512) : N("Unknown")) if $info;
- my $w = Gtk2::ToggleButton->new_with_label($info) or internal_error('new_with_label');
+ my $w = Gtk3::ToggleButton->new_with_label($info) or internal_error('new_with_label');
+ $w->get_child->set_ellipsize('end');
+ $w->set_tooltip_text($info);
$w->signal_connect(clicked => sub {
$current_button != $w or return;
current_entry_changed($kind, $entry);
@@ -406,13 +422,13 @@ sub filesystems_button_box() {
N_("Other"), N_("Empty"));
my %name2fs_type = (Ext3 => 'ext3', Ext4 => 'ext4', 'XFS' => 'xfs', Swap => 'swap', Other => 'other', "Windows" => 'vfat', HFS => 'hfs');
- gtkpack(Gtk2::HBox->new,
+ gtkpack(Gtk3::HBox->new,
map {
my $t = $name2fs_type{$_};
my $w = gtknew('Button', text => translate($_), widget_name => 'PART_' . ($t || 'empty'),
tip => N("Filesystem types:"),
clicked => sub { try_('', \&createOrChangeType, $t, current_hd(), current_part()) });
- $w->can_focus(0);
+ $w->set_can_focus(0);
$w;
} @types);
}
diff --git a/perl-install/diskdrake/smbnfs_gtk.pm b/perl-install/diskdrake/smbnfs_gtk.pm
index 28fc9f2ea..61bcab168 100644
--- a/perl-install/diskdrake/smbnfs_gtk.pm
+++ b/perl-install/diskdrake/smbnfs_gtk.pm
@@ -9,8 +9,8 @@ use common;
use interactive;
use fs::remote::smb;
use fs::remote::nfs;
-use mygtk2 qw(gtknew gtkset);
-use ugtk2 qw(:helpers :wrappers :create);
+use mygtk3 qw(gtknew gtkset);
+use ugtk3 qw(:helpers :wrappers :create);
my ($all_hds, $in, $tree_model, $current_entry, $current_leaf, %icons);
@@ -19,7 +19,7 @@ sub main {
my ($kind) = $type eq 'smb' ? smb2kind() : nfs2kind();
$kind->check($in) or return;
- my $w = ugtk2->new(N("Partitioning"));
+ my $w = ugtk3->new(N("Partitioning"));
add_smbnfs($w->{window}, $kind);
$w->{rwindow}->set_default_size(400, 300) if $w->{rwindow}->can('set_default_size');
@@ -42,7 +42,7 @@ sub try_ {
$in->ask_warn(N("Error"), formatError($err));
}
update($kind);
- Gtk2->main_quit if member($name, 'Cancel', 'Done');
+ Gtk3->main_quit if member($name, 'Cancel', 'Done');
}
sub raw_hd_options {
@@ -127,14 +127,14 @@ sub import_tree {
my ($kind, $info_box) = @_;
my (%servers_displayed, %wservers, %wexports);
- $tree_model = Gtk2::TreeStore->new("Gtk2::Gdk::Pixbuf", "Glib::String");
- my $tree = Gtk2::TreeView->new_with_model($tree_model);
+ $tree_model = Gtk3::TreeStore->new("Gtk3::Gdk::Pixbuf", "Glib::String");
+ my $tree = Gtk3::TreeView->new_with_model($tree_model);
$tree->get_selection->set_mode('browse');
- my $col = Gtk2::TreeViewColumn->new;
- $col->pack_start(my $pixrender = Gtk2::CellRendererPixbuf->new, 0);
+ my $col = Gtk3::TreeViewColumn->new;
+ $col->pack_start(my $pixrender = Gtk3::CellRendererPixbuf->new, 0);
$col->add_attribute($pixrender, 'pixbuf', 0);
- $col->pack_start(my $texrender = Gtk2::CellRendererText->new, 1);
+ $col->pack_start(my $texrender = Gtk3::CellRendererText->new, 1);
$col->add_attribute($texrender, 'text', 1);
$tree->append_column($col);
@@ -226,10 +226,10 @@ sub import_tree {
$current_entry = find_fstab_entry($kind, $wexports{$tree_model->get_path_str($curr)} || die(''), 'add');
} else {
if (!$tree_model->iter_has_child($curr)) {
- gtkset_mousecursor_wait($tree->window);
- ugtk2::flush();
+ gtkset_mousecursor_wait($tree->get_window);
+ ugtk3::flush();
$add_exports->($curr);
- gtkset_mousecursor_normal($tree->window);
+ gtkset_mousecursor_normal($tree->get_window);
}
$current_entry = undef;
}
diff --git a/perl-install/fs/partitioning_wizard.pm b/perl-install/fs/partitioning_wizard.pm
index 750e02816..ddd54c9ec 100644
--- a/perl-install/fs/partitioning_wizard.pm
+++ b/perl-install/fs/partitioning_wizard.pm
@@ -13,8 +13,6 @@ use partition_table;
use partition_table::raw;
use partition_table::dos;
use POSIX qw(ceil);
-use mygtk2;
-use ugtk2 qw(:wrappers);
#- unit of $mb is mega bytes, min and max are in sectors, this
#- function is used to convert back to sectors count the size of
@@ -75,13 +73,13 @@ Then choose action ``Mount point'' and set it to `/'"), 1) or return;
}
sub partitionWizardSolutions {
- my ($in, $all_hds, $all_fstab, $manual_fstab, $partitions, $partitioning_flags, $skip_mtab, $target) = @_;
+ my ($in, $all_hds, $all_fstab, $manual_fstab, $partitions, $partitioning_flags, $skip_mtab, $o_target) = @_;
my $hds = $all_hds->{hds};
my $fstab;
my $full_fstab = [ fs::get::fstab($all_hds) ];
- if ($target) {
- $hds = [ $target ];
- $fstab = [ grep { $_->{rootDevice} eq $target->{device} } fs::get::fstab($all_hds) ];
+ if ($o_target) {
+ $hds = [ $o_target ];
+ $fstab = [ grep { $_->{rootDevice} eq $o_target->{device} } fs::get::fstab($all_hds) ];
} else {
$fstab = $full_fstab;
}
@@ -246,7 +244,7 @@ filesystem checks will be run on your next boot into Microsoft Windows®")) if $
},
\&partition_table::description, \@hds_rw) or return;
} else {
- $hd = $target;
+ $hd = $o_target;
}
$in->ask_okcancel_({ messages => N("ALL existing partitions and their data will be lost on drive %s", partition_table::description($hd)),
title => N("Partitioning"),
@@ -297,17 +295,17 @@ sub create_display_box {
my @parts = diskdrake::hd_gtk::kind2parts($kind);
my $totalsectors = diskdrake::hd_gtk::kind2sectors($kind, @parts);
- my $width = 540;
+ my $width = 520;
my $minwidth = 40;
- my $display_box = ugtk2::gtkset_size_request(Gtk2::HBox->new(0,0), -1, 26);
+ my $display_box = ugtk3::gtkset_size_request(Gtk3::HBox->new(0,0), -1, 26);
my $sep_count = @parts - 1;
#- ratio used to compute initial partition pixel width (each partition should be > min_width)
#- though, the pixel/sectors ratio cannot be the same for all the partitions
my $initial_ratio = $totalsectors ? ($width - @parts * $minwidth - $sep_count) / $totalsectors : 1;
- my $vbox = Gtk2::VBox->new;
+ my $vbox = Gtk3::VBox->new;
my $part_sep;
my $desc;
@@ -315,9 +313,9 @@ sub create_display_box {
my $last = $resize && $resize->[-1];
foreach my $entry (@parts) {
- my $part_info = Gtk2::Label->new($entry->{device_LABEL});
+ my $part_info = Gtk3::Label->new($entry->{device_LABEL});
my @colorized_fs_types = qw(ext2 ext3 ext4 xfs swap vfat ntfs ntfs-3g);
- my $part_widget = Gtk2::EventBox->new;
+ my $part_widget = Gtk3::EventBox->new;
$entry->{width} = int($entry->{size} * $initial_ratio) + $minwidth;
if ($last && $last->{device} eq $entry->{device}) {
#- entry is the last resizable partition
@@ -329,33 +327,31 @@ sub create_display_box {
$part_widget->set_name("PART_vfat");
$part_info->set_size_request(ceil($ratio * $entry->{min_win}), 0);
- my $mdv_widget = gtkadd(gtkset_name(Gtk2::EventBox->new, "PART_new"),
+ my $mdv_widget = gtkadd(gtkset_name(Gtk3::EventBox->new, "PART_new"),
gtkset_size_request(gtknew("Image", file => "small-logo"),
$ratio * MB(600), 0));
- my $hpane = Gtk2::HPaned->new;
- $hpane->add1($part_widget);
- $hpane->child1_shrink(0);
- $hpane->add2($mdv_widget);
- $hpane->child2_shrink(0);
+ my $hpane = Gtk3::HPaned->new;
+ $hpane->pack1($part_widget, 1, 0);
+ $hpane->pack2($mdv_widget, 1, 0);
$hpane->set_position(ceil($ratio * $entry->{req_size}));
- ugtk2::gtkset_size_request($hpane, $entry->{width}, 0);
- ugtk2::gtkpack__($display_box, $hpane);
+ ugtk3::gtkset_size_request($hpane, $entry->{width}, 0);
+ ugtk3::gtkpack__($display_box, $hpane);
my $add_part_size_info = sub {
my ($name, $label) = @_;
- ugtk2::gtkpack__($desc,
- gtkadd(gtkset_name(Gtk2::EventBox->new, $name),
- Gtk2::Label->new(" " x 4)),
+ ugtk3::gtkpack__($desc,
+ gtkadd(gtkset_name(Gtk3::EventBox->new, $name),
+ Gtk3::Label->new(" " x 4)),
gtkset_size_request(gtkset_alignment($label, 0, 0.5),
150, 20));
};
- $desc = Gtk2::HBox->new(0,0);
+ $desc = Gtk3::HBox->new(0,0);
- my $win_size_label = Gtk2::Label->new;
+ my $win_size_label = Gtk3::Label->new;
$add_part_size_info->("PART_vfat", $win_size_label);
- my $mdv_size_label = Gtk2::Label->new;
+ my $mdv_size_label = Gtk3::Label->new;
$add_part_size_info->("PART_new", $mdv_size_label);
my $update_size_labels = sub {
@@ -373,7 +369,7 @@ sub create_display_box {
};
$hpane->signal_connect('size-allocate' => sub {
my (undef, $alloc) = @_;
- $entry->{width} = $alloc->width;
+ $entry->{width} = $alloc->{width};
$update_ratio->();
0;
});
@@ -396,12 +392,12 @@ sub create_display_box {
'other'));
}
$part_widget->set_size_request($entry->{width}, 0);
- ugtk2::gtkpack($display_box, $part_widget);
+ ugtk3::gtkpack($display_box, $part_widget);
}
$part_widget->add($part_info);
- $part_sep = gtkadd(Gtk2::EventBox->new,
- gtkset_size_request(Gtk2::Label->new("."), 1, 0));
+ $part_sep = gtkadd(Gtk3::EventBox->new,
+ gtkset_size_request(Gtk3::Label->new("."), 1, 0));
gtkpack__($display_box, $part_sep);
}
$display_box->remove($part_sep) if $part_sep;
@@ -409,11 +405,11 @@ sub create_display_box {
my @types = (N_("Ext2/3/4"), N_("XFS"), N_("Swap"), arch() =~ /sparc/ ? N_("SunOS") : arch() eq "ppc" ? N_("HFS") : N_("Windows"),
N_("Other"), N_("Empty"));
my %name2fs_type = ('Ext2/3/4' => 'ext3', 'XFS' => 'xfs', Swap => 'swap', Other => 'other', "Windows" => 'vfat', HFS => 'hfs');
- $desc = ugtk2::gtkpack(Gtk2::HBox->new,
+ $desc = ugtk3::gtkpack(Gtk3::HBox->new,
map {
my $t = $name2fs_type{$_};
- my $ev = Gtk2::EventBox->new;
- my $w = Gtk2::Label->new(translate($_));
+ my $ev = Gtk3::EventBox->new;
+ my $w = Gtk3::Label->new(translate($_));
$ev->add($w);
$ev->set_name('PART_' . ($t || 'empty'));
$ev;
@@ -443,8 +439,8 @@ sub display_choices {
$contentbox->foreach(sub { $contentbox->remove($_[0]) });
$mainw->{kind}{display_box} ||= create_display_box($mainw->{kind});
- ugtk2::gtkpack2__($contentbox, $mainw->{kind}{display_box});
- ugtk2::gtkpack__($contentbox, gtknew('Label',
+ ugtk3::gtkpack2__($contentbox, $mainw->{kind}{display_box});
+ ugtk3::gtkpack__($contentbox, gtknew('Label',
text => N("The DrakX Partitioning wizard found the following solutions:"),
alignment => [0, 0]));
@@ -461,30 +457,30 @@ sub display_choices {
$item = create_display_box($mainw->{kind}, $solutions{$s}[3], undef, $button);
} elsif ($s eq 'existing_part') {
} elsif ($s eq 'wipe_drive') {
- $item = Gtk2::EventBox->new;
+ $item = Gtk3::EventBox->new;
my $b2 = gtknew("Image", file => "small-logo");
$item->add($b2);
- $item->set_size_request(540,26);
+ $item->set_size_request(520,26);
$item->set_name("PART_new");
} elsif ($s eq 'diskdrake') {
} else {
log::l($s);
next;
}
- ugtk2::gtkpack($vbox,
+ ugtk3::gtkpack($vbox,
gtknew('Label',
text => $solutions{$s}[1],
alignment => [0, 0]));
- ugtk2::gtkpack($vbox, $item) if defined($item);
- $button->set_group($oldbutton->get_group) if $oldbutton;
+ ugtk3::gtkpack($vbox, $item) if defined($item);
+ $button->join_group($oldbutton) if $oldbutton;
$oldbutton = $button;
$button->signal_connect('toggled', sub { $mainw->{sol} = $solutions{$s} if $_[0]->get_active });
- ugtk2::gtkpack2__($choicesbox, $button);
+ ugtk3::gtkpack2__($choicesbox, $button);
$sep = gtknew('HSeparator');
- ugtk2::gtkpack2__($choicesbox, $sep);
+ ugtk3::gtkpack2__($choicesbox, $sep);
}
$choicesbox->remove($sep);
- ugtk2::gtkadd($contentbox, $choicesbox);
+ ugtk3::gtkadd($contentbox, $choicesbox);
$mainw->{sol} = $solutions{@solutions[0]};
}
@@ -494,30 +490,30 @@ sub main {
my $sol;
if ($o->isa('interactive::gtk')) {
- require mygtk2;
- mygtk2->import(qw(gtknew));
- require ugtk2;
- ugtk2->import(qw(:wrappers));
+ require mygtk3;
+ mygtk3->import(qw(gtknew));
+ require ugtk3;
+ ugtk3->import(qw(:wrappers));
- my $mainw = ugtk2->new(N("Partitioning"), %$o, if__($::main_window, transient => $::main_window));
+ my $mainw = ugtk3->new(N("Partitioning"), %$o, if__($::main_window, transient => $::main_window));
$mainw->{box_allow_grow} = 1;
- mygtk2::set_main_window_size($mainw->{rwindow});
+ mygtk3::set_main_window_size($mainw->{rwindow});
require diskdrake::hd_gtk;
diskdrake::hd_gtk::load_theme();
- my $mainbox = Gtk2::VBox->new;
+ my $mainbox = Gtk3::VBox->new;
my @kinds = map { diskdrake::hd_gtk::hd2kind($_) } sort { $a->{is_removable} <=> $b->{is_removable} } @{ $all_hds->{hds} };
push @kinds, diskdrake::hd_gtk::raid2real_kind($_) foreach @{$all_hds->{raids}};
push @kinds, map { diskdrake::hd_gtk::lvm2kind($_) } @{$all_hds->{lvms}};
- my $hdchoice = Gtk2::HBox->new;
+ my $hdchoice = Gtk3::HBox->new;
- my $hdchoicelabel = Gtk2::Label->new(N("Here is the content of your disk drive "));
+ my $hdchoicelabel = Gtk3::Label->new(N("Here is the content of your disk drive "));
- my $combobox = Gtk2::ComboBox->new_text;
+ my $combobox = Gtk3::ComboBoxText->new;
foreach (@kinds) {
my $info = $_->{val}{info} || $_->{val}{device};
$info =~ s|^(?:.*/)?(.{24}).*|$1|;
@@ -526,16 +522,16 @@ sub main {
}
$combobox->set_active(0);
- ugtk2::gtkpack2__($hdchoice, $hdchoicelabel);
+ ugtk3::gtkpack2__($hdchoice, $hdchoicelabel);
$hdchoice->add($combobox);
- ugtk2::gtkpack2__($mainbox, $hdchoice);
+ ugtk3::gtkpack2__($mainbox, $hdchoice);
- my $contentbox = Gtk2::VBox->new(0, 12);
+ my $contentbox = Gtk3::VBox->new(0, 12);
- my $scroll = Gtk2::ScrolledWindow->new;
+ my $scroll = Gtk3::ScrolledWindow->new;
$scroll->set_policy('never', 'automatic'),
- my $vp = Gtk2::Viewport->new;
+ my $vp = Gtk3::Viewport->new;
$vp->set_shadow_type('none');
$vp->add($contentbox);
$scroll->add($vp);
@@ -564,7 +560,7 @@ sub main {
);
my $buttons_pack = $mainw->create_okcancel(N("Next"), undef, '', @more_buttons);
$mainbox->pack_end($buttons_pack, 0, 0, 0);
- ugtk2::gtkadd($mainw->{window}, $mainbox);
+ ugtk3::gtkadd($mainw->{window}, $mainbox);
$mainw->{window}->show_all;
$mainw->main;
@@ -599,6 +595,7 @@ sub main {
if ($err =~ /wizcancel/) {
$_->destroy foreach $::WizardTable->get_children;
} else {
+ log::l("Partitioning failed: $err");
$o->ask_warn('', N("Partitioning failed: %s", formatError($err)));
}
}
diff --git a/perl-install/harddrake/sound.pm b/perl-install/harddrake/sound.pm
index 8a560f03d..754c7aa89 100644
--- a/perl-install/harddrake/sound.pm
+++ b/perl-install/harddrake/sound.pm
@@ -1,14 +1,4 @@
package harddrake::sound;
-# lists filled with Danny Tholen help, enhanced by Thierry Vignaud
-#
-# No ALSA for OSS's
-# o isa cards: msnd_pinnacle, pas2,
-# o pci cards: ad1889, sam9407
-# No OSS for ALSA's
-# o pci cards: snd_als4000, snd_es968, snd_hdsp
-# o isa cards: snd_azt2320, snd_cs4231, snd_cs4236,
-# snd_dt0197h, snd_korg1212, snd_rme32
-# o pcmcia cards: snd_vxp440 snd_vxpocket
# TODO:
# o ensure sound is not user (either dsp/midi/sequencer/mixer)
@@ -22,165 +12,6 @@ use list_modules;
use detect_devices;
use log;
-
-our %alsa2oss =
- (
- if_(arch() =~ /ppc/, "snd_powermac" => [ "dmasound_pmac" ]),
- if_(arch() =~ /sparc/,
- "snd_sun_amd7930" => [ "unknown" ],
- "snd_sun_cs4231" => [ "unknown" ],
- "snd_sun_dbri" => [ "unknown" ],
- ),
- "snd_ad1816a" => [ "ad1816" ], # isa
- "snd_ad1848" => [ "ad1848", "pss" ], # isa
- "snd_ad1889" => [ "ad1889" ],
- "snd_ali5451" => [ "trident" ],
- "snd_als100" => [ "sb" ], # isa
- "snd_als300" => [ "unknown" ],
- "snd_als4000" => [ "unknown" ],
- "snd_aoa" => [ "unknown" ],
- "snd_asihpi" => [ "unknown" ],
- "snd_atiixp" => [ "unknown" ],
- "snd_au8810" => [ "unknown" ],
- "snd_au8820" => [ "unknown" ],
- "snd_au8830" => [ "unknown" ],
- "snd_audigyls" => [ "unknown" ], # pci, renamed as snd_ca0106
- "snd_azt2320" => [ "unknown" ], # isa
- "snd_azt3328" => [ "unknown" ], # isa
- "snd_azx" => [ "unknown" ],
- "snd_bt87x" => [ "btaudio" ],
- "snd_ca0106" => [ "unknown" ], # pci
- "snd_cmi8330" => [ "sb" ], # isa
- "snd_cmi8788" => [ "unknown" ], # pci
- "snd_cmipci" => [ "cmpci" ],
- "snd_cs4231" => [ "unknown" ], # isa
- "snd_cs4232" => [ "cs4232" ], # isa
- "snd_cs4236" => [ "ad1848" ], # isa
- "snd_cs4281" => [ "cs4281" ],
- "snd_cs46xx" => [ "cs46xx" ],
- "snd_cs5530" => [ "unknown" ],
- "snd_cs5535audio" => [ "unknown" ],
- "snd_darla20" => [ "unknown" ],
- "snd_darla24" => [ "unknown" ],
- "snd_dt0197h" => [ "unknown" ], # isa
- "snd_dt019x" => [ "unknown" ], # isa
- "snd_echo3g" => [ "unknown" ],
- "snd_emu10k1" => [ "audigy", "emu10k1" ],
- "snd_emu10k1x" => [ "unknown" ],
- "snd_ens1370" => [ "es1370" ],
- "snd_ens1371" => [ "es1371" ],
- "snd_es1688" => [ "sb" ], # isa
- "snd_es18xx" => [ "sb" ], # isa
- "snd_es1938" => [ "esssolo1" ],
- "snd_es1968" => [ "maestro" ], # isa
- "snd_es968" => [ "sb" ],
- "snd_fm801" => [ "forte" ],
- "snd_gina20" => [ "unknown" ],
- "snd_gina24" => [ "unknown" ],
- "snd_gina3g" => [ "unknown" ],
- "snd_gusclassic" => [ "gus" ], # isa
- "snd_gusextreme" => [ "gus" ], # isa
- "snd_gusmax" => [ "gus" ], # isa
- "snd_hda_intel" => [ "unknown" ],
- "snd_hdspm" => [ "unknown" ],
- "snd_hdsp" => [ "unknown" ],
- "snd_ice1712" => [ "unknown" ], # isa
- "snd_ice1724" => [ "unknown" ], # isa
- "snd_indi" => [ "unknown" ], # pci
- "snd_indigo" => [ "unknown" ], # pci
- "snd_indigodj" => [ "unknown" ], # pci
- "snd_indigoio" => [ "unknown" ], # pci
- "snd_intel8x0" => [ "ali5455", "i810_audio", "nvaudio" ],
- "snd_interwave" => [ "gus" ], # isa
- "snd_interwave_stb" => [ "unknown" ], # isa
- "snd_korg1212" => [ "unknown" ], # isa
- "snd_layla20" => [ "unknown" ],
- "snd_layla24" => [ "unknown" ],
- "snd_layla3g" => [ "unknown" ],
- "snd_maestro3" => [ "maestro3" ],
- "snd_mia" => [ "unknown" ],
- "snd_mixart" => [ "unknown" ],
- "snd_mona" => [ "unknown" ],
- "snd_mpu401" => [ "mpu401" ],
- "snd_nm256" => [ "nm256_audio" ],
- "snd_opl3sa2" => [ "opl3", "opl3sa", "opl3sa2" ], # isa
- "snd_opti92x_ad1848" => [ "unknown" ], # isa
- "snd_opti92x_cs4231" => [ "unknown" ], # isa
- "snd_opti93x" => [ "mad16" ],
- "snd_pcxhr" => [ "unknown" ], # pci
- "snd_riptide" => [ "unknown" ],
- "snd_rme32" => [ "unknown" ], # isa
- "snd_rme96" => [ "rme96xx" ], # pci
- "snd_rme9652" => [ "rme96xx" ], # pci
- "snd_sb16" => ["sscape", "sb"],
- "snd_sb8" => [ "sb" ],
- "snd_sbawe" => [ "awe_wave" ],
- "snd_sgalaxy" => [ "sgalaxy" ], # isa
- "snd_sonicvibes" => [ "sonicvibes" ],
- "snd_sscape" => [ "sscape" ], # isa
- "snd_trident" => [ "trident" ],
- "snd_usb_audio" => [ "audio" ], # usb
- "snd_usb_caiaq" => [ "unknown" ],
- "snd_usb_usx2y" => [ "unknown" ],
- "snd_via82xx" => [ "via82cxxx_audio" ],
- "snd_vx222" => [ "unknown" ],
- "snd_vxp440" => [ "unknown" ], # pcmcia
- "snd_vxpocket" => [ "unknown" ], # pcmcia
- "snd_wavefront" => [ "wavefront" ], # isa
- "snd_ymfpci" => [ "ymfpci" ],
- );
-
-
-our %oss2alsa =
- (
- if_(arch() =~ /ppc/, "dmasound_pmac" => [ "snd_powermac" ]),
- "ad1816" => [ "snd_ad1816a" ],
- "ad1848" => [ "snd_ad1848", "snd_cs4236" ],
- "ad1889" => [ "snd_ad1889" ],
- "ali5455" => [ "snd_intel8x0" ],
- "audigy" => [ "snd_emu10k1" ],
- "audio" => [ "snd_usb_audio" ], # usb
- "awe_wave" => [ "snd_sbawe" ],
- "btaudio" => [ "snd_bt87x" ],
- "cmpci" => [ "snd_cmipci" ],
- "cs4232" => [ "snd_cs4232" ],
- "cs4281" => [ "snd_cs4281" ],
- "cs46xx" => [ "snd_cs46xx" ],
- "emu10k1" => [ "snd_emu10k1" ],
- "es1370" => [ "snd_ens1370" ],
- "es1371" => [ "snd_ens1371" ],
- "esssolo1" => [ "snd_es1938" ],
- "forte" => [ "snd_fm801" ],
- "gus" => ["snd_interwave", "snd_gusclassic", "snd_gusmax", "snd_gusextreme"],
- "i810_audio" => [ "snd_intel8x0" ],
- "ice1712" => [ "snd_ice1712" ],
- "mad16" => [ "snd_opti93x" ],
- "maestro" => [ "snd_es1968" ],
- "maestro3" => [ "snd_maestro3" ],
- "mpu401" => [ "snd_mpu401" ],
- "msnd_pinnacle" => [ "unknown" ],
- "nm256_audio" => [ "snd_nm256" ],
- "nvaudio" => [ "snd_intel8x0" ],
- "opl3" => [ "snd_opl3sa2" ],
- "opl3sa" => [ "snd_opl3sa2" ],
- "opl3sa2" => [ "snd_opl3sa2" ],
- "pas2" => [ "unknown" ],
- "pss" => [ "snd_ad1848" ],
- "rme96xx" => [ "snd_rme96", "snd_rme9652" ],
- "sam9407" => [ "unknown" ],
- "sb" => [ "snd_als100", "snd_cmi8330", "snd_es1688", "snd_es18xx", "snd_es968", "snd_sb8", "snd_sb16" ],
- "sgalaxy" => [ "snd_sgalaxy" ],
- "sonicvibes" => [ "snd_sonicvibes" ],
- "sscape" => [ "snd_sb16", "snd_sscape" ],
- "trident" => [ "snd_ali5451", "snd_trident" ],
- "via82cxxx_audio" => [ "snd_via82xx" ],
- "wavefront" => [ "snd_wavefront" ],
- "ymfpci" => [ "snd_ymfpci" ],
- );
-
-my @blacklist = qw(cs46xx cs4281);
-my $blacklisted = 0;
-
sub is_pulseaudio_enabled() {
my $soundprofile = common::read_alternative('soundprofile');
$soundprofile =~ /pulse$/;
@@ -251,17 +82,11 @@ sub set_PA_autospan {
sub rooted { run_program::rooted($::prefix, @_) }
-sub unload { modules::unload(@_) if $::isStandalone || $blacklisted }
+sub unload { modules::unload(@_) if $::isStandalone }
sub load {
my ($modules_conf, $name) = @_;
- modules::load_and_configure($modules_conf, $name) if $::isStandalone || $blacklisted;
-}
-
-sub get_alternative {
- my ($driver) = @_;
- my $list = $alsa2oss{$driver} || $oss2alsa{$driver};
- $list ? @$list : "unknown";
+ modules::load_and_configure($modules_conf, $name) if $::isStandalone;
}
sub do_switch {
@@ -270,8 +95,8 @@ sub do_switch {
my $_wait = $in->wait_message(N("Please wait"), N("Please Wait... Applying the configuration"));
log::explanations("removing old $old_driver\n");
if ($::isStandalone) {
- rooted("service sound stop") unless $blacklisted;
- rooted("service alsa stop") if $old_driver =~ /^snd_/ && !$blacklisted;
+ rooted("service sound stop");
+ rooted("service alsa stop") if $old_driver =~ /^snd_/;
unload($old_driver); # run_program("/sbin/modprobe -r $driver"); # just in case ...
}
$modules_conf->remove_module($old_driver);
@@ -280,25 +105,26 @@ sub do_switch {
if ($new_driver =~ /^snd_/) { # new driver is an alsa one
$in->do_pkgs->ensure_binary_is_installed(qw(alsa-utils alsactl), 1);
$in->do_pkgs->ensure_binary_is_installed(qw(aoss aoss), 1);
- rooted("service alsa start") if $::isStandalone && !$blacklisted;
+ rooted("service alsa start") if $::isStandalone;
rooted("/sbin/chkconfig --add alsa") if $::isStandalone;
load($modules_conf, $new_driver) if $::isStandalone; # service alsa is buggy
} else { rooted("/sbin/chkconfig --del alsa") }
log::explanations("loading new $new_driver\n");
rooted("/sbin/chkconfig --add sound"); # just in case ...
- rooted("service sound start") if $::isStandalone && !$blacklisted;
+ rooted("service sound start") if $::isStandalone;
}
-sub switch {
+sub config {
my ($in, $modules_conf, $device) = @_;
my $driver = $device->{current_driver} || $device->{driver};
- foreach (@blacklist) { $blacklisted = 1 if $driver eq $_ }
- my @alternative = $driver ne 'unknown' ? get_alternative($driver) : ();
- unless ($driver eq $device->{driver} || member($device->{driver}, @alternative)) {
- push @alternative, get_alternative($device->{driver}), $device->{driver};
- }
- if (@alternative) {
+ my @alternative = $driver ne $device->{driver} ? $device->{driver} : ();
+ if ($driver eq "unknown") {
+ $in->ask_from(N("No known driver"),
+ N("There's no known driver for your sound card (%s)",
+ $device->{description}),
+ [ get_any_driver_entry($in, $modules_conf, $driver, $device) ]);
+ } else {
my $new_driver = $driver;
push @alternative, $driver;
my %des = modules::category2modules_and_description('multimedia/sound');
@@ -326,7 +152,6 @@ sub switch {
};
my @common = (
- get_any_driver_entry($in, $modules_conf, $driver, $device),
{
text => N("Enable PulseAudio"),
type => 'bool', val => \$is_pulseaudio_enabled,
@@ -361,12 +186,11 @@ sub switch {
}
} elsif ($in->ask_from_({ title => N("Sound configuration"),
messages =>
- N("Here you can select an alternative driver (either OSS or ALSA) for your sound card (%s).",
- $device->{description}) .
- #-PO: here the first %s is either "OSS" or "ALSA",
+ $device->{description} .
+ #-PO: here the first %s is either "ALSA",
#-PO: the second %s is the name of the current driver
#-PO: and the third %s is the name of the default driver
- N("\n\nYour card currently uses the %s\"%s\" driver (the default driver for your card is \"%s\")", ($driver =~ /^snd_/ ? "ALSA " : "OSS "), $driver, $device->{driver}),
+ N("\n\nYour card currently uses the %s\"%s\" driver (the default driver for your card is \"%s\")", "ALSA ", $driver, $device->{driver}),
interactive_help => sub {
N("OSS (Open Sound System) was the first sound API. It's an OS independent sound API (it's available on most UNIX(tm) systems) but it's a very basic and limited API.
What's more, OSS drivers all reinvent the wheel.
@@ -381,47 +205,28 @@ To use alsa, one can either use:
},
},
[
+ if_(@alternative,
{
label => N("Driver:"), val => \$new_driver, list => \@alternative, default => $new_driver, sort =>1,
- allow_empty_list => 1,
format => sub { my ($drv) = @_;
$drv eq 'unknown' ? $drv :
sprintf(($des{$drv} ? "$des{$drv} (%s [%s])"
: "%s [%s]"), $drv, $drv =~ /^snd_/ ? 'ALSA' : 'OSS');
}
- },
+ }),
@common,
]))
{
$write_config->();
return if $new_driver eq $device->{current_driver};
log::explanations("switching audio driver from '" . $device->{current_driver} . "' to '$new_driver'\n");
- $in->ask_warn(N("Warning"), N("The old \"%s\" driver is blacklisted.\n
-It has been reported to oops the kernel on unloading.\n
-The new \"%s\" driver will only be used on next bootstrap.", $device->{current_driver}, $new_driver)) if $blacklisted;
do_switch($in, $modules_conf, $device->{current_driver}, $new_driver, $device->{sound_slot_index});
$device->{current_driver} = $new_driver;
}
- } elsif ($driver =~ /^Bad:/) {
- $driver =~ s/^Bad://;
- $in->ask_warn(N("No open source driver"),
- N("There's no free driver for your sound card (%s), but there's a proprietary driver at \"%s\".",
- $device->{description}, $driver));
- } elsif ($driver eq "unknown") {
- $in->ask_from(N("No known driver"),
- N("There's no known driver for your sound card (%s)",
- $device->{description}),
- [ get_any_driver_entry($in, $modules_conf, $driver, $device) ]);
}
end:
}
-sub config {
- my ($in, $modules_conf, $device) = @_;
- switch($in, $modules_conf, $device);
-}
-
-
sub trouble {
my ($in) = @_;
$in->ask_warn(N("Sound troubleshooting"),
@@ -507,7 +312,7 @@ sub configure_sound_slots {
my $altered = 0;
each_index {
my $default_driver = $modules_conf->get_alias("sound-slot-$::i");
- if (!member($default_driver, get_alternative($_->{driver}), $_->{driver})) {
+ if (!member($default_driver, $_->{driver})) {
$altered ||= $default_driver;
configure_one_sound_slot($modules_conf, $::i, $_->{driver});
}
diff --git a/perl-install/install/Makefile b/perl-install/install/Makefile
index fe04d2f57..7f72576ca 100644
--- a/perl-install/install/Makefile
+++ b/perl-install/install/Makefile
@@ -44,7 +44,7 @@ install_pms:
perl -pe 's/#[-+].*//; $$_ = "\n" if (/^=(back|begin|head|item)/ .. /^=cut/) || /use (diagnostics|strict|vars|warnings)/' $$i > $(DESTREP4PMS)/$$i; \
done
- cp ../share/*.rc share/*.rc $(DESTREP4PMS)
+ cp ../share/*.css $(DESTREP4PMS)
chmod a+x $(DESTREP4PMS)/install/install2
chmod a+x $(DESTREP4PMS)/install/commands
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index b56604de1..9896ad422 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,118 @@
+Version 16.17 - 20 December 2013
+
+- media step:
+ o hint that nonfree is needed if a CPU needs a microcode
+- install:
+ o fix pausing installing while displaying release notes
+- drakx-in-chroot:
+ o advise to install xephyr if missing
+- use mutter instead of matchbox in order to try to workaround
+ diskdrake issues (mga#11790, mga#11988, ...)
+ as a side effect, stage2 shrinks by 3Mb...
+
+Version 16.14 - 10 December 2013
+
+- Mageia 4 beta 2 left background
+
+Version 16.13 - 10 December 2013
+
+- fix crash when selecting an input method (mga#11939)
+
+Version 16.10 - 6 December 2013
+
+- package group selection:
+ o make bottom buttons always available
+ (by puting the scrolling window only around the package group check boxes)
+
+Version 16.9 - 6 December 2013
+
+- fix retrieving network info from stage2 after dracut migration (mga#11504)
+
+Version 16.7 - 5 December 2013
+
+- partitioning:
+ o fix a crash when creating partitions (mga#11876)
+
+Version 16.6 - 4 December 2013
+
+- fix blue background behind left panel text (mga#11866)
+
+Version 16.5 - 3 December 2013
+
+- partitioning:
+ o detect eMMc block devices (Luc Menut, mga#11812)
+ o fix a crash in partitioning wizard (mga#11820)
+ o show labels on partition buttons again but ellipsized (mga#11858)
+
+Version 16.4 - 2 December 2013
+
+- fix partitioning wizard moving the main window to left (mga#11790)
+- fix titles not being blue anymore
+
+Version 16.2 - 29 November 2013
+
+- no more run urpmi.update when adding media
+ (uneeded with urpmi-7.27+)
+
+Version 16.1 - 28 November 2013
+
+- fix a warning: include dialog-warning-symbolic
+- fix left panel text being black instead of white (mga#11792)
+- fix calling "child1_shrink" via package "Gtk3::HPaned" (mga#11797)
+- fix using old toolbar API that is no more available (mga#11791)
+- wrap too big labels in summary dialog (mga#11793)
+
+Version 16.0 - 23 November 2013
+
+- switch from Gtk+-2 to Gtk+-3:
+ o Banners: most themes work OK but Oxygen-gtk3...
+ o diskdrake: most themes work OK but Oxygen-gtk3...
+- detect_devices:
+ fix ids to be numeric
+- drakx-in-chroot:
+ o add --depth in order to force 16bit colors mode
+
+Version 15.73.1 - 19 November 2013
+
+- debug image:
+ o include enough python in order to generate a stack trace from within stage2
+ o fix passing arguments from drakx-in-chroot
+- do not compile/include xhost+ anymore (unused for years)
+- log why updates were not applied
+
+Version 15.73 - 12 November 2013
+
+- polkit: fix wrappers to properly escape arguments when calling the binary
+
+Version 15.72.2 - 11 November 2013
+
+- properly escape $$UID
+- use $$UID instead of $$(id -u)
+
+Version 15.72.1 - 9 November 2013
+
+- fix typo in last Makefile change
+
+Version 15.72 - 9 November 2013
+
+- use /usr/libexec/drakrpm-addmedia directly in stage2 (colin, #11319)
+- debug image:
+ o add missing python modules for latest gdb
+ o fix building with latest gdb
+
+Version 15.71 - 8 November 2013
+
+- do not use automatically gdm for xfce
+- do not include anymore packdrake module
+
+Version 15.70 - 3 November 2013
+
+- Mageia 4 beta 1 left background
+
+Version 15.69 - 29 October 2013
+
+- adapt to a dracut based stage1
+
Version 15.68.1 - 14 October 2013
- adapt to latest mdadm
diff --git a/perl-install/install/any.pm b/perl-install/install/any.pm
index 217080202..9bad240c2 100644
--- a/perl-install/install/any.pm
+++ b/perl-install/install/any.pm
@@ -333,7 +333,11 @@ sub is_firmware_needed_ {
require pkgs;
my @xpkgs = pkgs::detect_graphical_drivers($o->do_pkgs);
log::l("the following nonfree firmware(s) are needed for X.org: " . join(', ', @xpkgs)) if @xpkgs;
- @need || @xpkgs;
+
+ my $need_microcode = detect_devices::hasCPUMicrocode();
+ log::l("nonfree firmware is needed for the CPU (microcode)") if $need_microcode;
+
+ @need || @xpkgs || $need_microcode;
}
sub is_firmware_needed {
diff --git a/perl-install/install/gtk.pm b/perl-install/install/gtk.pm
index 675b33475..6518d63ba 100644
--- a/perl-install/install/gtk.pm
+++ b/perl-install/install/gtk.pm
@@ -3,8 +3,8 @@ package install::gtk; # $Id: gtk.pm 269881 2010-06-04 14:48:46Z cfergeau $
use diagnostics;
use strict;
-use ugtk2;
-use mygtk2;
+use ugtk3;
+use mygtk3;
use common;
use lang;
use devices;
@@ -14,6 +14,7 @@ use detect_devices;
#-INTERN CONSTANT
#-#####################################################################################
+# FIXME: either drop 'doc' option or convert this to CSS!
#- if we're running for the doc team, we want screenshots with
#- a good B&W contrast: we'll override values of our theme
my $theme_overriding_for_doc = q(style "galaxy-default"
@@ -53,13 +54,15 @@ widget "*logo*" style "background-logo"
);
#------------------------------------------------------------------------------
-sub load_rc {
+sub load_css {
my ($o, $name) = @_;
my $f = $name;
- -r $name or $f = find { -r $_ } map { "$_/themes-$name.rc" } ("share", $ENV{SHARE_PATH}, dirname(__FILE__) . '/..');
+ -r $name or $f = find { -r $_ } map { "$_/themes-$name.css" } ("share", $ENV{SHARE_PATH}, dirname(__FILE__) . '/..');
if ($f) {
- Gtk2::Rc->parse_string($o->{doc} ? $theme_overriding_for_doc : scalar cat_($f));
+ my $pl = Gtk3::CssProvider->new;
+ $pl->load_from_data($o->{doc} ? $theme_overriding_for_doc : scalar cat_($f));
+ my $cx = Gtk3::StyleContext::add_provider_for_screen(Gtk3::Gdk::Screen::get_default(), $pl, Gtk3::STYLE_PROVIDER_PRIORITY_APPLICATION);
}
}
@@ -68,17 +71,22 @@ sub load_font {
my ($o) = @_;
if (defined($::WizardWindow) && lang::text_direction_rtl()) {
- Gtk2::Widget->set_default_direction('rtl');
+ Gtk3::Widget->set_default_direction('rtl');
my ($x, $y) = $::WizardWindow->get_position;
my ($width) = $::WizardWindow->get_size;
$::WizardWindow->move($::rootwidth - $width - $x, $y);
}
my $font = lang::l2pango_font($o->{locale}{lang});
- my $s = qq(gtk-font-name="$font");
- Gtk2::Rc->parse_string($s);
- mkdir("/root");
- output("/root/.gtkrc-2.0", $s);
+ my $s = qq(gtk-font-name = $font);
+ my $pl = Gtk3::CssProvider->new;
+ $pl->load_from_data("GtkWindow { font: $font }");
+ my $cx = Gtk3::StyleContext::add_provider_for_screen(Gtk3::Gdk::Screen::get_default(), $pl, Gtk3::STYLE_PROVIDER_PRIORITY_APPLICATION);
+ # FIXME: this should be done in /mnt too for forked app such as gurpmi{,.addmedia} (mga#67):
+ mkdir_p("/.config/gtk-3.0");
+ output("/.config/gtk-3.0/settings.ini", qq([Settings]
+$s
+));
}
#------------------------------------------------------------------------------
@@ -92,13 +100,12 @@ my $root_window;
sub install_theme {
my ($o) = @_;
- load_rc($o, $o->{theme} ||= default_theme($o));
+ load_css($o, $o->{theme} ||= default_theme($o));
load_font($o);
my $win = gtknew('Window', widget_name => 'background', title => 'root window');
$win->set_type_hint('desktop'); # for matchbox window manager
$win->realize;
- mygtk2::set_root_window_background_with_gc($win->style->bg_gc('normal'));
$root_window = $win;
}
@@ -169,7 +176,7 @@ sub update_steps_position {
exists $steps{steps}{$_} or next;
if ($o->{steps}{$_}{entered} && !$o->{steps}{$_}{done}) {
# we need to flush the X queue since else we got a temporary Y position of -1 when switching locales:
- mygtk2::flush(); #- for auto_installs which never go through the Gtk2 main loop
+ mygtk3::flush(); #- for auto_installs which never go through the Gtk3 main loop
$o->{steps_widget}->move_selection($steps{steps}{$_}{text});
if ($last_step) {
@@ -179,14 +186,14 @@ sub update_steps_position {
}
$last_step = $_;
}
- mygtk2::flush(); #- for auto_installs which never go through the Gtk2 main loop
+ mygtk3::flush(); #- for auto_installs which never go through the Gtk3 main loop
}
#------------------------------------------------------------------------------
sub init_gtk {
my ($o) = @_;
- symlink("/tmp/stage2/etc/$_", "/etc/$_") foreach qw(gtk-2.0 pango fonts);
+ symlink("/tmp/stage2/etc/$_", "/etc/$_") foreach qw(gtk-3.0 pango fonts);
if ($o->{vga16}) {
#- inactivate antialias in VGA16 because it makes fonts look worse
@@ -199,14 +206,14 @@ q(<fontconfig>
$ENV{FONTCONFIG_FILE} = '/tmp/fonts.conf';
}
- Gtk2->init;
- Gtk2->set_locale;
+ Gtk3->init;
+ c::init_setlocale();
}
#------------------------------------------------------------------------------
sub init_sizes {
my ($o) = @_;
- ($::rootwidth, $::rootheight) = (Gtk2::Gdk->screen_width, Gtk2::Gdk->screen_height);
+ ($::rootwidth, $::rootheight) = (Gtk3::Gdk::Screen::width, Gtk3::Gdk::Screen::height);
$::stepswidth = $::rootwidth <= 640 ? 0 : 196;
($::logowidth, $::logoheight) = $::rootwidth <= 640 ? (0, 0) : (800, 75);
($o->{windowwidth}, $o->{windowheight}) = ($::rootwidth - $::stepswidth, $::rootheight);
@@ -228,12 +235,12 @@ sub handle_unsafe_mouse {
sub special_shortcuts {
my (undef, $event) = @_;
- my $d = ${{ $Gtk2::Gdk::Keysyms{F2} => 'screenshot', $Gtk2::Gdk::Keysyms{Home} => 'restart' }}{$event->keyval};
+ my $d = ${{ Gtk3::Gdk::KEY_F2 => 'screenshot', Gtk3::Gdk::KEY_Home => 'restart' }}{$event->keyval};
if ($d eq 'screenshot') {
install::any::take_screenshot($::o);
} elsif ($d eq 'restart' && member('control-mask', @{$event->state}) && member('mod1-mask', @{$event->state})) {
log::l("restarting install");
- ugtk2->exit(0x35);
+ ugtk3->exit(0x35);
}
0;
}
diff --git a/perl-install/install/help/po/sl.po b/perl-install/install/help/po/sl.po
index 7398b7329..ed41d7c41 100644
--- a/perl-install/install/help/po/sl.po
+++ b/perl-install/install/help/po/sl.po
@@ -15,6 +15,7 @@ msgstr ""
"PO-Revision-Date: 2009-10-03 17:02+0200\n"
"Last-Translator: Jure Repinc <jlp@holodeck1.com>\n"
"Language-Team: Slovenian <lugos-slo@lugos.si>\n"
+"Language: sl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -23,7 +24,7 @@ msgstr ""
"n%100==4 ? 2 : 3);\n"
#: ../help.pm:14
-#, fuzzy, c-format
+#, c-format
msgid ""
"Before continuing, you should carefully read the terms of the license. It\n"
"covers the entire Mageia distribution. If you agree with all the\n"
@@ -198,7 +199,7 @@ msgstr ""
"»drugi najnižji SCSI ID« itd."
#: ../help.pm:88
-#, fuzzy, c-format
+#, c-format
msgid ""
"The Mageia installation is distributed on several CD-ROMs. If a\n"
"selected package is located on another CD-ROM, DrakX will eject the current\n"
@@ -206,7 +207,7 @@ msgid ""
"CD at hand, just click on \"%s\", the corresponding packages will not be\n"
"installed."
msgstr ""
-"Namestitev za Mageia je shranjena na več nosilcih.\n"
+"Namestitev za distribucijo Mageia je shranjena na več nosilcih.\n"
"Če je izbrani paket shranjen na drugem nosilcu, bo DrakX izvrgel\n"
"trenutnega in vas pozval, da v pogon vstavite pravi nosilec.\n"
"Če pravega nosilca nimate, kliknite »%s« in paketi z njega ne\n"
@@ -271,7 +272,7 @@ msgid ""
"megabytes."
msgstr ""
"Sedaj je čas za izbiro programov, ki jih želite namestiti na sistem.\n"
-"Za Mageia je dostopnih na tisoče različnih programskih paketov.\n"
+"Za distribucijo Mageia je dostopnih na tisoče različnih programskih paketov.\n"
"Da bi bilo upravljanje s paketi bolj preprosto, so razvrščeni v skupine\n"
"vsebinsko povezanih paketov.\n"
"\n"
@@ -345,7 +346,7 @@ msgid "Truly minimal install"
msgstr "Zares minimalna namestitev"
#: ../help.pm:152
-#, fuzzy, c-format
+#, c-format
msgid ""
"If you choose to install packages individually, the installer will present\n"
"a tree containing all packages classified by groups and subgroups. While\n"
@@ -394,7 +395,7 @@ msgstr ""
"boste morali namestitev takšnega paketa na izrecno vprašanje\n"
"potrditi. Mageia namreč kot privzeto vključi vse\n"
" nameščene storitve ob zagonu sistema. Čeprav ob izdaji\n"
-"te različice Mageiaa ni bilo znanih težav v zvezi z varnostjo,\n"
+"te različice Mageia ni bilo znanih težav v zvezi z varnostjo,\n"
"je mogoče, da so bile odkrite varnostne luknje kasneje. Če za \n"
"določeno storitev ne veste, kaj je njena naloga, kliknite »%s« S klikom\n"
"na »%s«bodo nameščene naštete storitve, sistem pa jih bo samodejno\n"
@@ -525,7 +526,7 @@ msgstr ""
"vašim potrebam."
#: ../help.pm:234
-#, fuzzy, c-format
+#, c-format
msgid ""
"X (for X Window System) is the heart of the GNU/Linux graphical interface\n"
"on which all the graphical environments (KDE, GNOME, AfterStep,\n"
@@ -584,7 +585,7 @@ msgid ""
"not successful in getting the display configured."
msgstr ""
"X (okenski sistem X) je srce grafičnega vmesnika za GNU/Linux\n"
-"na katerega se zanašajo vsa v Mageia vključena grafična\n"
+"na katerega se zanašajo vsa v distribucijo Mageia vključena grafična\n"
"okolja. (KDE, GNOME, AfterStep, WindowMaker ...)\n"
"\n"
"Prikazal se vam bo seznam različnih vrednosti, ki jih lahko spreminjate,\n"
@@ -696,7 +697,7 @@ msgstr ""
"ali če vam ni uspelo nastaviti zaslona, označite »%s«."
#: ../help.pm:319
-#, fuzzy, c-format
+#, c-format
msgid ""
"You now need to decide where you want to install the Mageia\n"
"operating system on your hard disk drive. If your hard disk drive is empty or if an\n"
@@ -928,7 +929,7 @@ msgid "Save packages selection"
msgstr "Shrani izbor paketov"
#: ../help.pm:408
-#, fuzzy, c-format
+#, c-format
msgid ""
"If you chose to reuse some legacy GNU/Linux partitions, you may wish to\n"
"reformat some of them and erase any data they contain. To do so, please\n"
@@ -972,7 +973,7 @@ msgstr ""
"preveri poškodovane bloke."
#: ../help.pm:437
-#, fuzzy, c-format
+#, c-format
msgid ""
"By the time you install Mageia, it's likely that some packages will\n"
"have been updated since the initial release. Bugs may have been fixed,\n"
@@ -987,7 +988,7 @@ msgid ""
"the selected package(s), or \"%s\" to abort."
msgstr ""
"Verjetno so bili od njegove izdaje pa do časa, ko nameščate\n"
-"Mageia na svoj računalnik, nekateri paketi popravljeni\n"
+"distribucijo Mageia na svoj računalnik, nekateri paketi popravljeni\n"
"ali nadgrajeni z varnostnimi popravki ali z odstranitvijo hroščev.\n"
"Te popravke lahko prenesete z interneta. Če imate vzpostavljeno\n"
"internetno povezavo, označite »%s«, če pa želite namestiti\n"
@@ -999,7 +1000,7 @@ msgstr ""
"Če tega ne želite, pritisnite »%s«."
#: ../help.pm:450
-#, fuzzy, c-format
+#, c-format
msgid ""
"At this point, DrakX will allow you to choose the security level you desire\n"
"for your machine. As a rule of thumb, the security level should be set\n"
@@ -1033,7 +1034,7 @@ msgid "Security Administrator"
msgstr "Upravitelj varnostnih nastavitev"
#: ../help.pm:464
-#, fuzzy, c-format
+#, c-format
msgid ""
"At this point, you need to choose which partition(s) will be used for the\n"
"installation of your Mageia system. If partitions have already been\n"
@@ -1170,7 +1171,7 @@ msgstr ""
"Vse nadaljnje informacije o datotečnih sistemih boste našli v\n"
"dokumentaciji.\n"
"\n"
-"Če Mageia nameščate na PPC računalnik, morate ustvariti\n"
+"Če distribucijo Mageia nameščate na PPC računalnik, morate ustvariti\n"
"zagonski »bootstrap« razdelek z velikostjo najmanj 1MB, ki ga\n"
"uporablja zagonski nalagalnik yaboot. Če ta razdelek nekoliko\n"
"povečate in mu namenite vsaj 50MB, boste nanj lahko shranjevali\n"
@@ -1212,7 +1213,7 @@ msgid "Toggle between normal/expert mode"
msgstr "Preklopi med normalnim in izvedenskim načinom"
#: ../help.pm:536
-#, fuzzy, c-format
+#, c-format
msgid ""
"More than one Microsoft partition has been detected on your hard disk drive.\n"
"Please choose the one which you want to resize in order to install your new\n"
@@ -1287,7 +1288,7 @@ msgstr ""
"kliknite »%s« za prikaz celotnega seznama držav."
#: ../help.pm:572
-#, fuzzy, c-format
+#, c-format
msgid ""
"This step is activated only if an existing GNU/Linux partition has been\n"
"found on your machine.\n"
@@ -1367,7 +1368,7 @@ msgstr ""
"preklapljanje med latiničnim in ne-latiničnim razporedom tipkovnice."
#: ../help.pm:612
-#, fuzzy, c-format
+#, c-format
msgid ""
"The first step is to choose your preferred language.\n"
"\n"
@@ -1584,7 +1585,7 @@ msgstr ""
"To možnost izberite samo, če zares veste, kaj delate. "
#: ../help.pm:745
-#, fuzzy, c-format
+#, c-format
msgid ""
"Now, it's time to select a printing system for your computer. Other\n"
"operating systems may offer you one, but Mageia offers two. Each of\n"
@@ -1841,7 +1842,7 @@ msgid "Graphical Interface"
msgstr "Grafična kartica"
#: ../help.pm:861
-#, fuzzy, c-format
+#, c-format
msgid ""
"Choose the hard disk drive you want to erase in order to install your new\n"
"Mageia partition. Be careful, all data on this drive will be lost\n"
@@ -1849,7 +1850,7 @@ msgid ""
msgstr ""
"Izberite trdi disk, ki ga želite izbrisati, da bi dobili prostor za "
"razdelek\n"
-"za Mageia.\n"
+"za distribucijo Mageia.\n"
"Vsi podatki na izbranem disku bodo izbrisani in jih ne bo mogoče\n"
"obnoviti!"
diff --git a/perl-install/install/help/po/tr.po b/perl-install/install/help/po/tr.po
index d8c07201d..e7b24faea 100644
--- a/perl-install/install/help/po/tr.po
+++ b/perl-install/install/help/po/tr.po
@@ -2,30 +2,30 @@
# Copyright (C) 2000,2003 Free Software Foundation, Inc.
# Copyright (c) 2000 Mandriva
# ############################################
-#
# Ömer Fadıl USTA <omer_fad@hotmail.com> , 1999-2003.
# Tuncay YENİAY <tuncayyeniay@mynet.com>,2002.
# Nazmi Savga <nsavga@doruk.net.tr>,2001.
# Durmuş Celep <durmusc_tr@yahoo.com>,2002.
# Erçin EKER <erc.caldera@gmx.net>, 2003.
-#
# #############################################
-#
+# Atilla ÖNTAŞ <tarakbumba@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: DrakX-tr\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2008-09-12 12:22+0200\n"
-"PO-Revision-Date: 2004-09-15 13:35+0200\n"
-"Last-Translator: Ömer Fadıl USTA <omer_fad@hotmail.com>\n"
-"Language-Team: Turkish <tr@li.org>\n"
+"PO-Revision-Date: 2013-11-28 20:15+0300\n"
+"Last-Translator: Atilla ÖNTAŞ <tarakbumba@gmail.com>\n"
+"Language-Team: Mageia Turkish Translation Team <i18n-tr@ml.mageia.org>\n"
+"Language: tr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Virtaal 0.7.1\n"
#: ../help.pm:14
-#, fuzzy, c-format
+#, c-format
msgid ""
"Before continuing, you should carefully read the terms of the license. It\n"
"covers the entire Mageia distribution. If you agree with all the\n"
@@ -33,13 +33,12 @@ msgid ""
"button will reboot your computer."
msgstr ""
"Devam etmeden önce lisans koşullarını dikkatle okumalısınız. Lisans tüm\n"
-"Mageia dağıtımını kapsar, bu koşullarını tamamını kabul "
-"ediyorsanız,\n"
+"Mageia dağıtımını kapsar, bu koşullarını tamamını kabul ediyorsanız,\n"
"\"%s\" kutusunu işaretleyiniz aksi halde \"%s\" tuşuna tıklayarak\n"
"makinenizi yeniden başlatabilirsiniz."
#: ../help.pm:20
-#, fuzzy, c-format
+#, c-format
msgid ""
"GNU/Linux is a multi-user system which means each user can have his or her\n"
"own preferences, own files and so on. But unlike \"root\", who is the\n"
@@ -78,49 +77,62 @@ msgid ""
"security), choose the desired user and window manager, then click on\n"
"\"%s\". If you're not interested in this feature, uncheck the \"%s\" box."
msgstr ""
-"GNU/Linux çok kullanıcılı bir sistemdir, yani her kullanıcının kendi\n"
-"tercihleri, kendi dosyaları, v.s. olabilir. Daha fazla bilgi edinmek için\n"
-"\"Kullanıcı Kılavuzu\"nu okuyunuz. Sistem Yöneticisi olan \"root\" dışındaki "
-"kullanıcılar kendi dosyaları ve yapılandırmaları dışında hiçbir\n"
-"şeyi değiştiremezler. Kendiniz için en az bir normal kullanıcı "
-"oluşturmalısınız.\n"
-"Bu hesabı sıradan işler için kullanacaksınız. Sisteminizi \"root\" olarak\n"
-"kullanmak çok pratik gibi görünse de aslında çok tehlikelidir. En küçük bir\n"
-"yanlışlık sisteminizin çalışmamasıyla sonuçlanabilir. Ama normal kullanıcı\n"
-"olarak bir sürü yanlış da yapsanız sadece kendi bilgilerinize zarar vermiş\n"
-"olursunuz, sisteminize zarar veremezsiniz.\n"
-"\n"
-"İl alan gerçek isminizi girmeniz içindir. Tabii ki sorunlu değildir, "
-"herhangi bir\n"
-"şey yazabilirsiniz. DrakX bu bölüme ilk girdiğiniz kelimeyi \"%s\" bölümüne\n"
-"kopyalayacak ki bu sisteme giriş için kullanılacak kullanıcı adıdır. "
-"İsterseniz\n"
-"kullanıcı adını değiştirebilirsiniz. Sonra buraya bir parola gireceksiniz. "
-"Bir\n"
-"normal kullanıcının parolası \"root\" parolası kadar önemli değildir.\n"
-"Fakat bu boş yada basit bir şifre kullanmak için bir gerekçe değildir,\n"
-"sonuç olarak kişisel dosyalarınızı tehlikeye atmış olursunuz.\n"
-"\n"
-"\"%s\"e tıklayarak ile kullanıcı için öntanımlı \"kabuk\"u "
-"değiştirebilirsiniz\n"
-"(öntanımlı olan bash'dir).\n"
-"\n"
-"Kullanıcı eklemeyi tamamladıktan sonra, sistem açıldıktan sonra otomatik\n"
-"giriş yapılacak kullanıcı sorulacaktır. Eğer bu konu ile ilgileniyorsanızı "
-"(ve\n"
-"yerel güvenliğe önem vermiyorsanız), istediğiniz kullanıcıyı ve pencere\n"
-"yöneticisini seçin ve \"%s\"e tıklayın. Eğer bu konu ilginizi çekmiyorsa\n"
-"\"%s\" seçimini kaldırın ve devam edin."
+"GNU/Linux, her kullanıcının kendi ayarlarına, kendi dosyalarına v.b. sahip "
+"olabileceği çok kullanıcılı bir\n"
+"sistemdir. Sistem yöneticisi olan \"kök\" aksine bu noktada eklediğiniz "
+"kullanıcılar kendi\n"
+"dosyaları ve ve kendi yapılandırmaları haricinde herhangi bir şeyi "
+"değiştirme yetkisine sahip\n"
+"olmayacaklardır ki böylece bir bütün olarak sistem istenmeyen veya zararlı "
+"değişikliklerden korunacaktır.\n"
+"Kendiniz için en azından bir normal kullanıcı oluşturmak zorundasınız -- bu, "
+"günlük olarak kullanacağınız\n"
+"hesap olacaktır. Her ne kadar her şeyi yapabilmek için \"kök\" olarak oturum "
+"açabilmeniz mümkünse de\n"
+"bu işlem çok tehlikeli olabilir! Çok basit bir hata sisteminizin bir daha "
+"işlememesine neden olabilir.\n"
+"Normal bir kullanıcı olarak ciddi bir hata yaparsanız en kötü durumda biraz "
+"veri kaybedersiniz;\n"
+"ama bu, tüm sistemi etkilemeyecektir.\n"
+"\n"
+"İlk alan gerçek adınızı sorar. Elbette, bu zorunlu değildir -- ne isterseniz "
+"onu yazabilirsiniz.\n"
+"DrakX yazdığınız ilk sözcüğü alır ve \"%s\" olarak kopyalar. Bu, kullanıcının "
+"oturum açarken\n"
+"gireceği isimdir. İsterseniz öntanımlı olan kullanıcı ismini "
+"değiştirebilirsiniz. Sonraki adım\n"
+"bir parola girmektir. Güvenlik açısından, bir tam yetkilendirilmemiş "
+"(normal) kullanıcı parolası\n"
+"\"kök\" parolası kadar önemli değildir. Ancak, bunu boş geçmek veya çok basit "
+"belirlemek için\n"
+"bir neden yoktur: sonuçta, risk altına girebilecek olan kendi "
+"dosyalarınızdır.\n"
+"\n"
+"\"%s\" üzerine tıkladığınızda, diğer kullanıcıları da ekleyebilirsiniz. "
+"Arkadaşlarınız, babanız, kardeşiniz v.b.\n"
+"her biri için bir kullanıcı ekleyin. Bitirdiğinizde \"%s\" üzerine tıklayın.\n"
+"\n"
+"\"%s\" düğmesine tıklamak o kullanıcı için öntanımlı \"kabuk\"u değiştirmenizi "
+"sağlayacaktır.\n"
+"(Öntanımılı olan bash kabuktur)\n"
+"\n"
+"Kullanıcıları eklemeyi bitirdiğinizde, bilgisayar başladığında kendiliğinden "
+"oturum açacak kullanıcı\n"
+"sorulacaktır. Bu özelliği kullanmak istiyorsanız (ve yerel güvenlik "
+"endişeniz yoksa) istediğiniz\n"
+"kullanıcıyı ve pencere yöneticisini seçin. Sonra \"%s\" üzerine tıklayın. Bu "
+"özelliği kullanmak istemiyorsanız\n"
+"\"%s\" kutusundaki işareti kaldırın."
#: ../help.pm:54
#, c-format
msgid "User name"
-msgstr ""
+msgstr "Kullanıcı adı"
#: ../help.pm:54
#, c-format
msgid "Accept user"
-msgstr ""
+msgstr "Kullanıcıyı kabul et"
#: ../help.pm:54
#, c-format
@@ -481,7 +493,7 @@ msgstr ""
#: ../help.pm:213
#, c-format
msgid "Hardware clock set to GMT"
-msgstr ""
+msgstr "Donanım saati GMT olarak ayarla"
#: ../help.pm:213
#, c-format
@@ -571,6 +583,12 @@ msgid ""
"monitor connected to your machine. If it is not correct, you can choose\n"
"from this list the monitor which is connected to your computer."
msgstr ""
+"Monitör\n"
+"\n"
+" Normalde kurulum aracı makinenize bağlı olan monitörü kendiliğinden "
+"algılar ve yapılandırır.\n"
+"Doğru ayarlama yapılmamışsa, bilgisayarınıza bağlı olan monitörü bu listeden "
+"seçebilirsiniz."
#: ../help.pm:298
#, c-format
@@ -582,6 +600,13 @@ msgid ""
"able to make changes after the installation). A sample of the chosen\n"
"configuration is shown in the monitor picture."
msgstr ""
+"Çözünürlük\n"
+"\n"
+" Burada ekran kartınız için uygun olan çözünürlükleri ve renk "
+"derinliklerini seçebilirsiniz. İhtiyacınıza\n"
+"en uygun olanını seçin (kurulum sonrasında değişiklik yapabilirsiniz). "
+"Seçilen yapılandırma\n"
+"örneği monitör resminde görüntülenir."
#: ../help.pm:306
#, c-format
@@ -590,9 +615,12 @@ msgid ""
"or without 3D acceleration, you're asked to choose the server which best\n"
"suits your needs."
msgstr ""
+"Ekran kartınız için farklı sunucuların mümkün olduğu durumlarda, 3B "
+"hızlandırma etkin veya devredışı,\n"
+"ihtiyaçlarınıza en uygun sunucuyu seçmeniz istenir."
#: ../help.pm:311
-#, fuzzy, c-format
+#, c-format
msgid ""
"Options\n"
"\n"
@@ -601,15 +629,16 @@ msgid ""
"want to check \"%s\" if your machine is to act as a server, or if you were\n"
"not successful in getting the display configured."
msgstr ""
-"Son olarak açılış sırasında grafik arayüzle başlamak isteyip istemediğiniz\n"
-"sorulacaktır. Yapılandırmanızı denemeyi seçmemiş bile olsanız bu soru yine "
-"de\n"
-"sorulacaktır. Ekranınızı iyi yapılandıramamışsanız ya da makinanızın bir\n"
-"sunucu rolü üstlenmesini seçmişseniz bu soruya \"Hayır\" cevabı vermeniz\n"
-"önerilir."
+"Seçenekler\n"
+"\n"
+" Bu adımlar önyüklemede makinenizin grafiksel arayüze kendiliğinden "
+"geçmesini isteyip istemediğinizi\n"
+"seçmenizi sağlar. Elbette, makineniz bir sunucu olarak çalışacaksa veya "
+"görüntü almayı başaramadıysanız\n"
+"\"%s\" seçeneğini işaretleyebilirsiniz."
#: ../help.pm:319
-#, fuzzy, c-format
+#, c-format
msgid ""
"You now need to decide where you want to install the Mageia\n"
"operating system on your hard disk drive. If your hard disk drive is empty or if an\n"
@@ -672,69 +701,73 @@ msgid ""
"experience. For more instructions on how to use the DiskDrake utility,\n"
"refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."
msgstr ""
-"Bu noktada, Mageia işletim sisteminizi sabit diskinizde\n"
-"nereye kuracağınızı seçmeniz gerekiyor. Diskiniz boşsa, ya da\n"
-"halihazırda bir işletim sistemi diskin tamamını kullanıyorsa\n"
-"diski bölümlendirmeniz gerekmektedir. Temel olarak, bir diski\n"
-"bölümlendirmek, Mageia sistemini kurabilmek için onu\n"
-"mantıksal olarak bölmek ve böylece boş alan oluşturmak anlamına\n"
+"Bu noktada, Mageia işletim sisteminizi sabit diskinizde nereye kuracağınızı "
+"seçmeniz\n"
+"gerekiyor. Diskiniz boşsa, ya da halihazırda bir işletim sistemi diskin "
+"tamamını kullanıyorsa\n"
+"diski bölümlendirmeniz gerekmektedir. Temel olarak, bir diski "
+"bölümlendirmek, Mageia sistemini\n"
+"kurabilmek için onu mantıksal olarak bölmek ve böylece boş alan oluşturmak "
+"anlamına\n"
"gelir.\n"
"\n"
-"Bölümlendirme işlemi gerellikle geri alınamaz ve zaten kurulu bir\n"
-"işletim sisteminiz var ise bilgi kaybına yol açabilir. Bu işlem, eğer\n"
-"tecrübesizseniz, korkutucu ve stresli bir iş olabilir. Mageia,\n"
-"bu işlemi oldukça kolaylaştıran bir sihirbaz sunmaktadır.Başlamadan\n"
-"önce lütfen aşağıdaki okumak için zaman ayrın.\n"
+"Bölümlendirme işlemi genellikle geri alınamaz ve zaten kurulu bir işletim "
+"sisteminiz var ise bilgi kaybına yol\n"
+"açabilir. Bu işlem, eğer tecrübesizseniz, korkutucu ve stresli bir iş "
+"olabilir. Şansınıza, DrakX bu işlemi\n"
+"oldukça kolaylaştıran bir sihirbaz sunmaktadır.Başlamadan önce lütfen "
+"aşağıdaki okumak için zaman ayrın.\n"
"\n"
-"Sabit disk yapınıza bağlı olarak, birkaç seçenek mevcut: \n"
+"Sabit disk yapınıza bağlı olarak, birkaç seçenek mevcuttur: \n"
"\n"
-" * \"%s\": bu seçenek boş sabit disk(ler)iniz üzerinde otomatik "
-"bölümlendirme\n"
-"gerçeklerştirir. Bu seçeneği seçerseniz konu hakkında soru sorulmayacak\n"
+" * \"%s\": Bu seçenek boş sabit disk(ler)iniz üzerinde otomatik bölümlendirme "
+"gerçekleştirir. Bu seçeneği\n"
+"seçerseniz konu hakkında soru sorulmayacaktır.\n"
"\n"
-" * \"%s\" sihirbaz sabit diskiniz üstünde bir ya da daha fazla Linux bölümü\n"
-"buldu. Eğer bunları kullanmak istiyorsanız bu seçeneği kullanın. Sonra ki\n"
-"adımda bu bölümler ile ilişkili bağlama noktaları seçmeniz istenecek.\n"
+" * \"%s\": Sihirbaz sabit diskiniz üstünde bir ya da daha fazla Linux bölümü "
+"buldu. Bunları kullanmak istiyorsanız\n"
+"bu seçeneği kullanın. Sonraki adımda bu bölümler ile ilişkili bağlama "
+"noktaları seçmeniz istenecektir.\n"
"Bağlama noktaları öntanımlı olarak seçilir ve genellikle olduğu gibi "
-"bırakmak\n"
-"en iyisidir.\n"
-"\n"
-" * \"%s\": eğer sisteminizde Microsoft Windows kurulu ve tük disk "
-"kapasitesini\n"
-"kullanıyorsa Linux'un kullanabilmesi için yer açmanız gerekecektir. Bunun "
-"için,\n"
-"Microsoft Window disk bölümünü ve bilgileri silebilir (``Tüm Diski Sil''e "
-"bakın)\n"
-"yada Microsoft Windows FAT bölümünüzü yeniden boyutlandırabilirsiniz. Bu\n"
-"işlem sırasında eğer Windows bölümünüzü birleştirmiş ve biçimi FAT ise\n"
-"herhangi bir veri kaybı yaşamazsınız. Verilerinizi yedeklemeniz şiddetle "
-"önerilir.\n"
-"Eğer aynı bilgisayarda hem Mageia hem de Windows kullanamk\n"
-"istiyorsanız bu seçeneği seçmeniz önerilir.\n"
-"\n"
-" Bu seçeneği seçmeden önce unutmayın ki işlem tamamlandığında Microsoft\n"
-"Windows disk bölümünüz küçülmüş olacak. Yeni yazılımları yüklemek ya da "
-"kişisel\n"
-"verilerinizi saklamak için Microsoft Windows altında daha az boş alanınız "
-"olacak.\n"
-"\n"
-" * \"%s\": Sabit diskinizde bulunan tüm bilgileri silmek ve yeni bir "
-"Mageia\n"
-"kurulumu yapmak için bu seçeneği seçin. Lütfen bu seçeneği kullanırken "
-"dikkatli\n"
-"olun, çünkü onayladıktan sonra geri alma şansınız bulunmuyor.\n"
-"\n"
-" !! Eğer bu seçeneği seçerseniz sabit diskinizdeki tüm bilgi "
-"silinecektir. !!\n"
-"\n"
-" * \"%s\": Bu seçenek tüm sabit diski silecek ve disk bölümlerini baştan "
-"oluşturacak.\n"
-"Diskinizdeki tüm bilgiler silinecektir.\n"
-"\n"
-" !! Eğer bu seçeneği seçerseniz sabit diskinizdeki tüm bilgileri "
-"kaybedeceksiniz. !!\n"
-"\n"
-" * \"%s\": Sabit diskinizi kendiniz bölümlendirmek istiyorsanız bu seçeneği "
+"bırakmak en iyisidir.\n"
+"\n"
+" * \"%s\": Sisteminizde Microsoft Windows kurulu ve tüm disk alanını "
+"kullanıyorsa GNU/Linux 'un\n"
+"kullanabilmesi için yer açmanız gerekecektir. Bunun için, Microsoft Window "
+"disk bölümünü ve bilgilerini\n"
+"tümüyle silebilir (``Tüm Diski Sil''e bakın) ya da Microsoft Windows FAT "
+"veya NTFS bölümünüzü yeniden\n"
+"boyutlandırabilirsiniz. Bu işlem sırasında eğer Windows bölümünüzü "
+"birleştirmişseniz herhangi bir veri\n"
+"kaybı yaşamazsınız. Verilerinizi yedeklemeniz şiddetle önerilir. Aynı "
+"bilgisayarda hem Mageia hem de\n"
+"Windows kullanmak istiyorsanız bu seçeneği seçmeniz önerilir.\n"
+"\n"
+" Bu seçeneği seçmeden önce unutmayın ki işlem tamamlandığında Microsoft "
+"Windows\n"
+"disk bölümünüz küçülmüş olacak. Yeni yazılımları yüklemek ya da kişisel "
+"verilerinizi saklamak için\n"
+"Microsoft Windows altında daha az boş alanınız olacaktır.\n"
+"\n"
+" * \"%s\": Sabit diskinizde bulunan tüm bilgileri silmek ve yeni bir Mageia "
+"kurulumu yapmak için\n"
+"bu seçeneği seçin. Lütfen bu seçeneği kullanırken dikkatli olun, çünkü "
+"onayladıktan sonra geri alma\n"
+"şansınız bulunmuyor.\n"
+"\n"
+" !! Eğer bu seçeneği seçerseniz sabit diskinizdeki tüm bilgi silinecektir. "
+"!!\n"
+"\n"
+" * \"%s\": Bu seçenek tüm sabit disk alanı Microsoft Windows tarafından "
+"alınmışsa görüntülenir.\n"
+"Bu seçeneği seçmek basitçe disk üzerindeki herşeyi silecek ve en baştan yeni "
+"bir bölümlendirme\n"
+"oluşturacaktır.\n"
+"\n"
+" !! Eğer bu seçeneği seçerseniz sabit diskinizdeki tüm bilgi silinecektir. "
+"!!\n"
+"\n"
+"* \"%s\": Sabit diskinizi kendiniz bölümlendirmek istiyorsanız bu seçeneği "
"seçin.\n"
"Dikkati olun -- oldukça güçlü bir seçenektir ama veri kaybetmek oldukça "
"kolaydır.\n"
@@ -754,7 +787,7 @@ msgstr "Geçerli bölümlendirmeyi kullan"
#: ../help.pm:370
#, c-format
msgid "Use the free space on the Microsoft Windows® partition"
-msgstr ""
+msgstr "Microsoft Windows® bölümündeki boş alan kullanılsın"
#: ../help.pm:370
#, c-format
@@ -799,8 +832,7 @@ msgid ""
"/dev/fd0\"."
msgstr ""
"Buraya kadar geldiyseniz kurulum tamamlanmış ve GNU/Linux sisteminizi\n"
-"kullanmaya hazırsınız demektir. \"TAMAM\" düğmesine tıkladığınızda "
-"sisteminiz\n"
+"kullanmaya hazırsınız demektir. \"TAMAM\" düğmesine tıkladığınızda sisteminiz\n"
"yeniden başlatılacaktır. Hem Windows hem de GNU/Linux kullanımını "
"seçtiyseniz\n"
"makinanızın her açılışında bu sistemlerden biri için tercihinizi\n"
@@ -809,16 +841,14 @@ msgstr ""
"\"Gelişmiş\" düğmesine (Uzman kipinde görünür) tıkladığınızda size iki\n"
"seçenek sunulacaktır:\n"
"\n"
-" * \"Otomatik kurulum disketi oluşturulsun\": yaptığınız kuruluma benzer "
-"bir\n"
+" * \"Otomatik kurulum disketi oluşturulsun\": yaptığınız kuruluma benzer bir\n"
" kurulumu herhangi bir yardım gerekmeksizin otomatik olarak "
"yapılabilmesini\n"
" sağlayacak bir kurulum disketi oluşturabilirsiniz.\n"
"\n"
" Bu seçeneği kullanmaya karar verdiğinizde size iki seçenek sunulacaktır:\n"
"\n"
-" * \"Etkileşimli\": bu sadece disk bölümlemesinin etkileşimli olduğu "
-"yarı\n"
+" * \"Etkileşimli\": bu sadece disk bölümlemesinin etkileşimli olduğu yarı\n"
" otomatik kurulumdur.\n"
"\n"
" * \"Otomatik\": sabit diskin tamamen silinip yeniden yazılması\n"
@@ -831,8 +861,7 @@ msgstr ""
" * \"Paket seçim listesini kaydet\"(*): kurulum sırasında seçtiğiniz\n"
" paketlerin listesi kaydedilir. Bir başka kurulum sırasında disketi\n"
" sürücüye yerleştirdikten sonra [F1] tuşuna bastıktan sonra\n"
-" »linux defcfg=\"floppy\"« yazarak kurulumu yardım ekranına kadar "
-"ilerletin\n"
+" »linux defcfg=\"floppy\"« yazarak kurulumu yardım ekranına kadar ilerletin\n"
"\n"
" (*) Bu seçenek için FAT biçemli bir diskete ihtiyacınız olacak. Bu "
"disketi\n"
@@ -1661,9 +1690,9 @@ msgid ""
msgstr ""
#: ../help.pm:809
-#, fuzzy, c-format
+#, c-format
msgid "TV card"
-msgstr "ISDN kartı"
+msgstr "TV kartı"
#: ../help.pm:809
#, c-format
@@ -1676,7 +1705,7 @@ msgid "Graphical Interface"
msgstr "Grafiksel Arabirim"
#: ../help.pm:861
-#, fuzzy, c-format
+#, c-format
msgid ""
"Choose the hard disk drive you want to erase in order to install your new\n"
"Mageia partition. Be careful, all data on this drive will be lost\n"
@@ -1687,7 +1716,7 @@ msgstr ""
"mümkün olmayacağını unutmayın!"
#: ../help.pm:866
-#, fuzzy, c-format
+#, c-format
msgid ""
"Click on \"%s\" if you want to delete all data and partitions present on\n"
"this hard disk drive. Be careful, after clicking on \"%s\", you will not be able\n"
diff --git a/perl-install/install/install2.pm b/perl-install/install/install2.pm
index 02888ff2c..661f3d4a8 100644
--- a/perl-install/install/install2.pm
+++ b/perl-install/install/install2.pm
@@ -295,15 +295,6 @@ sub exitInstall {
sub start_udev() {
return if fuzzy_pidofs('udevd');
- # Ensure /run is mounted
- mkdir("/run", 0755);
- run_program::run("mount -t tmpfs -o mode=0755,nosuid,nodev tmpfs /run");
-
- # Fake dracut boot (due to checks employed when running dracut during install)
- # as we know that we'll have the needed metadata in udevadm db due to us
- # starting udev nice and early here.
- mkdir_p("/run/initramfs");
-
# Start up udev:
mkdir_p("/run/udev/rules.d");
$ENV{UDEVRULESD} = "/run/udev/rules.d";
@@ -316,7 +307,7 @@ sub start_udev() {
sub stop_udev() {
kill 15, fuzzy_pidofs('udevd');
sleep(2);
- fs::mount::umount($_) foreach '/dev/pts', '/dev/shm', '/run';
+ fs::mount::umount($_) foreach '/dev/pts', '/dev/shm';
}
#-######################################################################################
@@ -424,7 +415,7 @@ sub read_stage1_net_conf() {
#- get stage1 network configuration if any.
log::l('found /tmp/network');
add2hash($o->{net}{network} ||= {}, network::network::read_conf('/tmp/network'));
- if (my ($file) = glob_('/tmp/ifcfg-*')) {
+ if (my ($file) = grep { -f $_ } glob_('/tmp/ifcfg-*')) {
log::l("found network config file $file");
my $l = network::network::read_interface_conf($file);
$o->{net}{ifcfg}{$l->{DEVICE}} ||= $l;
@@ -618,7 +609,7 @@ sub main {
}
$o->{prefix} = $::prefix = $::testing ? "/tmp/test-perl-install" : "/mnt";
- mkdir $::prefix, 0755;
+ mkdir $::prefix, 0755 if ! -d $::prefix;
init_path();
diff --git a/perl-install/install/media.pm b/perl-install/install/media.pm
index ef2ade7fe..5857710a8 100644
--- a/perl-install/install/media.pm
+++ b/perl-install/install/media.pm
@@ -42,11 +42,6 @@ use urpm::media;
our $postinstall_rpms = '';
my %mounted_media;
-sub _free_medium_id {
- my ($media) = @_;
- int(@$media);
-}
-
sub allMediums {
my ($packages) = @_;
diff --git a/perl-install/install/pixmaps/left-background.png b/perl-install/install/pixmaps/left-background.png
index 9bc0dbaf2..63ee79f4c 100644
--- a/perl-install/install/pixmaps/left-background.png
+++ b/perl-install/install/pixmaps/left-background.png
Binary files differ
diff --git a/perl-install/install/share/gdb-inst b/perl-install/install/share/gdb-inst
index 84c2db9bf..d5ab6c6ca 100644
--- a/perl-install/install/share/gdb-inst
+++ b/perl-install/install/share/gdb-inst
@@ -1,2 +1,22 @@
#!/bin/sh
-exec gdb -q --args perl /usr/bin/install2 \ No newline at end of file
+cat <<EOF
+You can now type "run" in order to start the installer from within the debugger.
+If it segfaults, you can:
+- go back to tty2 by pressing Alt+Ctlr+F2.
+- type "gcore" in order to generate a core file
+- type "exit" to go back to the shell.
+- you can then:
+ o either plug a USB key to your physical/virtual machine and copy the
+ core.XXXX file on it
+ o copy it to /mnt if you already passed the partitionning step ;
+ you can later retrieve it from another OS (dual boot) or using guestfish if
+ it's a virtual machine
+
+On a real Mageia system, you can then install the needed debuginfo packages and
+get a proper stack trace with GDB. You would probably need at least the
+following packages:
+ urpmi {glibc,perl{,-Glib,-Gtk2},glib2.0,gtk+2.0}-debuginfo
+
+
+EOF
+exec gdb -q --args perl /usr/bin/install2
diff --git a/perl-install/install/share/list.xml b/perl-install/install/share/list.xml
index af18e5962..1ca4f80cf 100644
--- a/perl-install/install/share/list.xml
+++ b/perl-install/install/share/list.xml
@@ -92,6 +92,24 @@
95-dm-notify.rules
</from>
+<from dir="/usr/LIB/girepository-1.0">
+ Atk-1.0.typelib
+ cairo-1.0.typelib
+ Gdk-3.0.typelib
+ GdkPixbuf-2.0.typelib
+ GdkX11-3.0.typelib
+ Gio-2.0.typelib
+ GLib-2.0.typelib
+ GModule-2.0.typelib
+ GObject-2.0.typelib
+ Gtk-3.0.typelib
+ JavaScriptCore-3.0.typelib <!-- needed by WebKit-3.0.typelib -->
+ Pango-1.0.typelib
+ Soup-2.4.typelib <!-- needed by WebKit-3.0.typelib -->
+ WebKit-3.0.typelib
+ xlib-2.0.typelib
+</from>
+
<from dir="/usr/LIB/xorg/modules">
drivers/fbdev_drv.so
drivers/vesa_drv.so
@@ -142,7 +160,7 @@
*/LC_MESSAGES/draksnapshot.mo
*/LC_MESSAGES/drakx-net.mo
*/LC_MESSAGES/drakx-kbd-mouse-x11.mo
- */LC_MESSAGES/gtk20.mo
+ */LC_MESSAGES/gtk30.mo
*/LC_MESSAGES/urpmi.mo
</from>
</to>
@@ -170,6 +188,9 @@
<!-- needed by dmraid -->
libdmraid-events-isw.so
+
+ <!-- needed fro Gtk3-WebKit -->
+ libwebkitgtk-3.0.so.0
</from>
</filter>
@@ -181,11 +202,22 @@
/etc/passwd
/etc/protocols
/etc/rpm/macros.d/20common.macros
+
+ <!-- for gtk+3 that needs dbus to be initialized -->
+ <from dir="share">
+ <to dir="/etc">
+ <!-- abusing '<from expand="command">' -->
+ <from expand="command">
+ dbus-uuidgen > share/machine-id; echo machine-id
+ </from>
+ </to>
+ </from>
+
<!-- /usr/share/X11/XKeysymDB -->
/etc/pango/ARCH/pango.modules
/usr/LIB/libgdk_pixbuf-2.0.so.0
- /usr/LIB/gtk-2.0/*/immodules/im-cedilla.so
- /usr/LIB/gtk-2.0/*/engines/liboxygen-gtk.so
+ /usr/LIB/gtk-3.0/*/immodules/im-cedilla.so
+ /usr/LIB/gtk-3.0/*/theming-engines/liboxygen-gtk.so
/usr/share/mime/mime.cache
/usr/lib/libDrakX/keyboard.pm
@@ -208,8 +240,9 @@
/sbin/mount.ntfs-3g <!-- cannot be expanded as binary, not executable for all users -->
/sbin/blkid
- /usr/bin/drakx-matchbox-window-manager
- /usr/share/matchbox/mbnoapp.xpm
+ /usr/bin/mutter
+
+ /usr/share/icons/gnome/scalable/status/dialog-warning-symbolic.svg
/etc/pki/tls/certs/ca-bundle.crt
@@ -227,6 +260,7 @@
/usr/LIB/python2.7/_abcoll.py
/usr/LIB/python2.7/abc.py
/usr/LIB/python2.7/codecs.py
+ /usr/LIB/python2.7/collections.py
/usr/LIB/python2.7/config/Makefile
/usr/LIB/python2.7/copy.py
/usr/LIB/python2.7/copy_reg.py
@@ -234,7 +268,11 @@
/usr/LIB/python2.7/encodings/__init__.py
/usr/LIB/python2.7/encodings/utf_8.py
/usr/LIB/python2.7/genericpath.py
+ /usr/LIB/python2.7/heapq.py
+ /usr/LIB/python2.7/keyword.py
+ /usr/LIB/python2.7/lib-dynload/_collections.so
/usr/LIB/python2.7/lib-dynload/itertools.so
+ /usr/LIB/python2.7/lib-dynload/operator.so
/usr/LIB/python2.7/linecache.py
/usr/LIB/python2.7/os.py
/usr/LIB/python2.7/posixpath.py
@@ -246,37 +284,22 @@
/usr/LIB/python2.7/sre_parse.py
/usr/LIB/python2.7/stat.py
/usr/LIB/python2.7/sysconfig.py
+ /usr/LIB/python2.7/_sysconfigdata.py
/usr/LIB/python2.7/traceback.py
/usr/LIB/python2.7/types.py
/usr/LIB/python2.7/UserDict.py
/usr/LIB/python2.7/warnings.py
/usr/LIB/python2.7/weakref.py
/usr/LIB/python2.7/_weakrefset.py
- /usr/share/gdb/python/gdb/backtrace.py
- /usr/share/gdb/python/gdb/command/backtrace.py
- /usr/share/gdb/python/gdb/command/ignore_errors.py
- /usr/share/gdb/python/gdb/command/__init__.py
- /usr/share/gdb/python/gdb/command/pahole.py
- /usr/share/gdb/python/gdb/command/pretty_printers.py
- /usr/share/gdb/python/gdb/command/require.py
- /usr/share/gdb/python/gdb/command/upto.py
- /usr/share/gdb/python/gdb/FrameIterator.py
- /usr/share/gdb/python/gdb/FrameWrapper.py
- /usr/share/gdb/python/gdb/function/caller_is.py
- /usr/share/gdb/python/gdb/function/__init__.py
- /usr/share/gdb/python/gdb/function/in_scope.py
- /usr/share/gdb/python/gdb/__init__.py
+ <from expand="glob">
+ /usr/share/gdb/python/gdb/*
+ </from>
</if>
<from expand="glob">
- <!-- needed by matchbox -->
- <from spaces_in_filename="1">
- /usr/share/themes/Ia Ora*/matchbox/*
- </from>
/usr/share/themes/oxygen-gtk*
/usr/LIB/gdk-pixbuf-2.0/*/loaders.cache
/usr/LIB/gdk-pixbuf-2.0/*/loaders/libpixbufloader-png.so
- /etc/gtk-2.0/gtk.immodules.*
/etc/brltty/*.ttb
/etc/brltty/*.txt
/LIB/brltty/libbrlttyb??.so
@@ -464,7 +487,6 @@
</from>
<from expand="perl">
- packdrake.pm
Config/IniFiles.pm
MDV/Distribconf.pm
MDV/Packdrakeng.pm
@@ -473,6 +495,7 @@
Parse/EDID.pm
String/ShellQuote.pm
XML/SAX/Exception.pm
+ ARCH-linux-thread-multi/Cairo.pm
ARCH-linux-thread-multi/List/MoreUtils.pm
ARCH-linux-thread-multi/Term/ReadKey.pm
ARCH-linux-thread-multi/XML/LibXML.pm
@@ -484,6 +507,7 @@
ARCH-linux-thread-multi/XML/LibXML/Boolean.pm
ARCH-linux-thread-multi/XML/LibXML/Literal.pm
ARCH-linux-thread-multi/XML/LibXML/Number.pm
+ ARCH-linux-thread-multi/auto/Cairo/Cairo.so
ARCH-linux-thread-multi/auto/Term/ReadKey/ReadKey.so
ARCH-linux-thread-multi/auto/XML/LibXML/LibXML.so
urpm.pm
@@ -525,10 +549,12 @@
perl-File-FnMatch
perl-File-Sync
perl-Filesys-Df
+ perl-Cairo-GObject
perl-Clone
perl-Glib
- perl-Gtk2
- perl-Gtk2-WebKit
+ perl-Glib-Object-Introspection
+ perl-Gtk3
+ perl-Gtk3-WebKit
perl-Locale-gettext
perl-MDK-Common
perl-Pango
@@ -549,7 +575,6 @@
<from dir="../../tools">
<to dir="/usr/bin" flatten="on">
serial_probe/serial_probe
- xhost+
</to>
</from>
@@ -587,13 +612,10 @@
</to>
</from>
-<from dir="share">
- <to dir="/etc/gtk-2.0/">
- gtkrc
- </to>
+<from dir="/etc/gtk-3.0/">
+ settings.ini
</from>
-
<from dir="pixmaps">
<to dir="/usr/share">
<from expand="glob">
diff --git a/perl-install/install/share/po/.tx/config b/perl-install/install/share/po/.tx/config
new file mode 100644
index 000000000..09c565420
--- /dev/null
+++ b/perl-install/install/share/po/.tx/config
@@ -0,0 +1,8 @@
+[main]
+host = https://www.transifex.com
+
+[mageia.drakx_install]
+file_filter = <lang>.po
+source_file = DrakX.pot
+source_lang = en
+type = PO
diff --git a/perl-install/install/share/po/DrakX.pot b/perl-install/install/share/po/DrakX.pot
index 3b49afc86..aebca3526 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: 2013-05-03 10:51+0200\n"
+"POT-Creation-Date: 2013-11-03 12:08+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"
@@ -74,7 +74,7 @@ msgid "Do you have further supplementary media?"
msgstr ""
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:113
+#: any.pm:114
#, c-format
msgid ""
"The following media have been found and will be used during install: %s.\n"
@@ -83,177 +83,177 @@ msgid ""
"Do you have a supplementary installation medium to configure?"
msgstr ""
-#: any.pm:121
+#: any.pm:122
#, c-format
msgid "CD-ROM"
msgstr ""
-#: any.pm:122
+#: any.pm:123
#, c-format
msgid "Network (HTTP)"
msgstr ""
-#: any.pm:123
+#: any.pm:124
#, c-format
msgid "Network (FTP)"
msgstr ""
-#: any.pm:124
+#: any.pm:125
#, c-format
msgid "Network (NFS)"
msgstr ""
-#: any.pm:171
+#: any.pm:173
#, c-format
msgid "URL of the mirror?"
msgstr ""
-#: any.pm:177
+#: any.pm:179
#, c-format
msgid "URL must start with ftp:// or http://"
msgstr ""
-#: any.pm:188
+#: any.pm:190
#, c-format
msgid "Contacting %s web site to get the list of available mirrors..."
msgstr ""
-#: any.pm:193
+#: any.pm:195
#, c-format
msgid "Failed contacting %s web site to get the list of available mirrors"
msgstr ""
-#: any.pm:203
+#: any.pm:205
#, c-format
msgid "Choose a mirror from which to get the packages"
msgstr ""
-#: any.pm:233
+#: any.pm:235
#, c-format
msgid "NFS setup"
msgstr ""
-#: any.pm:234
+#: any.pm:236
#, c-format
msgid "Please enter the hostname and directory of your NFS media"
msgstr ""
-#: any.pm:238
+#: any.pm:240
#, c-format
msgid "Hostname missing"
msgstr ""
-#: any.pm:239
+#: any.pm:241
#, c-format
msgid "Directory must begin with \"/\""
msgstr ""
-#: any.pm:243
+#: any.pm:245
#, c-format
msgid "Hostname of the NFS mount ?"
msgstr ""
-#: any.pm:244
+#: any.pm:246
#, c-format
msgid "Directory"
msgstr ""
-#: any.pm:266
+#: any.pm:268
#, c-format
msgid "Supplementary"
msgstr ""
-#: any.pm:301
+#: any.pm:303
#, c-format
msgid ""
"Can't find a package list file on this mirror. Make sure the location is "
"correct."
msgstr ""
-#: any.pm:317
+#: any.pm:319
#, c-format
msgid "Core Release"
msgstr ""
-#: any.pm:319
+#: any.pm:321
#, c-format
msgid "Tainted Release"
msgstr ""
-#: any.pm:321
+#: any.pm:323
#, c-format
msgid "Nonfree Release"
msgstr ""
-#: any.pm:335
+#: any.pm:351
#, c-format
msgid ""
"Some hardware on your machine needs some non free firmwares in order for the "
"free software drivers to work."
msgstr ""
-#: any.pm:336
+#: any.pm:352
#, c-format
msgid "You should enable \"%s\""
msgstr ""
-#: any.pm:355
+#: any.pm:377
#, c-format
msgid "\"%s\" contains the various pieces of the systems and its applications"
msgstr ""
-#: any.pm:356
+#: any.pm:378
#, c-format
msgid "\"%s\" contains non free software.\n"
msgstr ""
-#: any.pm:357
+#: any.pm:379
#, c-format
msgid ""
"It also contains firmwares needed for certain devices to operate (eg: some "
"ATI/AMD graphic cards, some network cards, some RAID cards, ...)"
msgstr ""
-#: any.pm:358
+#: any.pm:380
#, c-format
msgid ""
"\"%s\" contains software that can not be distributed in every country due to "
"software patents."
msgstr ""
-#: any.pm:359
+#: any.pm:381
#, c-format
msgid ""
"It also contains software from \"%s\" rebuild with additional capabilities."
msgstr ""
-#: any.pm:363
+#: any.pm:387
#, c-format
msgid "Here you can enable more media if you want."
msgstr ""
-#: any.pm:378
+#: any.pm:404
#, c-format
msgid "This medium provides package updates for medium \"%s\""
msgstr ""
-#: any.pm:451
+#: any.pm:480
#, c-format
msgid "Looking at packages already installed..."
msgstr ""
-#: any.pm:485
+#: any.pm:514
#, c-format
msgid "Finding packages to upgrade..."
msgstr ""
-#: any.pm:498
+#: any.pm:527
#, c-format
msgid "Removing packages prior to upgrade..."
msgstr ""
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:713
+#: any.pm:743
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -262,72 +262,72 @@ msgid ""
"Do you really want to remove these packages?\n"
msgstr ""
-#: any.pm:932
+#: any.pm:962
#, c-format
msgid "Error reading file %s"
msgstr ""
-#: any.pm:1140
+#: any.pm:1170
#, c-format
msgid "The following disk(s) were renamed:"
msgstr ""
-#: any.pm:1142
+#: any.pm:1172
#, c-format
msgid "%s (previously named as %s)"
msgstr ""
-#: any.pm:1199
+#: any.pm:1229
#, c-format
msgid "HTTP"
msgstr ""
-#: any.pm:1199
+#: any.pm:1229
#, c-format
msgid "FTP"
msgstr ""
-#: any.pm:1199
+#: any.pm:1229
#, c-format
msgid "NFS"
msgstr ""
-#: any.pm:1218 steps_interactive.pm:970
+#: any.pm:1248 steps_interactive.pm:973
#, c-format
msgid "Network"
msgstr ""
-#: any.pm:1222
+#: any.pm:1252
#, c-format
msgid "Please choose a media"
msgstr ""
-#: any.pm:1238
+#: any.pm:1268
#, c-format
msgid "File already exists. Overwrite it?"
msgstr ""
-#: any.pm:1242
+#: any.pm:1272
#, c-format
msgid "Permission denied"
msgstr ""
-#: any.pm:1290
+#: any.pm:1320
#, c-format
msgid "Bad NFS name"
msgstr ""
-#: any.pm:1311
+#: any.pm:1341
#, c-format
msgid "Bad media %s"
msgstr ""
-#: any.pm:1355
+#: any.pm:1385
#, c-format
msgid "Cannot make screenshots before partitioning"
msgstr ""
-#: any.pm:1363
+#: any.pm:1393
#, c-format
msgid "Screenshots will be available after install in %s"
msgstr ""
@@ -337,7 +337,7 @@ msgstr ""
msgid "Installation"
msgstr ""
-#: gtk.pm:132 share/meta-task/compssUsers.pl:43
+#: gtk.pm:132 share/meta-task/compssUsers.pl:46
#, c-format
msgid "Configuration"
msgstr ""
@@ -431,262 +431,262 @@ msgid ""
"%s"
msgstr ""
-#: pkgs.pm:382 pkgs.pm:409
+#: pkgs.pm:383 pkgs.pm:410
#, c-format
msgid "An error occurred:"
msgstr ""
-#: pkgs.pm:401
+#: pkgs.pm:402
#, c-format
msgid "A fatal error occurred: %s."
msgstr ""
-#: pkgs.pm:891 pkgs.pm:928
+#: pkgs.pm:896 pkgs.pm:938
#, c-format
msgid "Do not ask again"
msgstr ""
-#: pkgs.pm:907
+#: pkgs.pm:912
#, c-format
msgid "%d installation transactions failed"
msgstr ""
-#: pkgs.pm:908
+#: pkgs.pm:913
#, c-format
msgid "Installation of packages failed:"
msgstr ""
-#: share/meta-task/compssUsers.pl:13
+#: share/meta-task/compssUsers.pl:14
#, c-format
msgid "Workstation"
msgstr ""
-#: share/meta-task/compssUsers.pl:15
+#: share/meta-task/compssUsers.pl:16
#, c-format
msgid "Office Workstation"
msgstr ""
-#: share/meta-task/compssUsers.pl:17
+#: share/meta-task/compssUsers.pl:18
#, c-format
msgid ""
"Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets "
"(LibreOffice Calc, Kspread), PDF viewers, etc"
msgstr ""
-#: share/meta-task/compssUsers.pl:22
+#: share/meta-task/compssUsers.pl:24
#, c-format
msgid "Game station"
msgstr ""
-#: share/meta-task/compssUsers.pl:23
+#: share/meta-task/compssUsers.pl:25
#, c-format
msgid "Amusement programs: arcade, boards, strategy, etc"
msgstr ""
-#: share/meta-task/compssUsers.pl:26
+#: share/meta-task/compssUsers.pl:28
#, c-format
msgid "Multimedia station"
msgstr ""
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:29
#, c-format
msgid "Sound and video playing/editing programs"
msgstr ""
-#: share/meta-task/compssUsers.pl:32
+#: share/meta-task/compssUsers.pl:34
#, c-format
msgid "Internet station"
msgstr ""
-#: share/meta-task/compssUsers.pl:33
+#: share/meta-task/compssUsers.pl:35
#, c-format
msgid ""
"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
"Web"
msgstr ""
-#: share/meta-task/compssUsers.pl:38
+#: share/meta-task/compssUsers.pl:40
#, c-format
msgid "Network Computer (client)"
msgstr ""
-#: share/meta-task/compssUsers.pl:39
+#: share/meta-task/compssUsers.pl:41
#, c-format
msgid "Clients for different protocols including ssh"
msgstr ""
-#: share/meta-task/compssUsers.pl:44
+#: share/meta-task/compssUsers.pl:47
#, c-format
msgid "Tools to ease the configuration of your computer"
msgstr ""
-#: share/meta-task/compssUsers.pl:48
+#: share/meta-task/compssUsers.pl:51
#, c-format
msgid "Console Tools"
msgstr ""
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:52
#, c-format
msgid "Editors, shells, file tools, terminals"
msgstr ""
-#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156
-#: share/meta-task/compssUsers.pl:158
+#: share/meta-task/compssUsers.pl:56 share/meta-task/compssUsers.pl:200
+#: share/meta-task/compssUsers.pl:202
#, c-format
msgid "Development"
msgstr ""
-#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:203
#, c-format
msgid "C and C++ development libraries, programs and include files"
msgstr ""
-#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163
+#: share/meta-task/compssUsers.pl:61 share/meta-task/compssUsers.pl:207
#, c-format
msgid "Documentation"
msgstr ""
-#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
+#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:208
#, c-format
msgid "Books and Howto's on Linux and Free Software"
msgstr ""
-#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167
+#: share/meta-task/compssUsers.pl:66 share/meta-task/compssUsers.pl:211
#, c-format
msgid "LSB"
msgstr ""
-#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:67 share/meta-task/compssUsers.pl:212
#, c-format
msgid "Linux Standard Base. Third party applications support"
msgstr ""
-#: share/meta-task/compssUsers.pl:72
+#: share/meta-task/compssUsers.pl:77
#, c-format
msgid "Web Server"
msgstr ""
-#: share/meta-task/compssUsers.pl:73
+#: share/meta-task/compssUsers.pl:78
#, c-format
msgid "Apache"
msgstr ""
-#: share/meta-task/compssUsers.pl:76
+#: share/meta-task/compssUsers.pl:82
#, c-format
msgid "Groupware"
msgstr ""
-#: share/meta-task/compssUsers.pl:77
+#: share/meta-task/compssUsers.pl:83
#, c-format
msgid "Kolab Server"
msgstr ""
-#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121
+#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl:136
#, c-format
msgid "Firewall/Router"
msgstr ""
-#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
+#: share/meta-task/compssUsers.pl:87 share/meta-task/compssUsers.pl:137
#, c-format
msgid "Internet gateway"
msgstr ""
-#: share/meta-task/compssUsers.pl:84
+#: share/meta-task/compssUsers.pl:90
#, c-format
msgid "Mail/News"
msgstr ""
-#: share/meta-task/compssUsers.pl:85
+#: share/meta-task/compssUsers.pl:91
#, c-format
msgid "Postfix mail server, Inn news server"
msgstr ""
-#: share/meta-task/compssUsers.pl:88
+#: share/meta-task/compssUsers.pl:95
#, c-format
msgid "Directory Server"
msgstr ""
-#: share/meta-task/compssUsers.pl:92
+#: share/meta-task/compssUsers.pl:100
#, c-format
msgid "FTP Server"
msgstr ""
-#: share/meta-task/compssUsers.pl:93
+#: share/meta-task/compssUsers.pl:101
#, c-format
msgid "ProFTPd"
msgstr ""
-#: share/meta-task/compssUsers.pl:96
+#: share/meta-task/compssUsers.pl:105
#, c-format
msgid "DNS/NIS"
msgstr ""
-#: share/meta-task/compssUsers.pl:97
+#: share/meta-task/compssUsers.pl:106
#, c-format
msgid "Domain Name and Network Information Server"
msgstr ""
-#: share/meta-task/compssUsers.pl:100
+#: share/meta-task/compssUsers.pl:110
#, c-format
msgid "File and Printer Sharing Server"
msgstr ""
-#: share/meta-task/compssUsers.pl:101
+#: share/meta-task/compssUsers.pl:111
#, c-format
msgid "NFS Server, Samba server"
msgstr ""
-#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117
+#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl:131
#, c-format
msgid "Database"
msgstr ""
-#: share/meta-task/compssUsers.pl:105
+#: share/meta-task/compssUsers.pl:116
#, c-format
msgid "PostgreSQL and MariaDB Database Server"
msgstr ""
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:121
#, c-format
msgid "Web/FTP"
msgstr ""
-#: share/meta-task/compssUsers.pl:110
+#: share/meta-task/compssUsers.pl:122
#, c-format
msgid "Apache, Pro-ftpd"
msgstr ""
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:126
#, c-format
msgid "Mail"
msgstr ""
-#: share/meta-task/compssUsers.pl:114
+#: share/meta-task/compssUsers.pl:127
#, c-format
msgid "Postfix mail server"
msgstr ""
-#: share/meta-task/compssUsers.pl:118
+#: share/meta-task/compssUsers.pl:132
#, c-format
msgid "PostgreSQL or MariaDB database server"
msgstr ""
-#: share/meta-task/compssUsers.pl:125
+#: share/meta-task/compssUsers.pl:140
#, c-format
msgid "Network Computer server"
msgstr ""
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:141
#, c-format
msgid "NFS server, SMB server, Proxy server, ssh server"
msgstr ""
-#: share/meta-task/compssUsers.pl:132
+#: share/meta-task/compssUsers.pl:148
#, c-format
msgid "Graphical Environment"
msgstr ""
-#: share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:150
#, c-format
msgid "KDE Workstation"
msgstr ""
@@ -703,7 +703,7 @@ msgstr ""
msgid "GNOME Workstation"
msgstr ""
-#: share/meta-task/compssUsers.pl:156
+#: share/meta-task/compssUsers.pl:157 share/meta-task/compssUsers.pl:168
#, c-format
msgid ""
"A graphical environment with user-friendly set of applications and desktop "
@@ -742,22 +742,21 @@ msgstr ""
msgid "LXDE Desktop"
msgstr ""
-#: share/meta-task/compssUsers.pl:146
+#: share/meta-task/compssUsers.pl:179
#, c-format
msgid ""
"A lightweight & fast graphical environment with user-friendly set of "
"applications and desktop tools"
msgstr ""
-#: share/meta-task/compssUsers.pl:177
+#: share/meta-task/compssUsers.pl:183
#, c-format
msgid "RazorQT Desktop"
msgstr ""
#: share/meta-task/compssUsers.pl:185
#, c-format
-msgid ""
-"A less developed lightweight fast graphical environment "
+msgid "A less developed lightweight fast graphical environment"
msgstr ""
#: share/meta-task/compssUsers.pl:188
@@ -767,8 +766,7 @@ msgstr ""
#: share/meta-task/compssUsers.pl:190
#, c-format
-msgid ""
-"A lightweight fast graphical environment with a dedicated following"
+msgid "A lightweight fast graphical environment with a dedicated following"
msgstr ""
#: share/meta-task/compssUsers.pl:193
@@ -781,42 +779,42 @@ msgstr ""
msgid "Window Maker, Fvwm, etc"
msgstr ""
-#: share/meta-task/compssUsers.pl:173
+#: share/meta-task/compssUsers.pl:217
#, c-format
msgid "Utilities"
msgstr ""
-#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176
+#: share/meta-task/compssUsers.pl:219 share/meta-task/compssUsers.pl:220
#, c-format
msgid "SSH Server"
msgstr ""
-#: share/meta-task/compssUsers.pl:180
+#: share/meta-task/compssUsers.pl:224
#, c-format
msgid "Webmin"
msgstr ""
-#: share/meta-task/compssUsers.pl:181
+#: share/meta-task/compssUsers.pl:225
#, c-format
msgid "Webmin Remote Configuration Server"
msgstr ""
-#: share/meta-task/compssUsers.pl:185
+#: share/meta-task/compssUsers.pl:229
#, c-format
msgid "Network Utilities/Monitoring"
msgstr ""
-#: share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:230
#, c-format
msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
msgstr ""
-#: share/meta-task/compssUsers.pl:190
+#: share/meta-task/compssUsers.pl:234
#, c-format
msgid "Mageia Wizards"
msgstr ""
-#: share/meta-task/compssUsers.pl:191
+#: share/meta-task/compssUsers.pl:235
#, c-format
msgid "Wizards to configure server"
msgstr ""
@@ -828,7 +826,7 @@ msgid ""
"Continue at your own risk."
msgstr ""
-#: steps.pm:461
+#: steps.pm:458
#, c-format
msgid ""
"Some important packages did not get installed properly.\n"
@@ -870,276 +868,216 @@ msgstr ""
msgid "Media Selection"
msgstr ""
-#: steps_gtk.pm:252
+#: steps_gtk.pm:251
#, c-format
msgid "Install %s KDE Desktop"
msgstr ""
-#: steps_gtk.pm:253
+#: steps_gtk.pm:252
#, c-format
msgid "Install %s GNOME Desktop"
msgstr ""
-#: steps_gtk.pm:254
-#, c-format
-msgid "Install %s MATE Desktop"
-msgstr ""
-
-#: steps_gtk.pm:255
-#, c-format
-msgid "Install %s Cinnamon Desktop"
-msgstr ""
-
-#: steps_gtk.pm:256
-#, c-format
-msgid "Install %s XFCE Desktop"
-msgstr ""
-
-#: steps_gtk.pm:257
-#, c-format
-msgid "Install %s LXDE Desktop"
-msgstr ""
-
-#: steps_gtk.pm:258
-#, c-format
-msgid "Install %s RazorQT Desktop"
-msgstr ""
-
-#: steps_gtk.pm:259
-#, c-format
-msgid "Install %s E17 Desktop"
-msgstr ""
-
-#: steps_gtk.pm:260
+#: steps_gtk.pm:253
#, c-format
msgid "Custom install"
msgstr ""
-#: steps_gtk.pm:286
+#: steps_gtk.pm:274
#, c-format
msgid "KDE Desktop"
msgstr ""
-#: steps_gtk.pm:287
+#: steps_gtk.pm:275
#, c-format
msgid "GNOME Desktop"
msgstr ""
-#: steps_gtk.pm:288
-#, c-format
-msgid "MATE Desktop"
-msgstr ""
-
-#: steps_gtk.pm:289
-#, c-format
-msgid "Cinnamon Desktop"
-msgstr ""
-
-#: steps_gtk.pm:290
-#, c-format
-msgid "XFCE Desktop"
-msgstr ""
-
-#: steps_gtk.pm:291
-#, c-format
-msgid "LXDE Desktop"
-msgstr ""
-
-#: steps_gtk.pm:292
-#, c-format
-msgid "RazorQT Desktop"
-msgstr ""
-
-#: steps_gtk.pm:293
-#, c-format
-msgid "E17 Desktop"
-msgstr ""
-
-#: steps_gtk.pm:294
+#: steps_gtk.pm:276
#, c-format
msgid "Custom Desktop"
msgstr ""
-#: steps_gtk.pm:300
+#: steps_gtk.pm:282
#, c-format
msgid "Here's a preview of the '%s' desktop."
msgstr ""
-#: steps_gtk.pm:301
+#: steps_gtk.pm:309
#, c-format
msgid "Click on images in order to see a bigger preview"
msgstr ""
-#: steps_gtk.pm:319 steps_interactive.pm:633 steps_list.pm:30
+#: steps_gtk.pm:325 steps_interactive.pm:633 steps_list.pm:30
#, c-format
msgid "Package Group Selection"
msgstr ""
-#: steps_gtk.pm:344 steps_interactive.pm:650
+#: steps_gtk.pm:350 steps_interactive.pm:650
#, c-format
msgid "Individual package selection"
msgstr ""
-#: steps_gtk.pm:351
+#: steps_gtk.pm:357
#, c-format
msgid "Unselect All"
msgstr ""
-#: steps_gtk.pm:370 steps_interactive.pm:562
+#: steps_gtk.pm:376 steps_interactive.pm:562
#, c-format
msgid "Total size: %d / %d MB"
msgstr ""
-#: steps_gtk.pm:415
+#: steps_gtk.pm:421
#, c-format
msgid "Version: "
msgstr ""
-#: steps_gtk.pm:416
+#: steps_gtk.pm:422
#, c-format
msgid "Size: "
msgstr ""
-#: steps_gtk.pm:416
+#: steps_gtk.pm:422
#, c-format
msgid "%d KB\n"
msgstr ""
-#: steps_gtk.pm:417
+#: steps_gtk.pm:423
#, c-format
msgid "Importance: "
msgstr ""
-#: steps_gtk.pm:452
+#: steps_gtk.pm:458
#, c-format
msgid "You cannot select/unselect this package"
msgstr ""
-#: steps_gtk.pm:456
+#: steps_gtk.pm:462
#, c-format
msgid "due to missing %s"
msgstr ""
-#: steps_gtk.pm:457
+#: steps_gtk.pm:463
#, c-format
msgid "due to unsatisfied %s"
msgstr ""
-#: steps_gtk.pm:458
+#: steps_gtk.pm:464
#, c-format
msgid "trying to promote %s"
msgstr ""
-#: steps_gtk.pm:459
+#: steps_gtk.pm:465
#, c-format
msgid "in order to keep %s"
msgstr ""
-#: steps_gtk.pm:464
+#: steps_gtk.pm:470
#, c-format
msgid ""
"You cannot select this package as there is not enough space left to install "
"it"
msgstr ""
-#: steps_gtk.pm:467
+#: steps_gtk.pm:473
#, c-format
msgid "The following packages are going to be installed"
msgstr ""
-#: steps_gtk.pm:468
+#: steps_gtk.pm:474
#, c-format
msgid "The following packages are going to be removed"
msgstr ""
-#: steps_gtk.pm:494
+#: steps_gtk.pm:500
#, c-format
msgid "This is a mandatory package, it cannot be unselected"
msgstr ""
-#: steps_gtk.pm:496
+#: steps_gtk.pm:502
#, c-format
msgid "You cannot unselect this package. It is already installed"
msgstr ""
-#: steps_gtk.pm:498
+#: steps_gtk.pm:504
#, c-format
msgid "You cannot unselect this package. It must be upgraded"
msgstr ""
-#: steps_gtk.pm:502
+#: steps_gtk.pm:508
#, c-format
msgid "Show automatically selected packages"
msgstr ""
-#: steps_gtk.pm:509
+#: steps_gtk.pm:512
#, c-format
msgid "Install"
msgstr ""
-#: steps_gtk.pm:512
+#: steps_gtk.pm:515
#, c-format
msgid "Load/Save selection"
msgstr ""
-#: steps_gtk.pm:513
+#: steps_gtk.pm:516
#, c-format
msgid "Updating package selection"
msgstr ""
-#: steps_gtk.pm:518
+#: steps_gtk.pm:521
#, c-format
msgid "Minimal install"
msgstr ""
-#: steps_gtk.pm:531
+#: steps_gtk.pm:534
#, c-format
msgid "Software Management"
msgstr ""
-#: steps_gtk.pm:531 steps_interactive.pm:443
+#: steps_gtk.pm:534 steps_interactive.pm:443
#, c-format
msgid "Choose the packages you want to install"
msgstr ""
-#: steps_gtk.pm:548 steps_interactive.pm:670 steps_list.pm:32
+#: steps_gtk.pm:551 steps_interactive.pm:670 steps_list.pm:32
#, c-format
msgid "Installing"
msgstr ""
-#: steps_gtk.pm:578
+#: steps_gtk.pm:581
#, c-format
msgid "No details"
msgstr ""
-#: steps_gtk.pm:597
+#: steps_gtk.pm:600
#, c-format
msgid "Time remaining:"
msgstr ""
-#: steps_gtk.pm:598
+#: steps_gtk.pm:601
#, c-format
msgid "(estimating...)"
msgstr ""
-#: steps_gtk.pm:628
+#: steps_gtk.pm:631
#, c-format
msgid "%d package"
msgid_plural "%d packages"
msgstr[0] ""
msgstr[1] ""
-#: steps_gtk.pm:683 steps_interactive.pm:834 steps_list.pm:43
+#: steps_gtk.pm:687 steps_interactive.pm:837 steps_list.pm:43
#, c-format
msgid "Summary"
msgstr ""
-#: steps_gtk.pm:702
+#: steps_gtk.pm:706
#, c-format
msgid "Configure"
msgstr ""
-#: steps_gtk.pm:719 steps_interactive.pm:830 steps_interactive.pm:983
+#: steps_gtk.pm:723 steps_interactive.pm:833 steps_interactive.pm:986
#, c-format
msgid "not configured"
msgstr ""
@@ -1151,7 +1089,7 @@ msgid ""
"If you want to skip some of them, you can unselect them now."
msgstr ""
-#: steps_gtk.pm:778 steps_interactive.pm:349
+#: steps_gtk.pm:782 steps_interactive.pm:349
#, c-format
msgid ""
"You have the option to copy the contents of the CDs onto the hard disk drive "
@@ -1160,7 +1098,7 @@ msgid ""
"available once the system is fully installed."
msgstr ""
-#: steps_gtk.pm:780 steps_interactive.pm:351
+#: steps_gtk.pm:784 steps_interactive.pm:351
#, c-format
msgid "Copy whole CDs"
msgstr ""
@@ -1312,46 +1250,14 @@ msgstr ""
msgid "GNOME"
msgstr ""
-#: steps_interactive.pm:485
-#, c-format
-msgid "MATE"
-msgstr ""
-
-#: steps_interactive.pm:486
-#, c-format
-msgid "CINNAMON"
-msgstr ""
-
#: steps_interactive.pm:487
#, c-format
-msgid "XFCE"
-msgstr ""
-
-#: steps_interactive.pm:488
-#, c-format
-msgid "LXDE"
-msgstr ""
-
-#: steps_interactive.pm:489
-#, c-format
-msgid "RAZOR"
-msgstr ""
-
-#: steps_interactive.pm:490
-#, c-format
-msgid "E17"
-msgstr ""
-
-#: steps_interactive.pm:494
-#, c-format
msgid "Desktop Selection"
msgstr ""
-#: steps_interactive.pm:495
+#: steps_interactive.pm:488
#, c-format
-msgid ""
-"You can choose your workstation desktop profile.\n"
-"Select 'Custom' for more choices."
+msgid "You can choose your workstation desktop profile."
msgstr ""
#: steps_interactive.pm:576
@@ -1470,101 +1376,101 @@ msgid ""
msgstr ""
#. -PO: example: lilo-graphic on /dev/hda1
-#: steps_interactive.pm:878
+#: steps_interactive.pm:881
#, c-format
msgid "%s on %s"
msgstr ""
-#: steps_interactive.pm:910 steps_interactive.pm:917 steps_interactive.pm:930
-#: steps_interactive.pm:947 steps_interactive.pm:962
+#: steps_interactive.pm:913 steps_interactive.pm:920 steps_interactive.pm:933
+#: steps_interactive.pm:950 steps_interactive.pm:965
#, c-format
msgid "Hardware"
msgstr ""
-#: steps_interactive.pm:931 steps_interactive.pm:948
+#: steps_interactive.pm:934 steps_interactive.pm:951
#, c-format
msgid "Sound card"
msgstr ""
-#: steps_interactive.pm:951
+#: steps_interactive.pm:954
#, c-format
msgid "Do you have an ISA sound card?"
msgstr ""
-#: steps_interactive.pm:953
+#: steps_interactive.pm:956
#, c-format
msgid ""
"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
"card"
msgstr ""
-#: steps_interactive.pm:955
+#: steps_interactive.pm:958
#, c-format
msgid "No sound card detected. Try \"harddrake\" after installation"
msgstr ""
-#: steps_interactive.pm:963
+#: steps_interactive.pm:966
#, c-format
msgid "Graphical interface"
msgstr ""
-#: steps_interactive.pm:969 steps_interactive.pm:981
+#: steps_interactive.pm:972 steps_interactive.pm:984
#, c-format
msgid "Network & Internet"
msgstr ""
-#: steps_interactive.pm:982
+#: steps_interactive.pm:985
#, c-format
msgid "Proxies"
msgstr ""
-#: steps_interactive.pm:983
+#: steps_interactive.pm:986
#, c-format
msgid "configured"
msgstr ""
-#: steps_interactive.pm:993
+#: steps_interactive.pm:996
#, c-format
msgid "Security Level"
msgstr ""
-#: steps_interactive.pm:1013
+#: steps_interactive.pm:1016
#, c-format
msgid "Firewall"
msgstr ""
-#: steps_interactive.pm:1017
+#: steps_interactive.pm:1020
#, c-format
msgid "activated"
msgstr ""
-#: steps_interactive.pm:1017
+#: steps_interactive.pm:1020
#, c-format
msgid "disabled"
msgstr ""
-#: steps_interactive.pm:1031
+#: steps_interactive.pm:1034
#, c-format
msgid "You have not configured X. Are you sure you really want this?"
msgstr ""
-#: steps_interactive.pm:1060
+#: steps_interactive.pm:1063
#, c-format
msgid "Preparing bootloader..."
msgstr ""
#. -PO: This is NOT the boot loader!!!!
-#: steps_interactive.pm:1062
+#: steps_interactive.pm:1065
#, c-format
msgid "Preparing initial startup program..."
msgstr ""
-#: steps_interactive.pm:1063
+#: steps_interactive.pm:1066
#, c-format
msgid "Be patient, this may take a while..."
msgstr ""
-#: steps_interactive.pm:1074
+#: steps_interactive.pm:1077
#, c-format
msgid ""
"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1573,24 +1479,24 @@ msgid ""
"root fs is: root=%s"
msgstr ""
-#: steps_interactive.pm:1087
+#: steps_interactive.pm:1090
#, c-format
msgid ""
"In this security level, access to the files in the Windows partition is "
"restricted to the administrator."
msgstr ""
-#: steps_interactive.pm:1119
+#: steps_interactive.pm:1122
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr ""
-#: steps_interactive.pm:1121
+#: steps_interactive.pm:1124
#, c-format
msgid "Creating auto install floppy..."
msgstr ""
-#: steps_interactive.pm:1132
+#: steps_interactive.pm:1135
#, c-format
msgid ""
"Some steps are not completed.\n"
@@ -1598,12 +1504,12 @@ msgid ""
"Do you really want to quit now?"
msgstr ""
-#: steps_interactive.pm:1142
+#: steps_interactive.pm:1145
#, c-format
msgid "Congratulations"
msgstr ""
-#: steps_interactive.pm:1145
+#: steps_interactive.pm:1148
#, c-format
msgid "Reboot"
msgstr ""
diff --git a/perl-install/install/share/po/af.po b/perl-install/install/share/po/af.po
index cdbee19ee..016a7e5fc 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: 2013-05-03 10:51+0200\n"
+"POT-Creation-Date: 2013-11-03 12:08+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"
@@ -78,7 +78,7 @@ msgid "Do you have further supplementary media?"
msgstr "Beskik u oor nog?"
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:113
+#: any.pm:114
#, c-format
msgid ""
"The following media have been found and will be used during install: %s.\n"
@@ -87,177 +87,177 @@ msgid ""
"Do you have a supplementary installation medium to configure?"
msgstr ""
-#: any.pm:121
+#: any.pm:122
#, c-format
msgid "CD-ROM"
msgstr "CDROM"
-#: any.pm:122
+#: any.pm:123
#, fuzzy, c-format
msgid "Network (HTTP)"
msgstr "Netwerk %s"
-#: any.pm:123
+#: any.pm:124
#, fuzzy, c-format
msgid "Network (FTP)"
msgstr "Netwerk %s"
-#: any.pm:124
+#: any.pm:125
#, c-format
msgid "Network (NFS)"
msgstr ""
-#: any.pm:171
+#: any.pm:173
#, c-format
msgid "URL of the mirror?"
msgstr ""
-#: any.pm:177
+#: any.pm:179
#, c-format
msgid "URL must start with ftp:// or http://"
msgstr ""
-#: any.pm:188
+#: any.pm:190
#, c-format
msgid "Contacting %s web site to get the list of available mirrors..."
msgstr "Kontak %s se webwerf vir 'n lys van spieëlwebplekke...."
-#: any.pm:193
+#: any.pm:195
#, fuzzy, c-format
msgid "Failed contacting %s web site to get the list of available mirrors"
msgstr "Kontak %s se webwerf vir 'n lys van spieëlwebplekke...."
-#: any.pm:203
+#: any.pm:205
#, 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:233
+#: any.pm:235
#, c-format
msgid "NFS setup"
msgstr ""
-#: any.pm:234
+#: any.pm:236
#, c-format
msgid "Please enter the hostname and directory of your NFS media"
msgstr ""
-#: any.pm:238
+#: any.pm:240
#, c-format
msgid "Hostname missing"
msgstr ""
-#: any.pm:239
+#: any.pm:241
#, c-format
msgid "Directory must begin with \"/\""
msgstr ""
-#: any.pm:243
+#: any.pm:245
#, c-format
msgid "Hostname of the NFS mount ?"
msgstr ""
-#: any.pm:244
+#: any.pm:246
#, c-format
msgid "Directory"
msgstr "Gids"
-#: any.pm:266
+#: any.pm:268
#, c-format
msgid "Supplementary"
msgstr ""
-#: any.pm:301
+#: any.pm:303
#, 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:317
+#: any.pm:319
#, c-format
msgid "Core Release"
msgstr ""
-#: any.pm:319
+#: any.pm:321
#, c-format
msgid "Tainted Release"
msgstr ""
-#: any.pm:321
+#: any.pm:323
#, c-format
msgid "Nonfree Release"
msgstr ""
-#: any.pm:335
+#: any.pm:351
#, c-format
msgid ""
"Some hardware on your machine needs some non free firmwares in order for the "
"free software drivers to work."
msgstr ""
-#: any.pm:336
+#: any.pm:352
#, c-format
msgid "You should enable \"%s\""
msgstr ""
-#: any.pm:355
+#: any.pm:377
#, c-format
msgid "\"%s\" contains the various pieces of the systems and its applications"
msgstr ""
-#: any.pm:356
+#: any.pm:378
#, c-format
msgid "\"%s\" contains non free software.\n"
msgstr ""
-#: any.pm:357
+#: any.pm:379
#, c-format
msgid ""
"It also contains firmwares needed for certain devices to operate (eg: some "
"ATI/AMD graphic cards, some network cards, some RAID cards, ...)"
msgstr ""
-#: any.pm:358
+#: any.pm:380
#, c-format
msgid ""
"\"%s\" contains software that can not be distributed in every country due to "
"software patents."
msgstr ""
-#: any.pm:359
+#: any.pm:381
#, c-format
msgid ""
"It also contains software from \"%s\" rebuild with additional capabilities."
msgstr ""
-#: any.pm:363
+#: any.pm:387
#, c-format
msgid "Here you can enable more media if you want."
msgstr ""
-#: any.pm:378
+#: any.pm:404
#, c-format
msgid "This medium provides package updates for medium \"%s\""
msgstr ""
-#: any.pm:451
+#: any.pm:480
#, c-format
msgid "Looking at packages already installed..."
msgstr "Ondersoek pakette wat reeds geïnstalleer is..."
-#: any.pm:485
+#: any.pm:514
#, c-format
msgid "Finding packages to upgrade..."
msgstr "Soek vir pakkette om op te gradeer..."
-#: any.pm:498
+#: any.pm:527
#, c-format
msgid "Removing packages prior to upgrade..."
msgstr ""
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:713
+#: any.pm:743
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -270,73 +270,73 @@ msgstr ""
"\n"
"Wil u werklik dat ons hulle verwyder?\n"
-#: any.pm:932
+#: any.pm:962
#, c-format
msgid "Error reading file %s"
msgstr "Fout met die lees van lêer %s"
#
-#: any.pm:1140
+#: any.pm:1170
#, fuzzy, c-format
msgid "The following disk(s) were renamed:"
msgstr "Die volgende pakkette geïnstalleer word:\n"
-#: any.pm:1142
+#: any.pm:1172
#, c-format
msgid "%s (previously named as %s)"
msgstr ""
-#: any.pm:1199
+#: any.pm:1229
#, c-format
msgid "HTTP"
msgstr ""
-#: any.pm:1199
+#: any.pm:1229
#, c-format
msgid "FTP"
msgstr "Ftp"
-#: any.pm:1199
+#: any.pm:1229
#, fuzzy, c-format
msgid "NFS"
msgstr "PFS"
-#: any.pm:1218 steps_interactive.pm:970
+#: any.pm:1248 steps_interactive.pm:973
#, c-format
msgid "Network"
msgstr "Netwerk"
-#: any.pm:1222
+#: any.pm:1252
#, fuzzy, c-format
msgid "Please choose a media"
msgstr "Kies asseblief"
-#: any.pm:1238
+#: any.pm:1268
#, fuzzy, c-format
msgid "File already exists. Overwrite it?"
msgstr "Lêer bestaan alreeds. Moet dit gebruik word?"
-#: any.pm:1242
+#: any.pm:1272
#, c-format
msgid "Permission denied"
msgstr "Toegang verbied"
-#: any.pm:1290
+#: any.pm:1320
#, c-format
msgid "Bad NFS name"
msgstr ""
-#: any.pm:1311
+#: any.pm:1341
#, c-format
msgid "Bad media %s"
msgstr ""
-#: any.pm:1355
+#: any.pm:1385
#, c-format
msgid "Cannot make screenshots before partitioning"
msgstr "Kan nie skermfoto's neem voor partisie skep nie"
-#: any.pm:1363
+#: any.pm:1393
#, c-format
msgid "Screenshots will be available after install in %s"
msgstr "Skermfoto's sal na die installasie beskikbaar wees in %s"
@@ -346,7 +346,7 @@ msgstr "Skermfoto's sal na die installasie beskikbaar wees in %s"
msgid "Installation"
msgstr "Besig met installasie"
-#: gtk.pm:132 share/meta-task/compssUsers.pl:43
+#: gtk.pm:132 share/meta-task/compssUsers.pl:46
#, c-format
msgid "Configuration"
msgstr "Konfigurasie"
@@ -442,42 +442,42 @@ msgid ""
"%s"
msgstr ""
-#: pkgs.pm:382 pkgs.pm:409
+#: pkgs.pm:383 pkgs.pm:410
#, fuzzy, c-format
msgid "An error occurred:"
msgstr "'n Fout het voorgekom"
-#: pkgs.pm:401
+#: pkgs.pm:402
#, c-format
msgid "A fatal error occurred: %s."
msgstr "'n Ernstige fout het voorgekom: %s."
-#: pkgs.pm:891 pkgs.pm:928
+#: pkgs.pm:896 pkgs.pm:938
#, c-format
msgid "Do not ask again"
msgstr ""
-#: pkgs.pm:907
+#: pkgs.pm:912
#, fuzzy, c-format
msgid "%d installation transactions failed"
msgstr "onsuksesvolle installasie"
-#: pkgs.pm:908
+#: pkgs.pm:913
#, fuzzy, c-format
msgid "Installation of packages failed:"
msgstr "Installeer pakket %s"
-#: share/meta-task/compssUsers.pl:13
+#: share/meta-task/compssUsers.pl:14
#, c-format
msgid "Workstation"
msgstr "Werkstasie"
-#: share/meta-task/compssUsers.pl:15
+#: share/meta-task/compssUsers.pl:16
#, c-format
msgid "Office Workstation"
msgstr "Kantoorwerkstasie"
-#: share/meta-task/compssUsers.pl:17
+#: share/meta-task/compssUsers.pl:18
#, c-format
msgid ""
"Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets "
@@ -486,32 +486,32 @@ msgstr ""
"Kantoorprogramme: Woordverwerkers(LibreOffice Writer, Kword), spreistate "
"(LibreOffice Calc, Kspread), PDF-sigprogramme, ens."
-#: share/meta-task/compssUsers.pl:22
+#: share/meta-task/compssUsers.pl:24
#, c-format
msgid "Game station"
msgstr "Speletjiesrekenaar"
-#: share/meta-task/compssUsers.pl:23
+#: share/meta-task/compssUsers.pl:25
#, c-format
msgid "Amusement programs: arcade, boards, strategy, etc"
msgstr "Vermaak: Arkade, Bordspel, Strategie ens."
-#: share/meta-task/compssUsers.pl:26
+#: share/meta-task/compssUsers.pl:28
#, c-format
msgid "Multimedia station"
msgstr "Multimediastasie"
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:29
#, c-format
msgid "Sound and video playing/editing programs"
msgstr "Klank- en videospelers/redigeerders"
-#: share/meta-task/compssUsers.pl:32
+#: share/meta-task/compssUsers.pl:34
#, c-format
msgid "Internet station"
msgstr "Internetstasie"
-#: share/meta-task/compssUsers.pl:33
+#: share/meta-task/compssUsers.pl:35
#, c-format
msgid ""
"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -520,195 +520,195 @@ 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:38
+#: share/meta-task/compssUsers.pl:40
#, c-format
msgid "Network Computer (client)"
msgstr "Netwerkrekenaar (kliënt)"
-#: share/meta-task/compssUsers.pl:39
+#: share/meta-task/compssUsers.pl:41
#, c-format
msgid "Clients for different protocols including ssh"
msgstr "Kliëntprogramme vir 'n verkeidenheid protokolle insluitend SSH"
-#: share/meta-task/compssUsers.pl:44
+#: share/meta-task/compssUsers.pl:47
#, c-format
msgid "Tools to ease the configuration of your computer"
msgstr "Nutsprogramme wat u rekenaarkonfigurasie vergemaklik"
-#: share/meta-task/compssUsers.pl:48
+#: share/meta-task/compssUsers.pl:51
#, c-format
msgid "Console Tools"
msgstr "Konsole Hulpprogramme"
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:52
#, c-format
msgid "Editors, shells, file tools, terminals"
msgstr ""
"Redigeerders. teksverwerkers, instruksiedoppe, lêer-nutsprogramme, terminaal-"
"programme"
-#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156
-#: share/meta-task/compssUsers.pl:158
+#: share/meta-task/compssUsers.pl:56 share/meta-task/compssUsers.pl:200
+#: share/meta-task/compssUsers.pl:202
#, c-format
msgid "Development"
msgstr "Ontwikkeling"
-#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:203
#, c-format
msgid "C and C++ development libraries, programs and include files"
msgstr "C en C++ ontwikkelingsprogrammateke, programme en insluitlêers"
-#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163
+#: share/meta-task/compssUsers.pl:61 share/meta-task/compssUsers.pl:207
#, c-format
msgid "Documentation"
msgstr "Dokumentasie"
-#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
+#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:208
#, c-format
msgid "Books and Howto's on Linux and Free Software"
msgstr "Boeke en HOWTO's oor Linux en Vrye Sagteware"
-#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167
+#: share/meta-task/compssUsers.pl:66 share/meta-task/compssUsers.pl:211
#, c-format
msgid "LSB"
msgstr "LSB"
-#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:67 share/meta-task/compssUsers.pl:212
#, c-format
msgid "Linux Standard Base. Third party applications support"
msgstr "Linux Standard Base. Derdeparty ondersteuning van programme"
-#: share/meta-task/compssUsers.pl:72
+#: share/meta-task/compssUsers.pl:77
#, c-format
msgid "Web Server"
msgstr "Web-bediener"
-#: share/meta-task/compssUsers.pl:73
+#: share/meta-task/compssUsers.pl:78
#, c-format
msgid "Apache"
msgstr "Apache"
-#: share/meta-task/compssUsers.pl:76
+#: share/meta-task/compssUsers.pl:82
#, fuzzy, c-format
msgid "Groupware"
msgstr "Groep:"
-#: share/meta-task/compssUsers.pl:77
+#: share/meta-task/compssUsers.pl:83
#, c-format
msgid "Kolab Server"
msgstr "Kolab-bediener"
-#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121
+#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl:136
#, c-format
msgid "Firewall/Router"
msgstr "Vuurmuur/Netwerkroteerder"
-#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
+#: share/meta-task/compssUsers.pl:87 share/meta-task/compssUsers.pl:137
#, c-format
msgid "Internet gateway"
msgstr "Internetpoort"
-#: share/meta-task/compssUsers.pl:84
+#: share/meta-task/compssUsers.pl:90
#, fuzzy, c-format
msgid "Mail/News"
msgstr "/Lêer/_Nuut"
-#: share/meta-task/compssUsers.pl:85
+#: share/meta-task/compssUsers.pl:91
#, fuzzy, c-format
msgid "Postfix mail server, Inn news server"
msgstr "Postfix e-pos-bediener"
-#: share/meta-task/compssUsers.pl:88
+#: share/meta-task/compssUsers.pl:95
#, fuzzy, c-format
msgid "Directory Server"
msgstr "Herstel vanaf CD"
-#: share/meta-task/compssUsers.pl:92
+#: share/meta-task/compssUsers.pl:100
#, c-format
msgid "FTP Server"
msgstr "FTP-bediener"
-#: share/meta-task/compssUsers.pl:93
+#: share/meta-task/compssUsers.pl:101
#, c-format
msgid "ProFTPd"
msgstr ""
-#: share/meta-task/compssUsers.pl:96
+#: share/meta-task/compssUsers.pl:105
#, c-format
msgid "DNS/NIS"
msgstr "DNS/NIS"
-#: share/meta-task/compssUsers.pl:97
+#: share/meta-task/compssUsers.pl:106
#, c-format
msgid "Domain Name and Network Information Server"
msgstr "Domeinnaam en Netwerk-informasie-bediener (DNS/NIS)"
-#: share/meta-task/compssUsers.pl:100
+#: share/meta-task/compssUsers.pl:110
#, fuzzy, c-format
msgid "File and Printer Sharing Server"
msgstr "Drukkerbediener"
-#: share/meta-task/compssUsers.pl:101
+#: share/meta-task/compssUsers.pl:111
#, fuzzy, c-format
msgid "NFS Server, Samba server"
msgstr "Samba-bediener"
-#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117
+#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl:131
#, c-format
msgid "Database"
msgstr "Databasis"
-#: share/meta-task/compssUsers.pl:105
+#: share/meta-task/compssUsers.pl:116
#, fuzzy, c-format
msgid "PostgreSQL and MariaDB Database Server"
msgstr "PostgreSQL of MariaDB databasisbediener"
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:121
#, c-format
msgid "Web/FTP"
msgstr "Web/FTP"
-#: share/meta-task/compssUsers.pl:110
+#: share/meta-task/compssUsers.pl:122
#, c-format
msgid "Apache, Pro-ftpd"
msgstr "Apache, Pro-ftpd"
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:126
#, c-format
msgid "Mail"
msgstr "e-Pos"
-#: share/meta-task/compssUsers.pl:114
+#: share/meta-task/compssUsers.pl:127
#, c-format
msgid "Postfix mail server"
msgstr "Postfix e-pos-bediener"
-#: share/meta-task/compssUsers.pl:118
+#: share/meta-task/compssUsers.pl:132
#, c-format
msgid "PostgreSQL or MariaDB database server"
msgstr "PostgreSQL of MariaDB databasisbediener"
-#: share/meta-task/compssUsers.pl:125
+#: share/meta-task/compssUsers.pl:140
#, c-format
msgid "Network Computer server"
msgstr "Netwerkrekenaar-bediener"
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:141
#, c-format
msgid "NFS server, SMB server, Proxy server, ssh server"
msgstr "NFS, SMB, Instaan- , SSH (Bedieners)"
-#: share/meta-task/compssUsers.pl:132
+#: share/meta-task/compssUsers.pl:148
#, c-format
msgid "Graphical Environment"
msgstr "Grafiese Omgewing"
-#: share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:150
#, c-format
msgid "KDE Workstation"
msgstr "KDE Werkstasie"
-#: share/meta-task/compssUsers.pl:135
+#: share/meta-task/compssUsers.pl:151
#, c-format
msgid ""
"The K Desktop Environment, the basic graphical environment with a collection "
@@ -717,12 +717,12 @@ msgstr ""
"Die K-werkskermomgewing (KDE), die basiese grafiese omgewing met 'n "
"versameling bygaande hulpprogramme"
-#: share/meta-task/compssUsers.pl:139
+#: share/meta-task/compssUsers.pl:156
#, c-format
msgid "GNOME Workstation"
msgstr "GNOME-werkstasie"
-#: share/meta-task/compssUsers.pl:140
+#: share/meta-task/compssUsers.pl:157 share/meta-task/compssUsers.pl:168
#, c-format
msgid ""
"A graphical environment with user-friendly set of applications and desktop "
@@ -731,12 +731,41 @@ msgstr ""
"'n Grafiese omgewing met gebruikersvriendelike stel applikasies en "
"werkskerm-hulpprogramme"
-#: share/meta-task/compssUsers.pl:144
+#: share/meta-task/compssUsers.pl:162
+#, fuzzy, c-format
+msgid "XFCE Workstation"
+msgstr "KDE Werkstasie"
+
+#: share/meta-task/compssUsers.pl:163
+#, fuzzy, c-format
+msgid ""
+"A lighter graphical environment with user-friendly set of applications and "
+"desktop tools"
+msgstr ""
+"'n Grafiese omgewing met gebruikersvriendelike stel applikasies en "
+"werkskerm-hulpprogramme"
+
+#: share/meta-task/compssUsers.pl:167
+#, fuzzy, c-format
+msgid "MATE Workstation"
+msgstr "GNOME-werkstasie"
+
+#: share/meta-task/compssUsers.pl:172
+#, fuzzy, c-format
+msgid "Cinnamon Workstation"
+msgstr "Werkstasie"
+
+#: share/meta-task/compssUsers.pl:173
+#, fuzzy, c-format
+msgid "A graphical environment based on GNOME"
+msgstr "Grafiese Omgewing"
+
+#: share/meta-task/compssUsers.pl:177
#, fuzzy, c-format
msgid "LXDE Desktop"
msgstr "'n Werkstasie"
-#: share/meta-task/compssUsers.pl:146
+#: share/meta-task/compssUsers.pl:179
#, fuzzy, c-format
msgid ""
"A lightweight & fast graphical environment with user-friendly set of "
@@ -745,52 +774,74 @@ msgstr ""
"'n Grafiese omgewing met gebruikersvriendelike stel applikasies en "
"werkskerm-hulpprogramme"
-#: share/meta-task/compssUsers.pl:149
+#: share/meta-task/compssUsers.pl:183
+#, fuzzy, c-format
+msgid "RazorQT Desktop"
+msgstr "'n Werkstasie"
+
+#: share/meta-task/compssUsers.pl:185
+#, c-format
+msgid "A less developed lightweight fast graphical environment"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:188
+#, c-format
+msgid "Enlightenment e17 Desktop"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:190
+#, fuzzy, c-format
+msgid "A lightweight fast graphical environment with a dedicated following"
+msgstr ""
+"'n Grafiese omgewing met gebruikersvriendelike stel applikasies en "
+"werkskerm-hulpprogramme"
+
+#: share/meta-task/compssUsers.pl:193
#, c-format
msgid "Other Graphical Desktops"
msgstr "Ander Grafiese Werkskerms"
-#: share/meta-task/compssUsers.pl:150
+#: share/meta-task/compssUsers.pl:194
#, fuzzy, c-format
-msgid "Window Maker, Enlightenment, Fvwm, etc"
+msgid "Window Maker, Fvwm, etc"
msgstr "Icewm, Window Maker, Enlightenment, Fvwm, ens."
-#: share/meta-task/compssUsers.pl:173
+#: share/meta-task/compssUsers.pl:217
#, c-format
msgid "Utilities"
msgstr "Nutsprogramme"
-#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176
+#: share/meta-task/compssUsers.pl:219 share/meta-task/compssUsers.pl:220
#, c-format
msgid "SSH Server"
msgstr "SSH-bediener"
-#: share/meta-task/compssUsers.pl:180
+#: share/meta-task/compssUsers.pl:224
#, fuzzy, c-format
msgid "Webmin"
msgstr "Webkamera"
-#: share/meta-task/compssUsers.pl:181
+#: share/meta-task/compssUsers.pl:225
#, fuzzy, c-format
msgid "Webmin Remote Configuration Server"
msgstr "Terminal Server Konfigurasie"
-#: share/meta-task/compssUsers.pl:185
+#: share/meta-task/compssUsers.pl:229
#, fuzzy, c-format
msgid "Network Utilities/Monitoring"
msgstr "Monitor van Netwerk"
-#: share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:230
#, c-format
msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
msgstr ""
-#: share/meta-task/compssUsers.pl:190
+#: share/meta-task/compssUsers.pl:234
#, fuzzy, c-format
msgid "Mageia Wizards"
msgstr "<b>Mageia Store</b>"
-#: share/meta-task/compssUsers.pl:191
+#: share/meta-task/compssUsers.pl:235
#, fuzzy, c-format
msgid "Wizards to configure server"
msgstr "Probleme met die konfigurasie van drukker \" %s\"!"
@@ -804,7 +855,7 @@ msgstr ""
"'n Fout het plaasgevind en ek weet nie hoe om dit veilig te hanteer\n"
"nie. Gaan op u eie risiko voort."
-#: steps.pm:461
+#: steps.pm:458
#, c-format
msgid ""
"Some important packages did not get installed properly.\n"
@@ -861,107 +912,107 @@ msgstr "Kies Pakketgroepe"
msgid "Install %s KDE Desktop"
msgstr ""
-#: steps_gtk.pm:244
+#: steps_gtk.pm:252
#, c-format
msgid "Install %s GNOME Desktop"
msgstr ""
-#: steps_gtk.pm:245
+#: steps_gtk.pm:253
#, fuzzy, c-format
msgid "Custom install"
msgstr "Minimale installasie"
-#: steps_gtk.pm:266
+#: steps_gtk.pm:274
#, fuzzy, c-format
msgid "KDE Desktop"
msgstr "'n Werkstasie"
-#: steps_gtk.pm:267
+#: steps_gtk.pm:275
#, fuzzy, c-format
msgid "GNOME Desktop"
msgstr "'n Werkstasie"
-#: steps_gtk.pm:268
+#: steps_gtk.pm:276
#, fuzzy, c-format
msgid "Custom Desktop"
msgstr "'n Werkstasie"
-#: steps_gtk.pm:274
+#: steps_gtk.pm:282
#, c-format
msgid "Here's a preview of the '%s' desktop."
msgstr ""
-#: steps_gtk.pm:301
+#: steps_gtk.pm:309
#, c-format
msgid "Click on images in order to see a bigger preview"
msgstr ""
-#: steps_gtk.pm:319 steps_interactive.pm:633 steps_list.pm:30
+#: steps_gtk.pm:325 steps_interactive.pm:633 steps_list.pm:30
#, c-format
msgid "Package Group Selection"
msgstr "Kies Pakketgroepe"
-#: steps_gtk.pm:344 steps_interactive.pm:650
+#: steps_gtk.pm:350 steps_interactive.pm:650
#, c-format
msgid "Individual package selection"
msgstr "Individuele pakket-seleksie"
-#: steps_gtk.pm:351
+#: steps_gtk.pm:357
#, c-format
msgid "Unselect All"
msgstr "Herstel Keuses"
-#: steps_gtk.pm:370 steps_interactive.pm:562
+#: steps_gtk.pm:376 steps_interactive.pm:562
#, c-format
msgid "Total size: %d / %d MB"
msgstr "Totale grootte: %d / %d MB"
-#: steps_gtk.pm:415
+#: steps_gtk.pm:421
#, c-format
msgid "Version: "
msgstr "Weergawe: "
-#: steps_gtk.pm:416
+#: steps_gtk.pm:422
#, c-format
msgid "Size: "
msgstr "Grootte: "
-#: steps_gtk.pm:416
+#: steps_gtk.pm:422
#, c-format
msgid "%d KB\n"
msgstr "%d KB\n"
-#: steps_gtk.pm:417
+#: steps_gtk.pm:423
#, c-format
msgid "Importance: "
msgstr "Belangrikheid: "
-#: steps_gtk.pm:452
+#: steps_gtk.pm:458
#, c-format
msgid "You cannot select/unselect this package"
msgstr "U kan nie hierdie pakket selekteer/deselekteer nie"
-#: steps_gtk.pm:456
+#: steps_gtk.pm:462
#, c-format
msgid "due to missing %s"
msgstr "deur %s wat soek is"
-#: steps_gtk.pm:457
+#: steps_gtk.pm:463
#, c-format
msgid "due to unsatisfied %s"
msgstr "deur problematiese %s"
-#: steps_gtk.pm:458
+#: steps_gtk.pm:464
#, c-format
msgid "trying to promote %s"
msgstr "probeer promosie van %s"
-#: steps_gtk.pm:459
+#: steps_gtk.pm:465
#, c-format
msgid "in order to keep %s"
msgstr "om %s te kan behou"
-#: steps_gtk.pm:464
+#: steps_gtk.pm:470
#, c-format
msgid ""
"You cannot select this package as there is not enough space left to install "
@@ -970,104 +1021,104 @@ msgstr ""
"U kan nie hierdie pakket selekteer nie, omdat daar nie meer spasie "
"beskikbaar is nie"
-#: steps_gtk.pm:467
+#: steps_gtk.pm:473
#, c-format
msgid "The following packages are going to be installed"
msgstr "Ons gaan die volgende pakette installeer"
-#: steps_gtk.pm:468
+#: steps_gtk.pm:474
#, c-format
msgid "The following packages are going to be removed"
msgstr "Die volgende pakkette gaan verwyder word"
-#: steps_gtk.pm:494
+#: steps_gtk.pm:500
#, c-format
msgid "This is a mandatory package, it cannot be unselected"
msgstr "Hierdie is 'n verpligte pakket. Dit kan nie uitgehaal word nie."
-#: steps_gtk.pm:496
+#: steps_gtk.pm:502
#, c-format
msgid "You cannot unselect this package. It is already installed"
msgstr "U kan nie heirdie pakket verwyder nie. Dis alreeds geïnstalleer"
-#: steps_gtk.pm:498
+#: steps_gtk.pm:504
#, c-format
msgid "You cannot unselect this package. It must be upgraded"
msgstr "U kan nie hierdie pakket deselekteer nie. Dit moet opgradeer word."
-#: steps_gtk.pm:502
+#: steps_gtk.pm:508
#, c-format
msgid "Show automatically selected packages"
msgstr "Wys outogeselekteerde pakkette."
-#: steps_gtk.pm:509
+#: steps_gtk.pm:512
#, c-format
msgid "Install"
msgstr "Installasie"
-#: steps_gtk.pm:512
+#: steps_gtk.pm:515
#, fuzzy, c-format
msgid "Load/Save selection"
msgstr "Pakketkeuse"
-#: steps_gtk.pm:513
+#: steps_gtk.pm:516
#, c-format
msgid "Updating package selection"
msgstr "Pakketseleksie word opgedateer"
-#: steps_gtk.pm:518
+#: steps_gtk.pm:521
#, c-format
msgid "Minimal install"
msgstr "Minimale installasie"
-#: steps_gtk.pm:531
+#: steps_gtk.pm:534
#, c-format
msgid "Software Management"
msgstr "Sagteware Beheer"
-#: steps_gtk.pm:531 steps_interactive.pm:443
+#: steps_gtk.pm:534 steps_interactive.pm:443
#, c-format
msgid "Choose the packages you want to install"
msgstr "Kies die pakkette wat u wil installeer"
-#: steps_gtk.pm:548 steps_interactive.pm:670 steps_list.pm:32
+#: steps_gtk.pm:551 steps_interactive.pm:670 steps_list.pm:32
#, c-format
msgid "Installing"
msgstr "Besig met installasie"
-#: steps_gtk.pm:578
+#: steps_gtk.pm:581
#, c-format
msgid "No details"
msgstr "Geen Detail"
-#: steps_gtk.pm:597
+#: steps_gtk.pm:600
#, fuzzy, c-format
msgid "Time remaining:"
msgstr "Tyd oor "
-#: steps_gtk.pm:598
+#: steps_gtk.pm:601
#, fuzzy, c-format
msgid "(estimating...)"
msgstr "Skatting"
-#: steps_gtk.pm:628
+#: steps_gtk.pm:631
#, c-format
msgid "%d package"
msgid_plural "%d packages"
msgstr[0] "%d pakket"
msgstr[1] "%d pakkette"
-#: steps_gtk.pm:683 steps_interactive.pm:834 steps_list.pm:43
+#: steps_gtk.pm:687 steps_interactive.pm:837 steps_list.pm:43
#, c-format
msgid "Summary"
msgstr "Opsomming"
-#: steps_gtk.pm:702
+#: steps_gtk.pm:706
#, c-format
msgid "Configure"
msgstr "Konfigureer"
-#: steps_gtk.pm:719 steps_interactive.pm:830 steps_interactive.pm:983
+#: steps_gtk.pm:723 steps_interactive.pm:833 steps_interactive.pm:986
#, c-format
msgid "not configured"
msgstr "nie gekonfigureer nie"
@@ -1079,7 +1130,7 @@ msgid ""
"If you want to skip some of them, you can unselect them now."
msgstr ""
-#: steps_gtk.pm:778 steps_interactive.pm:349
+#: steps_gtk.pm:782 steps_interactive.pm:349
#, c-format
msgid ""
"You have the option to copy the contents of the CDs onto the hard disk drive "
@@ -1088,7 +1139,7 @@ msgid ""
"available once the system is fully installed."
msgstr ""
-#: steps_gtk.pm:780 steps_interactive.pm:351
+#: steps_gtk.pm:784 steps_interactive.pm:351
#, c-format
msgid "Copy whole CDs"
msgstr ""
@@ -1388,102 +1439,102 @@ msgstr ""
"Wil u dit nou installeer?"
#. -PO: example: lilo-graphic on /dev/hda1
-#: steps_interactive.pm:878
+#: steps_interactive.pm:881
#, c-format
msgid "%s on %s"
msgstr "%s op %s"
-#: steps_interactive.pm:910 steps_interactive.pm:917 steps_interactive.pm:930
-#: steps_interactive.pm:947 steps_interactive.pm:962
+#: steps_interactive.pm:913 steps_interactive.pm:920 steps_interactive.pm:933
+#: steps_interactive.pm:950 steps_interactive.pm:965
#, c-format
msgid "Hardware"
msgstr "Hardeware"
-#: steps_interactive.pm:931 steps_interactive.pm:948
+#: steps_interactive.pm:934 steps_interactive.pm:951
#, c-format
msgid "Sound card"
msgstr "Klankkaart"
-#: steps_interactive.pm:951
+#: steps_interactive.pm:954
#, c-format
msgid "Do you have an ISA sound card?"
msgstr "Beskik u oor 'n ISA klankkaart?"
-#: steps_interactive.pm:953
+#: steps_interactive.pm:956
#, 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:955
+#: steps_interactive.pm:958
#, c-format
msgid "No sound card detected. Try \"harddrake\" after installation"
msgstr ""
"Geen klankkaart opgespoor nie. Probeer \"harddrake\" na die installasie"
-#: steps_interactive.pm:963
+#: steps_interactive.pm:966
#, c-format
msgid "Graphical interface"
msgstr "Grafiese-koppelvlak"
-#: steps_interactive.pm:969 steps_interactive.pm:981
+#: steps_interactive.pm:972 steps_interactive.pm:984
#, c-format
msgid "Network & Internet"
msgstr "Netwerk & Internet"
-#: steps_interactive.pm:982
+#: steps_interactive.pm:985
#, c-format
msgid "Proxies"
msgstr "Instaan bedieners"
-#: steps_interactive.pm:983
+#: steps_interactive.pm:986
#, c-format
msgid "configured"
msgstr "gekonfigureer"
-#: steps_interactive.pm:993
+#: steps_interactive.pm:996
#, c-format
msgid "Security Level"
msgstr "Sekuriteitsvlak"
-#: steps_interactive.pm:1013
+#: steps_interactive.pm:1016
#, c-format
msgid "Firewall"
msgstr "Vuurmuur"
-#: steps_interactive.pm:1017
+#: steps_interactive.pm:1020
#, c-format
msgid "activated"
msgstr "ge-aktiveer"
-#: steps_interactive.pm:1017
+#: steps_interactive.pm:1020
#, c-format
msgid "disabled"
msgstr "ge-deaktiveer"
-#: steps_interactive.pm:1031
+#: steps_interactive.pm:1034
#, 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:1060
+#: steps_interactive.pm:1063
#, c-format
msgid "Preparing bootloader..."
msgstr "Herlaaistelsel word voorberei..."
#. -PO: This is NOT the boot loader!!!!
-#: steps_interactive.pm:1062
+#: steps_interactive.pm:1065
#, fuzzy, c-format
msgid "Preparing initial startup program..."
msgstr "Berei installasie voor"
-#: steps_interactive.pm:1063
+#: steps_interactive.pm:1066
#, c-format
msgid "Be patient, this may take a while..."
msgstr ""
-#: steps_interactive.pm:1074
+#: steps_interactive.pm:1077
#, fuzzy, c-format
msgid ""
"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1496,7 +1547,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:1087
+#: steps_interactive.pm:1090
#, c-format
msgid ""
"In this security level, access to the files in the Windows partition is "
@@ -1505,17 +1556,17 @@ msgstr ""
"Met hierdie sekuriteitsvlak word toegang na lêers op die Windows partisie "
"vernou na slegs die administrateur"
-#: steps_interactive.pm:1119
+#: steps_interactive.pm:1122
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr "Sit 'n leë floppie in aandrywer %s"
-#: steps_interactive.pm:1121
+#: steps_interactive.pm:1124
#, c-format
msgid "Creating auto install floppy..."
msgstr "Outoinstallasieskyf word geskep."
-#: steps_interactive.pm:1132
+#: steps_interactive.pm:1135
#, c-format
msgid ""
"Some steps are not completed.\n"
@@ -1526,12 +1577,12 @@ msgstr ""
"\n"
"Wil u werklik nou eindig?"
-#: steps_interactive.pm:1142
+#: steps_interactive.pm:1145
#, c-format
msgid "Congratulations"
msgstr "Geluk"
-#: steps_interactive.pm:1145
+#: steps_interactive.pm:1148
#, c-format
msgid "Reboot"
msgstr "Herlaai"
diff --git a/perl-install/install/share/po/am.po b/perl-install/install/share/po/am.po
index 478862e1c..da98d5a6a 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: 2013-05-03 10:51+0200\n"
+"POT-Creation-Date: 2013-11-03 12:08+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"
@@ -71,7 +71,7 @@ msgid "Do you have further supplementary media?"
msgstr "ሌላ አለ?"
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:113
+#: any.pm:114
#, c-format
msgid ""
"The following media have been found and will be used during install: %s.\n"
@@ -80,177 +80,177 @@ msgid ""
"Do you have a supplementary installation medium to configure?"
msgstr ""
-#: any.pm:121
+#: any.pm:122
#, c-format
msgid "CD-ROM"
msgstr "ሲዲ-ሮም"
-#: any.pm:122
+#: any.pm:123
#, fuzzy, c-format
msgid "Network (HTTP)"
msgstr "መረብ"
-#: any.pm:123
+#: any.pm:124
#, fuzzy, c-format
msgid "Network (FTP)"
msgstr "መረብ"
-#: any.pm:124
+#: any.pm:125
#, c-format
msgid "Network (NFS)"
msgstr ""
-#: any.pm:171
+#: any.pm:173
#, c-format
msgid "URL of the mirror?"
msgstr ""
-#: any.pm:177
+#: any.pm:179
#, c-format
msgid "URL must start with ftp:// or http://"
msgstr ""
-#: any.pm:188
+#: any.pm:190
#, c-format
msgid "Contacting %s web site to get the list of available mirrors..."
msgstr ""
-#: any.pm:193
+#: any.pm:195
#, c-format
msgid "Failed contacting %s web site to get the list of available mirrors"
msgstr ""
-#: any.pm:203
+#: any.pm:205
#, c-format
msgid "Choose a mirror from which to get the packages"
msgstr ""
-#: any.pm:233
+#: any.pm:235
#, c-format
msgid "NFS setup"
msgstr ""
-#: any.pm:234
+#: any.pm:236
#, c-format
msgid "Please enter the hostname and directory of your NFS media"
msgstr ""
-#: any.pm:238
+#: any.pm:240
#, c-format
msgid "Hostname missing"
msgstr ""
-#: any.pm:239
+#: any.pm:241
#, c-format
msgid "Directory must begin with \"/\""
msgstr ""
-#: any.pm:243
+#: any.pm:245
#, c-format
msgid "Hostname of the NFS mount ?"
msgstr ""
-#: any.pm:244
+#: any.pm:246
#, c-format
msgid "Directory"
msgstr "ዶሴ"
-#: any.pm:266
+#: any.pm:268
#, c-format
msgid "Supplementary"
msgstr ""
-#: any.pm:301
+#: any.pm:303
#, fuzzy, c-format
msgid ""
"Can't find a package list file on this mirror. Make sure the location is "
"correct."
msgstr "መረጃ በ%s መጠቀሚያ ፕሮግራም ላይ"
-#: any.pm:317
+#: any.pm:319
#, c-format
msgid "Core Release"
msgstr ""
-#: any.pm:319
+#: any.pm:321
#, c-format
msgid "Tainted Release"
msgstr ""
-#: any.pm:321
+#: any.pm:323
#, c-format
msgid "Nonfree Release"
msgstr ""
-#: any.pm:335
+#: any.pm:351
#, c-format
msgid ""
"Some hardware on your machine needs some non free firmwares in order for the "
"free software drivers to work."
msgstr ""
-#: any.pm:336
+#: any.pm:352
#, c-format
msgid "You should enable \"%s\""
msgstr ""
-#: any.pm:355
+#: any.pm:377
#, c-format
msgid "\"%s\" contains the various pieces of the systems and its applications"
msgstr ""
-#: any.pm:356
+#: any.pm:378
#, c-format
msgid "\"%s\" contains non free software.\n"
msgstr ""
-#: any.pm:357
+#: any.pm:379
#, c-format
msgid ""
"It also contains firmwares needed for certain devices to operate (eg: some "
"ATI/AMD graphic cards, some network cards, some RAID cards, ...)"
msgstr ""
-#: any.pm:358
+#: any.pm:380
#, c-format
msgid ""
"\"%s\" contains software that can not be distributed in every country due to "
"software patents."
msgstr ""
-#: any.pm:359
+#: any.pm:381
#, c-format
msgid ""
"It also contains software from \"%s\" rebuild with additional capabilities."
msgstr ""
-#: any.pm:363
+#: any.pm:387
#, c-format
msgid "Here you can enable more media if you want."
msgstr ""
-#: any.pm:378
+#: any.pm:404
#, c-format
msgid "This medium provides package updates for medium \"%s\""
msgstr ""
-#: any.pm:451
+#: any.pm:480
#, c-format
msgid "Looking at packages already installed..."
msgstr ""
-#: any.pm:485
+#: any.pm:514
#, c-format
msgid "Finding packages to upgrade..."
msgstr ""
-#: any.pm:498
+#: any.pm:527
#, c-format
msgid "Removing packages prior to upgrade..."
msgstr ""
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:713
+#: any.pm:743
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -259,72 +259,72 @@ msgid ""
"Do you really want to remove these packages?\n"
msgstr ""
-#: any.pm:932
+#: any.pm:962
#, c-format
msgid "Error reading file %s"
msgstr "%sን በማንበብ ላይ ስህተት ተፈጥሯል"
-#: any.pm:1140
+#: any.pm:1170
#, fuzzy, c-format
msgid "The following disk(s) were renamed:"
msgstr "የሚከተሉት ጥቅሎች ሊወገዱ ነው"
-#: any.pm:1142
+#: any.pm:1172
#, c-format
msgid "%s (previously named as %s)"
msgstr ""
-#: any.pm:1199
+#: any.pm:1229
#, c-format
msgid "HTTP"
msgstr "HTTP"
-#: any.pm:1199
+#: any.pm:1229
#, c-format
msgid "FTP"
msgstr "FTP"
-#: any.pm:1199
+#: any.pm:1229
#, c-format
msgid "NFS"
msgstr "NFS"
-#: any.pm:1218 steps_interactive.pm:970
+#: any.pm:1248 steps_interactive.pm:973
#, c-format
msgid "Network"
msgstr "መረብ"
-#: any.pm:1222
+#: any.pm:1252
#, fuzzy, c-format
msgid "Please choose a media"
msgstr "እባክዎ ያለ ሰነድን ይምረጡ"
-#: any.pm:1238
+#: any.pm:1268
#, fuzzy, c-format
msgid "File already exists. Overwrite it?"
msgstr "ፋይሉ በፊትም ነበር። ልጠቀምበት?"
-#: any.pm:1242
+#: any.pm:1272
#, c-format
msgid "Permission denied"
msgstr "ፈቃድ አልተሰጠም"
-#: any.pm:1290
+#: any.pm:1320
#, c-format
msgid "Bad NFS name"
msgstr ""
-#: any.pm:1311
+#: any.pm:1341
#, fuzzy, c-format
msgid "Bad media %s"
msgstr "ፋይል ተጭኗል %s"
-#: any.pm:1355
+#: any.pm:1385
#, c-format
msgid "Cannot make screenshots before partitioning"
msgstr ""
-#: any.pm:1363
+#: any.pm:1393
#, c-format
msgid "Screenshots will be available after install in %s"
msgstr ""
@@ -334,7 +334,7 @@ msgstr ""
msgid "Installation"
msgstr "በመትከል ላይ"
-#: gtk.pm:132 share/meta-task/compssUsers.pl:43
+#: gtk.pm:132 share/meta-task/compssUsers.pl:46
#, c-format
msgid "Configuration"
msgstr "ስየማ"
@@ -428,343 +428,390 @@ msgid ""
"%s"
msgstr ""
-#: pkgs.pm:382 pkgs.pm:409
+#: pkgs.pm:383 pkgs.pm:410
#, fuzzy, c-format
msgid "An error occurred:"
msgstr "ስህተት ተፈጥሯል"
-#: pkgs.pm:401
+#: pkgs.pm:402
#, c-format
msgid "A fatal error occurred: %s."
msgstr ""
-#: pkgs.pm:891 pkgs.pm:928
+#: pkgs.pm:896 pkgs.pm:938
#, c-format
msgid "Do not ask again"
msgstr ""
-#: pkgs.pm:907
+#: pkgs.pm:912
#, fuzzy, c-format
msgid "%d installation transactions failed"
msgstr "%s አልተገኘም"
-#: pkgs.pm:908
+#: pkgs.pm:913
#, fuzzy, c-format
msgid "Installation of packages failed:"
msgstr "የ%s ጥቅል በመትከል ላይ"
-#: share/meta-task/compssUsers.pl:13
+#: share/meta-task/compssUsers.pl:14
#, fuzzy, c-format
msgid "Workstation"
msgstr "የቅርብ መረብ ምርጫ"
-#: share/meta-task/compssUsers.pl:15
+#: share/meta-task/compssUsers.pl:16
#, c-format
msgid "Office Workstation"
msgstr ""
-#: share/meta-task/compssUsers.pl:17
+#: share/meta-task/compssUsers.pl:18
#, c-format
msgid ""
"Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets "
"(LibreOffice Calc, Kspread), PDF viewers, etc"
msgstr ""
-#: share/meta-task/compssUsers.pl:22
+#: share/meta-task/compssUsers.pl:24
#, c-format
msgid "Game station"
msgstr ""
-#: share/meta-task/compssUsers.pl:23
+#: share/meta-task/compssUsers.pl:25
#, c-format
msgid "Amusement programs: arcade, boards, strategy, etc"
msgstr ""
-#: share/meta-task/compssUsers.pl:26
+#: share/meta-task/compssUsers.pl:28
#, fuzzy, c-format
msgid "Multimedia station"
msgstr "የመገናኛ ብዙሃን"
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:29
#, c-format
msgid "Sound and video playing/editing programs"
msgstr ""
-#: share/meta-task/compssUsers.pl:32
+#: share/meta-task/compssUsers.pl:34
#, fuzzy, c-format
msgid "Internet station"
msgstr "ፈጣን መልእክት"
-#: share/meta-task/compssUsers.pl:33
+#: share/meta-task/compssUsers.pl:35
#, c-format
msgid ""
"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
"Web"
msgstr ""
-#: share/meta-task/compssUsers.pl:38
+#: share/meta-task/compssUsers.pl:40
#, fuzzy, c-format
msgid "Network Computer (client)"
msgstr "ኮምፒውተር ሳይንስ"
-#: share/meta-task/compssUsers.pl:39
+#: share/meta-task/compssUsers.pl:41
#, c-format
msgid "Clients for different protocols including ssh"
msgstr ""
-#: share/meta-task/compssUsers.pl:44
+#: share/meta-task/compssUsers.pl:47
#, c-format
msgid "Tools to ease the configuration of your computer"
msgstr ""
-#: share/meta-task/compssUsers.pl:48
+#: share/meta-task/compssUsers.pl:51
#, fuzzy, c-format
msgid "Console Tools"
msgstr "የፋይል መሳሪያዎች"
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:52
#, c-format
msgid "Editors, shells, file tools, terminals"
msgstr ""
-#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156
-#: share/meta-task/compssUsers.pl:158
+#: share/meta-task/compssUsers.pl:56 share/meta-task/compssUsers.pl:200
+#: share/meta-task/compssUsers.pl:202
#, c-format
msgid "Development"
msgstr "እድገት"
-#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:203
#, c-format
msgid "C and C++ development libraries, programs and include files"
msgstr ""
-#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163
+#: share/meta-task/compssUsers.pl:61 share/meta-task/compssUsers.pl:207
#, c-format
msgid "Documentation"
msgstr "ማስረጃ"
-#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
+#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:208
#, c-format
msgid "Books and Howto's on Linux and Free Software"
msgstr ""
-#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167
+#: share/meta-task/compssUsers.pl:66 share/meta-task/compssUsers.pl:211
#, c-format
msgid "LSB"
msgstr ""
-#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:67 share/meta-task/compssUsers.pl:212
#, c-format
msgid "Linux Standard Base. Third party applications support"
msgstr ""
-#: share/meta-task/compssUsers.pl:72
+#: share/meta-task/compssUsers.pl:77
#, c-format
msgid "Web Server"
msgstr "የመረብ ሰርቨር"
-#: share/meta-task/compssUsers.pl:73
+#: share/meta-task/compssUsers.pl:78
#, fuzzy, c-format
msgid "Apache"
msgstr "መተላለፊያ"
-#: share/meta-task/compssUsers.pl:76
+#: share/meta-task/compssUsers.pl:82
#, fuzzy, c-format
msgid "Groupware"
msgstr "የውይይት መድረክ"
-#: share/meta-task/compssUsers.pl:77
+#: share/meta-task/compssUsers.pl:83
#, fuzzy, c-format
msgid "Kolab Server"
msgstr "የሳምባ ተጠሪ"
-#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121
+#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl:136
#, c-format
msgid "Firewall/Router"
msgstr ""
-#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
+#: share/meta-task/compssUsers.pl:87 share/meta-task/compssUsers.pl:137
#, c-format
msgid "Internet gateway"
msgstr ""
-#: share/meta-task/compssUsers.pl:84
+#: share/meta-task/compssUsers.pl:90
#, fuzzy, c-format
msgid "Mail/News"
msgstr "አዲስ ፋይል።"
-#: share/meta-task/compssUsers.pl:85
+#: share/meta-task/compssUsers.pl:91
#, fuzzy, c-format
msgid "Postfix mail server, Inn news server"
msgstr "የመልዕክት ተጠሪ ሚስጢራዊ ቃል ያስፈልጋል"
-#: share/meta-task/compssUsers.pl:88
+#: share/meta-task/compssUsers.pl:95
#, fuzzy, c-format
msgid "Directory Server"
msgstr "በዝርዝር ውስጥ ዶሴ ጨምር"
-#: share/meta-task/compssUsers.pl:92
+#: share/meta-task/compssUsers.pl:100
#, c-format
msgid "FTP Server"
msgstr "የFTP ተጠሪ"
-#: share/meta-task/compssUsers.pl:93
+#: share/meta-task/compssUsers.pl:101
#, c-format
msgid "ProFTPd"
msgstr ""
-#: share/meta-task/compssUsers.pl:96
+#: share/meta-task/compssUsers.pl:105
#, c-format
msgid "DNS/NIS"
msgstr "DNS/NIS"
-#: share/meta-task/compssUsers.pl:97
+#: share/meta-task/compssUsers.pl:106
#, fuzzy, c-format
msgid "Domain Name and Network Information Server"
msgstr "የዘርፍ ስም ሰርቨር"
-#: share/meta-task/compssUsers.pl:100
+#: share/meta-task/compssUsers.pl:110
#, fuzzy, c-format
msgid "File and Printer Sharing Server"
msgstr "የማተሚያ ሰርቨር"
-#: share/meta-task/compssUsers.pl:101
+#: share/meta-task/compssUsers.pl:111
#, fuzzy, c-format
msgid "NFS Server, Samba server"
msgstr "የሳምባ ሰርቨር"
-#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117
+#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl:131
#, c-format
msgid "Database"
msgstr "ዳታቤዝ"
-#: share/meta-task/compssUsers.pl:105
+#: share/meta-task/compssUsers.pl:116
#, c-format
msgid "PostgreSQL and MariaDB Database Server"
msgstr ""
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:121
#, c-format
msgid "Web/FTP"
msgstr ""
-#: share/meta-task/compssUsers.pl:110
+#: share/meta-task/compssUsers.pl:122
#, c-format
msgid "Apache, Pro-ftpd"
msgstr ""
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:126
#, c-format
msgid "Mail"
msgstr "ፖስታ"
-#: share/meta-task/compssUsers.pl:114
+#: share/meta-task/compssUsers.pl:127
#, c-format
msgid "Postfix mail server"
msgstr ""
-#: share/meta-task/compssUsers.pl:118
+#: share/meta-task/compssUsers.pl:132
#, c-format
msgid "PostgreSQL or MariaDB database server"
msgstr ""
-#: share/meta-task/compssUsers.pl:125
+#: share/meta-task/compssUsers.pl:140
#, fuzzy, c-format
msgid "Network Computer server"
msgstr "ኮምፒውተር ሳይንስ"
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:141
#, c-format
msgid "NFS server, SMB server, Proxy server, ssh server"
msgstr ""
-#: share/meta-task/compssUsers.pl:132
+#: share/meta-task/compssUsers.pl:148
#, c-format
msgid "Graphical Environment"
msgstr ""
-#: share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:150
#, c-format
msgid "KDE Workstation"
msgstr ""
-#: share/meta-task/compssUsers.pl:135
+#: share/meta-task/compssUsers.pl:151
#, c-format
msgid ""
"The K Desktop Environment, the basic graphical environment with a collection "
"of accompanying tools"
msgstr ""
-#: share/meta-task/compssUsers.pl:139
+#: share/meta-task/compssUsers.pl:156
#, c-format
msgid "GNOME Workstation"
msgstr ""
-#: share/meta-task/compssUsers.pl:140
+#: share/meta-task/compssUsers.pl:157 share/meta-task/compssUsers.pl:168
#, c-format
msgid ""
"A graphical environment with user-friendly set of applications and desktop "
"tools"
msgstr ""
-#: share/meta-task/compssUsers.pl:144
+#: share/meta-task/compssUsers.pl:162
+#, fuzzy, c-format
+msgid "XFCE Workstation"
+msgstr "የቅርብ መረብ ምርጫ"
+
+#: share/meta-task/compssUsers.pl:163
+#, c-format
+msgid ""
+"A lighter graphical environment with user-friendly set of applications and "
+"desktop tools"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:167
+#, fuzzy, c-format
+msgid "MATE Workstation"
+msgstr "የቅርብ መረብ ምርጫ"
+
+#: share/meta-task/compssUsers.pl:172
+#, fuzzy, c-format
+msgid "Cinnamon Workstation"
+msgstr "የቅርብ መረብ ምርጫ"
+
+#: share/meta-task/compssUsers.pl:173
+#, c-format
+msgid "A graphical environment based on GNOME"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:177
#, fuzzy, c-format
msgid "LXDE Desktop"
msgstr "ሰሌዳ"
-#: share/meta-task/compssUsers.pl:146
+#: share/meta-task/compssUsers.pl:179
#, c-format
msgid ""
"A lightweight & fast graphical environment with user-friendly set of "
"applications and desktop tools"
msgstr ""
-#: share/meta-task/compssUsers.pl:149
+#: share/meta-task/compssUsers.pl:183
+#, fuzzy, c-format
+msgid "RazorQT Desktop"
+msgstr "ሰሌዳ"
+
+#: share/meta-task/compssUsers.pl:185
+#, c-format
+msgid "A less developed lightweight fast graphical environment"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:188
+#, c-format
+msgid "Enlightenment e17 Desktop"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:190
+#, c-format
+msgid "A lightweight fast graphical environment with a dedicated following"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:193
#, c-format
msgid "Other Graphical Desktops"
msgstr ""
-#: share/meta-task/compssUsers.pl:150
+#: share/meta-task/compssUsers.pl:194
#, c-format
-msgid "Window Maker, Enlightenment, Fvwm, etc"
+msgid "Window Maker, Fvwm, etc"
msgstr ""
-#: share/meta-task/compssUsers.pl:173
+#: share/meta-task/compssUsers.pl:217
#, fuzzy, c-format
msgid "Utilities"
msgstr "ፊሊፒንስ"
-#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176
+#: share/meta-task/compssUsers.pl:219 share/meta-task/compssUsers.pl:220
#, fuzzy, c-format
msgid "SSH Server"
msgstr "ስለተጠሪ መረጃ"
-#: share/meta-task/compssUsers.pl:180
+#: share/meta-task/compssUsers.pl:224
#, fuzzy, c-format
msgid "Webmin"
msgstr "ዌብ-ካም"
-#: share/meta-task/compssUsers.pl:181
+#: share/meta-task/compssUsers.pl:225
#, fuzzy, c-format
msgid "Webmin Remote Configuration Server"
msgstr "ቀዳሚ ተጠሪ ይጠቀም"
-#: share/meta-task/compssUsers.pl:185
+#: share/meta-task/compssUsers.pl:229
#, fuzzy, c-format
msgid "Network Utilities/Monitoring"
msgstr "Name=መረብ"
-#: share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:230
#, c-format
msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
msgstr ""
-#: share/meta-task/compssUsers.pl:190
+#: share/meta-task/compssUsers.pl:234
#, fuzzy, c-format
msgid "Mageia Wizards"
msgstr "<b>የMageia ባለሞያ</b>"
-#: share/meta-task/compssUsers.pl:191
+#: share/meta-task/compssUsers.pl:235
#, fuzzy, c-format
msgid "Wizards to configure server"
msgstr "የባሕር-መዝገብ እሴት '%s' ወደ '%s' እንደገና መሰየም አልተቻለም።"
@@ -776,7 +823,7 @@ msgid ""
"Continue at your own risk."
msgstr ""
-#: steps.pm:461
+#: steps.pm:458
#, c-format
msgid ""
"Some important packages did not get installed properly.\n"
@@ -823,211 +870,211 @@ msgstr "የጥቅል ቡድን ምርጫ"
msgid "Install %s KDE Desktop"
msgstr ""
-#: steps_gtk.pm:244
+#: steps_gtk.pm:252
#, c-format
msgid "Install %s GNOME Desktop"
msgstr ""
-#: steps_gtk.pm:245
+#: steps_gtk.pm:253
#, fuzzy, c-format
msgid "Custom install"
msgstr "አነስተኛ ተከላ"
-#: steps_gtk.pm:266
+#: steps_gtk.pm:274
#, fuzzy, c-format
msgid "KDE Desktop"
msgstr "ሰሌዳ"
-#: steps_gtk.pm:267
+#: steps_gtk.pm:275
#, fuzzy, c-format
msgid "GNOME Desktop"
msgstr "ሰሌዳ"
-#: steps_gtk.pm:268
+#: steps_gtk.pm:276
#, fuzzy, c-format
msgid "Custom Desktop"
msgstr "ሰሌዳ"
-#: steps_gtk.pm:274
+#: steps_gtk.pm:282
#, c-format
msgid "Here's a preview of the '%s' desktop."
msgstr ""
-#: steps_gtk.pm:301
+#: steps_gtk.pm:309
#, c-format
msgid "Click on images in order to see a bigger preview"
msgstr ""
-#: steps_gtk.pm:319 steps_interactive.pm:633 steps_list.pm:30
+#: steps_gtk.pm:325 steps_interactive.pm:633 steps_list.pm:30
#, c-format
msgid "Package Group Selection"
msgstr "የጥቅል ቡድን ምርጫ"
-#: steps_gtk.pm:344 steps_interactive.pm:650
+#: steps_gtk.pm:350 steps_interactive.pm:650
#, c-format
msgid "Individual package selection"
msgstr "የነጠላ ጥቅል ምርጫ"
-#: steps_gtk.pm:351
+#: steps_gtk.pm:357
#, fuzzy, c-format
msgid "Unselect All"
msgstr "ሁሉንም &ተዉት"
-#: steps_gtk.pm:370 steps_interactive.pm:562
+#: steps_gtk.pm:376 steps_interactive.pm:562
#, c-format
msgid "Total size: %d / %d MB"
msgstr "አጠቃላይ መጠን: %d / %d MB"
-#: steps_gtk.pm:415
+#: steps_gtk.pm:421
#, c-format
msgid "Version: "
msgstr "ዝርያ: "
-#: steps_gtk.pm:416
+#: steps_gtk.pm:422
#, c-format
msgid "Size: "
msgstr "መጠን: "
-#: steps_gtk.pm:416
+#: steps_gtk.pm:422
#, c-format
msgid "%d KB\n"
msgstr "%d KB\n"
-#: steps_gtk.pm:417
+#: steps_gtk.pm:423
#, c-format
msgid "Importance: "
msgstr "አስፈላጊነት: "
-#: steps_gtk.pm:452
+#: steps_gtk.pm:458
#, c-format
msgid "You cannot select/unselect this package"
msgstr "ይህን ጥቅል መምረጥ/አለመምረጥ አይችሉም"
-#: steps_gtk.pm:456
+#: steps_gtk.pm:462
#, c-format
msgid "due to missing %s"
msgstr "%s ባለመገኘቱ ምክንያት"
-#: steps_gtk.pm:457
+#: steps_gtk.pm:463
#, c-format
msgid "due to unsatisfied %s"
msgstr "%s አጥጋቢ ባለመሆኑ ምክንያት"
-#: steps_gtk.pm:458
+#: steps_gtk.pm:464
#, c-format
msgid "trying to promote %s"
msgstr "%sን ለማስተዋወቅ በመሞከር ላይ"
-#: steps_gtk.pm:459
+#: steps_gtk.pm:465
#, c-format
msgid "in order to keep %s"
msgstr "%sን ለማቆየት"
-#: steps_gtk.pm:464
+#: steps_gtk.pm:470
#, c-format
msgid ""
"You cannot select this package as there is not enough space left to install "
"it"
msgstr ""
-#: steps_gtk.pm:467
+#: steps_gtk.pm:473
#, c-format
msgid "The following packages are going to be installed"
msgstr "የሚከተሉት ጥቅሎች ሊተከሉ ነው"
-#: steps_gtk.pm:468
+#: steps_gtk.pm:474
#, c-format
msgid "The following packages are going to be removed"
msgstr "የሚከተሉት ጥቅሎች ሊወገዱ ነው"
-#: steps_gtk.pm:494
+#: steps_gtk.pm:500
#, c-format
msgid "This is a mandatory package, it cannot be unselected"
msgstr ""
-#: steps_gtk.pm:496
+#: steps_gtk.pm:502
#, c-format
msgid "You cannot unselect this package. It is already installed"
msgstr "ይህንን ጥቅል መምረጥ አይችሉም። ቀደም ብሎ ተተክሏል።"
-#: steps_gtk.pm:498
+#: steps_gtk.pm:504
#, c-format
msgid "You cannot unselect this package. It must be upgraded"
msgstr ""
-#: steps_gtk.pm:502
+#: steps_gtk.pm:508
#, c-format
msgid "Show automatically selected packages"
msgstr ""
-#: steps_gtk.pm:509
+#: steps_gtk.pm:512
#, c-format
msgid "Install"
msgstr "ትከል"
-#: steps_gtk.pm:512
+#: steps_gtk.pm:515
#, fuzzy, c-format
msgid "Load/Save selection"
msgstr "የጥቅል ምርጫ"
-#: steps_gtk.pm:513
+#: steps_gtk.pm:516
#, c-format
msgid "Updating package selection"
msgstr "የጥቅል ምርጫ በማሻሻል ላይ"
-#: steps_gtk.pm:518
+#: steps_gtk.pm:521
#, c-format
msgid "Minimal install"
msgstr "አነስተኛ ተከላ"
-#: steps_gtk.pm:531
+#: steps_gtk.pm:534
#, fuzzy, c-format
msgid "Software Management"
msgstr "ማውጫዎች &አስተዳዳሪ"
-#: steps_gtk.pm:531 steps_interactive.pm:443
+#: steps_gtk.pm:534 steps_interactive.pm:443
#, c-format
msgid "Choose the packages you want to install"
msgstr "ለመትከል የሚፈልጉትን ጥቅል ይምረጡ"
-#: steps_gtk.pm:548 steps_interactive.pm:670 steps_list.pm:32
+#: steps_gtk.pm:551 steps_interactive.pm:670 steps_list.pm:32
#, c-format
msgid "Installing"
msgstr "በመትከል ላይ"
-#: steps_gtk.pm:578
+#: steps_gtk.pm:581
#, c-format
msgid "No details"
msgstr "ያለ ዝርዝሮች"
-#: steps_gtk.pm:597
+#: steps_gtk.pm:600
#, fuzzy, c-format
msgid "Time remaining:"
msgstr " ይቀራል"
-#: steps_gtk.pm:598
+#: steps_gtk.pm:601
#, fuzzy, c-format
msgid "(estimating...)"
msgstr "በግምት"
-#: steps_gtk.pm:628
+#: steps_gtk.pm:631
#, fuzzy, c-format
msgid "%d package"
msgid_plural "%d packages"
msgstr[0] "%d ጥቅሎች"
msgstr[1] "%d ጥቅሎች"
-#: steps_gtk.pm:683 steps_interactive.pm:834 steps_list.pm:43
+#: steps_gtk.pm:687 steps_interactive.pm:837 steps_list.pm:43
#, c-format
msgid "Summary"
msgstr "ማጠቃለያ"
-#: steps_gtk.pm:702
+#: steps_gtk.pm:706
#, c-format
msgid "Configure"
msgstr "ለውጥ"
-#: steps_gtk.pm:719 steps_interactive.pm:830 steps_interactive.pm:983
+#: steps_gtk.pm:723 steps_interactive.pm:833 steps_interactive.pm:986
#, c-format
msgid "not configured"
msgstr "አልተስተካከለም"
@@ -1039,7 +1086,7 @@ msgid ""
"If you want to skip some of them, you can unselect them now."
msgstr ""
-#: steps_gtk.pm:778 steps_interactive.pm:349
+#: steps_gtk.pm:782 steps_interactive.pm:349
#, c-format
msgid ""
"You have the option to copy the contents of the CDs onto the hard disk drive "
@@ -1048,7 +1095,7 @@ msgid ""
"available once the system is fully installed."
msgstr ""
-#: steps_gtk.pm:780 steps_interactive.pm:351
+#: steps_gtk.pm:784 steps_interactive.pm:351
#, c-format
msgid "Copy whole CDs"
msgstr ""
@@ -1326,101 +1373,101 @@ msgid ""
msgstr ""
#. -PO: example: lilo-graphic on /dev/hda1
-#: steps_interactive.pm:878
+#: steps_interactive.pm:881
#, c-format
msgid "%s on %s"
msgstr "%s %s ላይ ነው"
-#: steps_interactive.pm:910 steps_interactive.pm:917 steps_interactive.pm:930
-#: steps_interactive.pm:947 steps_interactive.pm:962
+#: steps_interactive.pm:913 steps_interactive.pm:920 steps_interactive.pm:933
+#: steps_interactive.pm:950 steps_interactive.pm:965
#, c-format
msgid "Hardware"
msgstr "ሀርድዌር"
-#: steps_interactive.pm:931 steps_interactive.pm:948
+#: steps_interactive.pm:934 steps_interactive.pm:951
#, c-format
msgid "Sound card"
msgstr "የድምፅ ካርድ"
-#: steps_interactive.pm:951
+#: steps_interactive.pm:954
#, c-format
msgid "Do you have an ISA sound card?"
msgstr "የISA ድምጽ ካርድ አለዎት?"
-#: steps_interactive.pm:953
+#: steps_interactive.pm:956
#, c-format
msgid ""
"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
"card"
msgstr ""
-#: steps_interactive.pm:955
+#: steps_interactive.pm:958
#, c-format
msgid "No sound card detected. Try \"harddrake\" after installation"
msgstr ""
-#: steps_interactive.pm:963
+#: steps_interactive.pm:966
#, c-format
msgid "Graphical interface"
msgstr "ንድፋዊ እይታ"
-#: steps_interactive.pm:969 steps_interactive.pm:981
+#: steps_interactive.pm:972 steps_interactive.pm:984
#, c-format
msgid "Network & Internet"
msgstr "መረብ እና ኢንተርኔት"
-#: steps_interactive.pm:982
+#: steps_interactive.pm:985
#, c-format
msgid "Proxies"
msgstr "ወኪሎች"
-#: steps_interactive.pm:983
+#: steps_interactive.pm:986
#, c-format
msgid "configured"
msgstr "ተስተካክሏል"
-#: steps_interactive.pm:993
+#: steps_interactive.pm:996
#, c-format
msgid "Security Level"
msgstr "የደህንነት ደረጃ"
-#: steps_interactive.pm:1013
+#: steps_interactive.pm:1016
#, c-format
msgid "Firewall"
msgstr "የእሳት ግድግዳ"
-#: steps_interactive.pm:1017
+#: steps_interactive.pm:1020
#, c-format
msgid "activated"
msgstr "መስራት ጀምሯል"
-#: steps_interactive.pm:1017
+#: steps_interactive.pm:1020
#, c-format
msgid "disabled"
msgstr "መስራት አቁሟል"
-#: steps_interactive.pm:1031
+#: steps_interactive.pm:1034
#, c-format
msgid "You have not configured X. Are you sure you really want this?"
msgstr ""
-#: steps_interactive.pm:1060
+#: steps_interactive.pm:1063
#, c-format
msgid "Preparing bootloader..."
msgstr "አስጀማሪ በማዘጋጀት ላይ..."
#. -PO: This is NOT the boot loader!!!!
-#: steps_interactive.pm:1062
+#: steps_interactive.pm:1065
#, fuzzy, c-format
msgid "Preparing initial startup program..."
msgstr "ተከላ በማዘጋጀት ላይ"
-#: steps_interactive.pm:1063
+#: steps_interactive.pm:1066
#, c-format
msgid "Be patient, this may take a while..."
msgstr ""
-#: steps_interactive.pm:1074
+#: steps_interactive.pm:1077
#, c-format
msgid ""
"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1429,24 +1476,24 @@ msgid ""
"root fs is: root=%s"
msgstr ""
-#: steps_interactive.pm:1087
+#: steps_interactive.pm:1090
#, c-format
msgid ""
"In this security level, access to the files in the Windows partition is "
"restricted to the administrator."
msgstr ""
-#: steps_interactive.pm:1119
+#: steps_interactive.pm:1122
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr ""
-#: steps_interactive.pm:1121
+#: steps_interactive.pm:1124
#, c-format
msgid "Creating auto install floppy..."
msgstr ""
-#: steps_interactive.pm:1132
+#: steps_interactive.pm:1135
#, c-format
msgid ""
"Some steps are not completed.\n"
@@ -1454,12 +1501,12 @@ msgid ""
"Do you really want to quit now?"
msgstr ""
-#: steps_interactive.pm:1142
+#: steps_interactive.pm:1145
#, c-format
msgid "Congratulations"
msgstr "እንኳን ደስ ያለዎ!"
-#: steps_interactive.pm:1145
+#: steps_interactive.pm:1148
#, c-format
msgid "Reboot"
msgstr "እንደገና ጀምር"
diff --git a/perl-install/install/share/po/ar.po b/perl-install/install/share/po/ar.po
index d3f401e41..89ab8345b 100644
--- a/perl-install/install/share/po/ar.po
+++ b/perl-install/install/share/po/ar.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: drakx_install\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-03 10:51+0200\n"
+"POT-Creation-Date: 2013-11-03 12:08+0200\n"
"PO-Revision-Date: 2011-05-19 13:12+0000\n"
"Last-Translator: salim salim <almusalimalmusalimah@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -74,7 +74,7 @@ msgid "Do you have further supplementary media?"
msgstr "هل لديك وسائط إضافية أخرى؟"
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:113
+#: any.pm:114
#, c-format
msgid ""
"The following media have been found and will be used during install: %s.\n"
@@ -87,177 +87,183 @@ msgstr ""
"\n"
"هل لديك وسيط تثبيت إضافي لضبطه؟"
-#: any.pm:121
+#: any.pm:122
#, c-format
msgid "CD-ROM"
msgstr "القرص المدمج"
-#: any.pm:122
+#: any.pm:123
#, c-format
msgid "Network (HTTP)"
msgstr "الشبكة (HTTP)"
-#: any.pm:123
+#: any.pm:124
#, c-format
msgid "Network (FTP)"
msgstr "الشبكة (FTP)"
-#: any.pm:124
+#: any.pm:125
#, c-format
msgid "Network (NFS)"
msgstr "الشبكة (NFS)"
-#: any.pm:171
+#: any.pm:173
#, c-format
msgid "URL of the mirror?"
msgstr "مسار المرآة؟"
-#: any.pm:177
+#: any.pm:179
#, c-format
msgid "URL must start with ftp:// or http://"
msgstr "يجب أن يبدأ المسار بـ http:// أو بـ ftp://"
-#: any.pm:188
+#: any.pm:190
#, c-format
msgid "Contacting %s web site to get the list of available mirrors..."
msgstr "جاري الاتصال بموقع %s للحصول على قائمة بالمرايا المتوفرة..."
-#: any.pm:193
+#: any.pm:195
#, c-format
msgid "Failed contacting %s web site to get the list of available mirrors"
msgstr "فشل الاتصال بموقع %s للحصول على قائمة بالمرايا المتوفرة"
-#: any.pm:203
+#: any.pm:205
#, c-format
msgid "Choose a mirror from which to get the packages"
msgstr "اختر مرآة لتحصيل الحزم"
-#: any.pm:233
+#: any.pm:235
#, c-format
msgid "NFS setup"
msgstr "تثبيت NFS"
-#: any.pm:234
+#: any.pm:236
#, c-format
msgid "Please enter the hostname and directory of your NFS media"
msgstr "فضلا أدخل اسم المضيف والدليل لوسائط NFS"
-#: any.pm:238
+#: any.pm:240
#, c-format
msgid "Hostname missing"
msgstr "اسم المضيف غير موجود"
-#: any.pm:239
+#: any.pm:241
#, c-format
msgid "Directory must begin with \"/\""
msgstr "يجب أن يبدأ الدليل بـ \"/\""
-#: any.pm:243
+#: any.pm:245
#, c-format
msgid "Hostname of the NFS mount ?"
msgstr "اسم مضيف نقطة وصل NFS ؟"
-#: any.pm:244
+#: any.pm:246
#, c-format
msgid "Directory"
msgstr "الدليل"
-#: any.pm:266
+#: any.pm:268
#, c-format
msgid "Supplementary"
msgstr "إضافي"
-#: any.pm:301
+#: any.pm:303
#, c-format
msgid ""
"Can't find a package list file on this mirror. Make sure the location is "
"correct."
msgstr "لم يمكن العثور على ملف لائحة الحزم على هذه المرآة. تأكد من صحة الموقع."
-#: any.pm:317
+#: any.pm:319
#, c-format
msgid "Core Release"
msgstr "مخزن Core Release"
-#: any.pm:319
+#: any.pm:321
#, c-format
msgid "Tainted Release"
msgstr "مخزن Tainted Release"
-#: any.pm:321
+#: any.pm:323
#, c-format
msgid "Nonfree Release"
msgstr "مخزن Nonfree Release"
-#: any.pm:335
+#: any.pm:351
#, c-format
msgid ""
"Some hardware on your machine needs some non free firmwares in order for the "
"free software drivers to work."
-msgstr "بعض قطع العتاد في جهازك تحتاج بعض المكتبات الغير حرة لتتمكن التعاريف الحرة من العمل."
+msgstr ""
+"بعض قطع العتاد في جهازك تحتاج بعض المكتبات الغير حرة لتتمكن التعاريف الحرة "
+"من العمل."
-#: any.pm:336
+#: any.pm:352
#, c-format
msgid "You should enable \"%s\""
msgstr "يجب أن تفعل \"%s\""
-#: any.pm:355
+#: any.pm:377
#, c-format
msgid "\"%s\" contains the various pieces of the systems and its applications"
msgstr "\"%s\" يحتوي على مختلف مكونات النظام وتطبيقاته"
-#: any.pm:356
+#: any.pm:378
#, c-format
msgid "\"%s\" contains non free software.\n"
msgstr "\"%s\" يحتوي على برمجيات غير حرة. \n"
-#: any.pm:357
+#: any.pm:379
#, c-format
msgid ""
"It also contains firmwares needed for certain devices to operate (eg: some "
"ATI/AMD graphic cards, some network cards, some RAID cards, ...)"
-msgstr "يحتوى أيضا على بعض المكتبات الضرورية لتشغيل قطع عتاد معينة ( على سبيل المثال: كروت الشاشة ATI/AMD، بعض كروت الشبكة، بعض كروت RAID، ...)"
+msgstr ""
+"يحتوى أيضا على بعض المكتبات الضرورية لتشغيل قطع عتاد معينة ( على سبيل "
+"المثال: كروت الشاشة ATI/AMD، بعض كروت الشبكة، بعض كروت RAID، ...)"
-#: any.pm:358
+#: any.pm:380
#, c-format
msgid ""
"\"%s\" contains software that can not be distributed in every country due to "
"software patents."
-msgstr "\"%s\" يحتوى على برمجيات لا يمكن إعادة نشرها في جميع بقاع العالم بسبب براءات الاختراع. "
+msgstr ""
+"\"%s\" يحتوى على برمجيات لا يمكن إعادة نشرها في جميع بقاع العالم بسبب "
+"براءات الاختراع. "
-#: any.pm:359
+#: any.pm:381
#, c-format
msgid ""
"It also contains software from \"%s\" rebuild with additional capabilities."
msgstr "يحتوي أيضا على برمجيات من \"%s\" تم إعادة بنائها بإمكانيات إضافية."
-#: any.pm:363
+#: any.pm:387
#, c-format
msgid "Here you can enable more media if you want."
msgstr "هنا يمكنك تفعيل وسائط أكثر إن أردت."
-#: any.pm:378
+#: any.pm:404
#, c-format
msgid "This medium provides package updates for medium \"%s\""
msgstr "هذا الوسيط يوفر تحديثات للبرمجيات للوسيط \"%s\""
-#: any.pm:451
+#: any.pm:480
#, c-format
msgid "Looking at packages already installed..."
msgstr "جاري البحث عن الحزم المثبتة مسبقا..."
-#: any.pm:485
+#: any.pm:514
#, c-format
msgid "Finding packages to upgrade..."
msgstr "جاري العثور على الحزم التي يمكن ترقيتها... "
-#: any.pm:498
+#: any.pm:527
#, c-format
msgid "Removing packages prior to upgrade..."
msgstr "جاري إزالة الحزم قبيل ترقيتها"
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:713
+#: any.pm:743
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -270,72 +276,72 @@ msgstr ""
"\n"
"هل تريد حذف هذه الحزم فعلا؟\n"
-#: any.pm:932
+#: any.pm:962
#, c-format
msgid "Error reading file %s"
msgstr "خطأ في قراءة الملف %s"
-#: any.pm:1140
+#: any.pm:1170
#, c-format
msgid "The following disk(s) were renamed:"
msgstr "لقد تم تغيير أسماء الأقراص التالية:"
-#: any.pm:1142
+#: any.pm:1172
#, c-format
msgid "%s (previously named as %s)"
msgstr "%s (المسمى %s سابقاً)"
-#: any.pm:1199
+#: any.pm:1229
#, c-format
msgid "HTTP"
msgstr "HTTP"
-#: any.pm:1199
+#: any.pm:1229
#, c-format
msgid "FTP"
msgstr "FTP"
-#: any.pm:1199
+#: any.pm:1229
#, c-format
msgid "NFS"
msgstr "NFS"
-#: any.pm:1218 steps_interactive.pm:970
+#: any.pm:1248 steps_interactive.pm:973
#, c-format
msgid "Network"
msgstr "الشبكة"
-#: any.pm:1222
+#: any.pm:1252
#, c-format
msgid "Please choose a media"
msgstr "الرجاء اختيار وسيط"
-#: any.pm:1238
+#: any.pm:1268
#, c-format
msgid "File already exists. Overwrite it?"
msgstr "الملف موجود مسبقا. هل تريد استبداله؟"
-#: any.pm:1242
+#: any.pm:1272
#, c-format
msgid "Permission denied"
msgstr "تم رفض الإذن"
-#: any.pm:1290
+#: any.pm:1320
#, c-format
msgid "Bad NFS name"
msgstr "اسم NFS غير صالح"
-#: any.pm:1311
+#: any.pm:1341
#, c-format
msgid "Bad media %s"
msgstr "الوسيط %s سيء"
-#: any.pm:1355
+#: any.pm:1385
#, c-format
msgid "Cannot make screenshots before partitioning"
msgstr "لا يمكن عمل لقطات للشاشة قبل التجزئة"
-#: any.pm:1363
+#: any.pm:1393
#, c-format
msgid "Screenshots will be available after install in %s"
msgstr " لقطات الشاشة ستكون متوفرة بعد التثبيت في %s"
@@ -345,7 +351,7 @@ msgstr " لقطات الشاشة ستكون متوفرة بعد التثبيت
msgid "Installation"
msgstr "التثبيت"
-#: gtk.pm:132 share/meta-task/compssUsers.pl:43
+#: gtk.pm:132 share/meta-task/compssUsers.pl:46
#, c-format
msgid "Configuration"
msgstr "الضبط"
@@ -444,42 +450,42 @@ msgstr ""
"بعض الحزم التي يتطلبها %s لا يمكن تثبيتها:\n"
"%s"
-#: pkgs.pm:382 pkgs.pm:409
+#: pkgs.pm:383 pkgs.pm:410
#, c-format
msgid "An error occurred:"
msgstr "حدث خطأ:"
-#: pkgs.pm:401
+#: pkgs.pm:402
#, c-format
msgid "A fatal error occurred: %s."
msgstr "حدث خطأ فادح: %s"
-#: pkgs.pm:891 pkgs.pm:928
+#: pkgs.pm:896 pkgs.pm:938
#, c-format
msgid "Do not ask again"
msgstr "لا تسأل مرة أخرى"
-#: pkgs.pm:907
+#: pkgs.pm:912
#, c-format
msgid "%d installation transactions failed"
msgstr "فشلت عملية تثبيت %d"
-#: pkgs.pm:908
+#: pkgs.pm:913
#, c-format
msgid "Installation of packages failed:"
msgstr "فشل تثبيت الحزمة:"
-#: share/meta-task/compssUsers.pl:13
+#: share/meta-task/compssUsers.pl:14
#, c-format
msgid "Workstation"
msgstr "محطة عمل"
-#: share/meta-task/compssUsers.pl:15
+#: share/meta-task/compssUsers.pl:16
#, c-format
msgid "Office Workstation"
msgstr "محطة عمل مكتبية"
-#: share/meta-task/compssUsers.pl:17
+#: share/meta-task/compssUsers.pl:18
#, c-format
msgid ""
"Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets "
@@ -488,32 +494,32 @@ msgstr ""
"برامج مكتبية: معالجات نصوص (OpenOffice.org Writer، Kword)، جداول ممتدة "
"(OpenOffice.org Calc، Kspread)، برامج عرض pdf، إلخ"
-#: share/meta-task/compssUsers.pl:22
+#: share/meta-task/compssUsers.pl:24
#, c-format
msgid "Game station"
msgstr "محطة ألعاب"
-#: share/meta-task/compssUsers.pl:23
+#: share/meta-task/compssUsers.pl:25
#, c-format
msgid "Amusement programs: arcade, boards, strategy, etc"
msgstr "برامج تسلية: ألعاب فيديو، ألعاب لوحات، ألعاب استراتيجية، إلخ"
-#: share/meta-task/compssUsers.pl:26
+#: share/meta-task/compssUsers.pl:28
#, c-format
msgid "Multimedia station"
msgstr "محطة وسائط متعددة"
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:29
#, c-format
msgid "Sound and video playing/editing programs"
msgstr "برامج تحرير/تشغيل مرئيات وصوتيات"
-#: share/meta-task/compssUsers.pl:32
+#: share/meta-task/compssUsers.pl:34
#, c-format
msgid "Internet station"
msgstr "محطة إنترنت"
-#: share/meta-task/compssUsers.pl:33
+#: share/meta-task/compssUsers.pl:35
#, c-format
msgid ""
"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -521,193 +527,193 @@ msgid ""
msgstr ""
"مجموعة أدوات لقراءة وإرسال البريد والأخبار (mutt، tin..) ولتصفح الإنترنت"
-#: share/meta-task/compssUsers.pl:38
+#: share/meta-task/compssUsers.pl:40
#, c-format
msgid "Network Computer (client)"
msgstr "جهاز شبكة (عميل)"
-#: share/meta-task/compssUsers.pl:39
+#: share/meta-task/compssUsers.pl:41
#, c-format
msgid "Clients for different protocols including ssh"
msgstr "عملاء لبروتوكولات مختلفة بما فيها ssh"
-#: share/meta-task/compssUsers.pl:44
+#: share/meta-task/compssUsers.pl:47
#, c-format
msgid "Tools to ease the configuration of your computer"
msgstr "أدوات لتسهيل ضبط حاسبك"
-#: share/meta-task/compssUsers.pl:48
+#: share/meta-task/compssUsers.pl:51
#, c-format
msgid "Console Tools"
msgstr "أدوات الطرفيات"
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:52
#, c-format
msgid "Editors, shells, file tools, terminals"
msgstr "محررات نصوص، صدفات، أدوات ملفات، طرفيات"
-#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156
-#: share/meta-task/compssUsers.pl:158
+#: share/meta-task/compssUsers.pl:56 share/meta-task/compssUsers.pl:200
+#: share/meta-task/compssUsers.pl:202
#, c-format
msgid "Development"
msgstr "تطوير"
-#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:203
#, c-format
msgid "C and C++ development libraries, programs and include files"
msgstr "مكتبات تطوير خاصة بلغة C وC++، برامج وملفات مضمنة"
-#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163
+#: share/meta-task/compssUsers.pl:61 share/meta-task/compssUsers.pl:207
#, c-format
msgid "Documentation"
msgstr "توثيق"
-#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
+#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:208
#, c-format
msgid "Books and Howto's on Linux and Free Software"
msgstr "كتب ودلائل إرشادية حول لينكس والبرامج الحرة"
-#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167
+#: share/meta-task/compssUsers.pl:66 share/meta-task/compssUsers.pl:211
#, c-format
msgid "LSB"
msgstr "LSB"
-#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:67 share/meta-task/compssUsers.pl:212
#, c-format
msgid "Linux Standard Base. Third party applications support"
msgstr "القاعدة القياسية للينكس (LSB). دعم تطبيقات الطرف الثالث"
-#: share/meta-task/compssUsers.pl:72
+#: share/meta-task/compssUsers.pl:77
#, c-format
msgid "Web Server"
msgstr "خادم وب"
-#: share/meta-task/compssUsers.pl:73
+#: share/meta-task/compssUsers.pl:78
#, c-format
msgid "Apache"
msgstr "Apache"
-#: share/meta-task/compssUsers.pl:76
+#: share/meta-task/compssUsers.pl:82
#, c-format
msgid "Groupware"
msgstr "برامج مجموعات"
-#: share/meta-task/compssUsers.pl:77
+#: share/meta-task/compssUsers.pl:83
#, c-format
msgid "Kolab Server"
msgstr "خادم Kolab"
-#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121
+#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl:136
#, c-format
msgid "Firewall/Router"
msgstr "جدار ناري/روتر"
-#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
+#: share/meta-task/compssUsers.pl:87 share/meta-task/compssUsers.pl:137
#, c-format
msgid "Internet gateway"
msgstr "بوابة إنترنت"
-#: share/meta-task/compssUsers.pl:84
+#: share/meta-task/compssUsers.pl:90
#, c-format
msgid "Mail/News"
msgstr "بريد/أخبار"
-#: share/meta-task/compssUsers.pl:85
+#: share/meta-task/compssUsers.pl:91
#, c-format
msgid "Postfix mail server, Inn news server"
msgstr "خادم بريد Postfix، خادم أخبار Inn"
-#: share/meta-task/compssUsers.pl:88
+#: share/meta-task/compssUsers.pl:95
#, c-format
msgid "Directory Server"
msgstr "خادم مجلدات"
-#: share/meta-task/compssUsers.pl:92
+#: share/meta-task/compssUsers.pl:100
#, c-format
msgid "FTP Server"
msgstr "خادم FTP"
-#: share/meta-task/compssUsers.pl:93
+#: share/meta-task/compssUsers.pl:101
#, c-format
msgid "ProFTPd"
msgstr "ProFTPd"
-#: share/meta-task/compssUsers.pl:96
+#: share/meta-task/compssUsers.pl:105
#, c-format
msgid "DNS/NIS"
msgstr "DNS/NIS"
-#: share/meta-task/compssUsers.pl:97
+#: share/meta-task/compssUsers.pl:106
#, c-format
msgid "Domain Name and Network Information Server"
msgstr "خادم أسماء النطاقات ومعلومات الشبكة"
-#: share/meta-task/compssUsers.pl:100
+#: share/meta-task/compssUsers.pl:110
#, c-format
msgid "File and Printer Sharing Server"
msgstr "خادم مشاركة الملفات والطابعات"
-#: share/meta-task/compssUsers.pl:101
+#: share/meta-task/compssUsers.pl:111
#, c-format
msgid "NFS Server, Samba server"
msgstr "خادم NFS، خادم سامبا"
-#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117
+#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl:131
#, c-format
msgid "Database"
msgstr "قواعد بيانات"
-#: share/meta-task/compssUsers.pl:105
+#: share/meta-task/compssUsers.pl:116
#, c-format
msgid "PostgreSQL and MariaDB Database Server"
msgstr "خادم قواعد بيانات PostgreSQL و MariaDB"
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:121
#, c-format
msgid "Web/FTP"
msgstr "وب/FTP"
-#: share/meta-task/compssUsers.pl:110
+#: share/meta-task/compssUsers.pl:122
#, c-format
msgid "Apache, Pro-ftpd"
msgstr "Apache، Pro-ftpd"
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:126
#, c-format
msgid "Mail"
msgstr "البريد"
-#: share/meta-task/compssUsers.pl:114
+#: share/meta-task/compssUsers.pl:127
#, c-format
msgid "Postfix mail server"
msgstr "خادم بريد Postfix"
-#: share/meta-task/compssUsers.pl:118
+#: share/meta-task/compssUsers.pl:132
#, c-format
msgid "PostgreSQL or MariaDB database server"
msgstr "خادم قواعد بيانات PostgreSQL أو MariaDB"
-#: share/meta-task/compssUsers.pl:125
+#: share/meta-task/compssUsers.pl:140
#, c-format
msgid "Network Computer server"
msgstr "خادم شبكات"
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:141
#, c-format
msgid "NFS server, SMB server, Proxy server, ssh server"
msgstr "خادم NFS، خادم SMB، خادم وسيط، خادم ssh"
-#: share/meta-task/compssUsers.pl:132
+#: share/meta-task/compssUsers.pl:148
#, c-format
msgid "Graphical Environment"
msgstr "بيئات رسومية"
-#: share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:150
#, c-format
msgid "KDE Workstation"
msgstr "محطة عمل كدي"
-#: share/meta-task/compssUsers.pl:135
+#: share/meta-task/compssUsers.pl:151
#, c-format
msgid ""
"The K Desktop Environment, the basic graphical environment with a collection "
@@ -715,12 +721,12 @@ msgid ""
msgstr ""
"بيئة سطح مكتب كدي، البيئة الرسومية الأساسية مع مجموعة من الأدوات المصاحبة"
-#: share/meta-task/compssUsers.pl:139
+#: share/meta-task/compssUsers.pl:156
#, c-format
msgid "GNOME Workstation"
msgstr "محطة عمل جنوم"
-#: share/meta-task/compssUsers.pl:140
+#: share/meta-task/compssUsers.pl:157 share/meta-task/compssUsers.pl:168
#, c-format
msgid ""
"A graphical environment with user-friendly set of applications and desktop "
@@ -729,66 +735,117 @@ msgstr ""
"بيئة رسومية مع مجموعة من التطبيقات وأدوات سطح المكتب المناسبة للمستخدمين "
"العاديين"
-#: share/meta-task/compssUsers.pl:144
+#: share/meta-task/compssUsers.pl:162
+#, fuzzy, c-format
+msgid "XFCE Workstation"
+msgstr "محطة عمل كدي"
+
+#: share/meta-task/compssUsers.pl:163
+#, fuzzy, c-format
+msgid ""
+"A lighter graphical environment with user-friendly set of applications and "
+"desktop tools"
+msgstr ""
+"بيئة رسومية مع مجموعة من التطبيقات وأدوات سطح المكتب المناسبة للمستخدمين "
+"العاديين"
+
+#: share/meta-task/compssUsers.pl:167
+#, fuzzy, c-format
+msgid "MATE Workstation"
+msgstr "محطة عمل جنوم"
+
+#: share/meta-task/compssUsers.pl:172
+#, fuzzy, c-format
+msgid "Cinnamon Workstation"
+msgstr "محطة عمل"
+
+#: share/meta-task/compssUsers.pl:173
+#, fuzzy, c-format
+msgid "A graphical environment based on GNOME"
+msgstr "بيئات رسومية"
+
+#: share/meta-task/compssUsers.pl:177
#, c-format
msgid "LXDE Desktop"
msgstr "سطح مكتب LXDE"
-#: share/meta-task/compssUsers.pl:146
+#: share/meta-task/compssUsers.pl:179
#, c-format
msgid ""
"A lightweight & fast graphical environment with user-friendly set of "
"applications and desktop tools"
msgstr ""
-"بيئة رسومية خفيفة وسريعة مع مجموعة من التطبيقات وأدوات سطح المكتب المناسبة للمستخدمين "
-"العاديين"
+"بيئة رسومية خفيفة وسريعة مع مجموعة من التطبيقات وأدوات سطح المكتب المناسبة "
+"للمستخدمين العاديين"
+
+#: share/meta-task/compssUsers.pl:183
+#, fuzzy, c-format
+msgid "RazorQT Desktop"
+msgstr "سطح مكتب مخصص"
+
+#: share/meta-task/compssUsers.pl:185
+#, c-format
+msgid "A less developed lightweight fast graphical environment"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:188
+#, c-format
+msgid "Enlightenment e17 Desktop"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:190
+#, fuzzy, c-format
+msgid "A lightweight fast graphical environment with a dedicated following"
+msgstr ""
+"بيئة رسومية خفيفة وسريعة مع مجموعة من التطبيقات وأدوات سطح المكتب المناسبة "
+"للمستخدمين العاديين"
-#: share/meta-task/compssUsers.pl:149
+#: share/meta-task/compssUsers.pl:193
#, c-format
msgid "Other Graphical Desktops"
msgstr "أسطح مكتب رسومية أخرى"
-#: share/meta-task/compssUsers.pl:150
-#, c-format
-msgid "Window Maker, Enlightenment, Fvwm, etc"
+#: share/meta-task/compssUsers.pl:194
+#, fuzzy, c-format
+msgid "Window Maker, Fvwm, etc"
msgstr "Icewm، Window Maker، Enlightenment، Fvwm، إلخ"
-#: share/meta-task/compssUsers.pl:173
+#: share/meta-task/compssUsers.pl:217
#, c-format
msgid "Utilities"
msgstr "أدوات"
-#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176
+#: share/meta-task/compssUsers.pl:219 share/meta-task/compssUsers.pl:220
#, c-format
msgid "SSH Server"
msgstr "خادم SSH"
-#: share/meta-task/compssUsers.pl:180
+#: share/meta-task/compssUsers.pl:224
#, c-format
msgid "Webmin"
msgstr "Webmin"
-#: share/meta-task/compssUsers.pl:181
+#: share/meta-task/compssUsers.pl:225
#, c-format
msgid "Webmin Remote Configuration Server"
msgstr "خادم الضبط البعيد Webmin"
-#: share/meta-task/compssUsers.pl:185
+#: share/meta-task/compssUsers.pl:229
#, c-format
msgid "Network Utilities/Monitoring"
msgstr "وسائل الشبكة/المراقبة"
-#: share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:230
#, c-format
msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
msgstr "أدوات مراقبة، محاسبة عمليات، tcpdump، nmap، ..."
-#: share/meta-task/compssUsers.pl:190
+#: share/meta-task/compssUsers.pl:234
#, c-format
msgid "Mageia Wizards"
msgstr "مرشدو ماجيا"
-#: share/meta-task/compssUsers.pl:191
+#: share/meta-task/compssUsers.pl:235
#, c-format
msgid "Wizards to configure server"
msgstr "مرشدو ضبط الخادم"
@@ -802,7 +859,7 @@ msgstr ""
"حدث خطأ ولا أعرف كيف أتعامل معه جيدأ. \n"
"تابع على مسؤوليتك."
-#: steps.pm:461
+#: steps.pm:458
#, c-format
msgid ""
"Some important packages did not get installed properly.\n"
@@ -855,194 +912,194 @@ msgstr "انتقاء الوسائط"
msgid "Install %s KDE Desktop"
msgstr "تثبيت %s بسطح مكتب كدي"
-#: steps_gtk.pm:244
+#: steps_gtk.pm:252
#, c-format
msgid "Install %s GNOME Desktop"
msgstr "تثبيت %s بسطح مكتب جنوم"
-#: steps_gtk.pm:245
+#: steps_gtk.pm:253
#, c-format
msgid "Custom install"
msgstr "تثبيت مخصص"
-#: steps_gtk.pm:266
+#: steps_gtk.pm:274
#, c-format
msgid "KDE Desktop"
msgstr "سطح مكتب كدي"
-#: steps_gtk.pm:267
+#: steps_gtk.pm:275
#, c-format
msgid "GNOME Desktop"
msgstr "سطح مكتب جنوم"
-#: steps_gtk.pm:268
+#: steps_gtk.pm:276
#, c-format
msgid "Custom Desktop"
msgstr "سطح مكتب مخصص"
-#: steps_gtk.pm:274
+#: steps_gtk.pm:282
#, c-format
msgid "Here's a preview of the '%s' desktop."
msgstr "هذه معاينة لشكل سطح مكتب %s"
-#: steps_gtk.pm:301
+#: steps_gtk.pm:309
#, c-format
msgid "Click on images in order to see a bigger preview"
msgstr "اضغط على الصور لتشاهد المعاينة بحجم أكبر"
-#: steps_gtk.pm:319 steps_interactive.pm:633 steps_list.pm:30
+#: steps_gtk.pm:325 steps_interactive.pm:633 steps_list.pm:30
#, c-format
msgid "Package Group Selection"
msgstr "انتقاء مجموعات الحزم"
-#: steps_gtk.pm:344 steps_interactive.pm:650
+#: steps_gtk.pm:350 steps_interactive.pm:650
#, c-format
msgid "Individual package selection"
msgstr "انتقاء مفرد للحزم"
-#: steps_gtk.pm:351
+#: steps_gtk.pm:357
#, c-format
msgid "Unselect All"
msgstr "إلغاء اختيار الكل"
-#: steps_gtk.pm:370 steps_interactive.pm:562
+#: steps_gtk.pm:376 steps_interactive.pm:562
#, c-format
msgid "Total size: %d / %d MB"
msgstr "الحجم الإجمالي: %d / %d م.ب"
-#: steps_gtk.pm:415
+#: steps_gtk.pm:421
#, c-format
msgid "Version: "
msgstr "الإصدار: "
-#: steps_gtk.pm:416
+#: steps_gtk.pm:422
#, c-format
msgid "Size: "
msgstr "الحجم: "
-#: steps_gtk.pm:416
+#: steps_gtk.pm:422
#, c-format
msgid "%d KB\n"
msgstr "%d ك.ب\n"
-#: steps_gtk.pm:417
+#: steps_gtk.pm:423
#, c-format
msgid "Importance: "
msgstr "الأهمية: "
-#: steps_gtk.pm:452
+#: steps_gtk.pm:458
#, c-format
msgid "You cannot select/unselect this package"
msgstr "لا يمكنك انتقاء/إلغاء انتقاء هذه الحزمة"
-#: steps_gtk.pm:456
+#: steps_gtk.pm:462
#, c-format
msgid "due to missing %s"
msgstr "بسبب نقص %s"
-#: steps_gtk.pm:457
+#: steps_gtk.pm:463
#, c-format
msgid "due to unsatisfied %s"
msgstr "بسبب عدم إرضاء %s"
-#: steps_gtk.pm:458
+#: steps_gtk.pm:464
#, c-format
msgid "trying to promote %s"
msgstr "السعي إلى ترويج %s"
-#: steps_gtk.pm:459
+#: steps_gtk.pm:465
#, c-format
msgid "in order to keep %s"
msgstr "من أجل الاحتفاظ بـ %s"
-#: steps_gtk.pm:464
+#: steps_gtk.pm:470
#, c-format
msgid ""
"You cannot select this package as there is not enough space left to install "
"it"
msgstr "لا يمكنك انتقاء هذه الحزمة لأنه لا يوجد مساحة كافية لتثبيتها"
-#: steps_gtk.pm:467
+#: steps_gtk.pm:473
#, c-format
msgid "The following packages are going to be installed"
msgstr "ستثبت الحزم التالية"
-#: steps_gtk.pm:468
+#: steps_gtk.pm:474
#, c-format
msgid "The following packages are going to be removed"
msgstr "ستحذف الحزم التالية"
-#: steps_gtk.pm:494
+#: steps_gtk.pm:500
#, c-format
msgid "This is a mandatory package, it cannot be unselected"
msgstr "هذه الحزمة إلزامية؛ لا يمكن إلغاء انتقائها"
-#: steps_gtk.pm:496
+#: steps_gtk.pm:502
#, c-format
msgid "You cannot unselect this package. It is already installed"
msgstr "لا يمكن إلغاء انتقاء هذه الحزمة؛ لأنها مثبتة مسبقاً"
-#: steps_gtk.pm:498
+#: steps_gtk.pm:504
#, c-format
msgid "You cannot unselect this package. It must be upgraded"
msgstr "لا يمكنك إلغاء انتقاء هذه الحزمة. لأن ترقيتها ضرورية"
-#: steps_gtk.pm:502
+#: steps_gtk.pm:508
#, c-format
msgid "Show automatically selected packages"
msgstr "إظهار الحزم المنتقاة آليا"
-#: steps_gtk.pm:509
+#: steps_gtk.pm:512
#, c-format
msgid "Install"
msgstr "تثبيت"
-#: steps_gtk.pm:512
+#: steps_gtk.pm:515
#, c-format
msgid "Load/Save selection"
msgstr "تحميل/حفظ الانتقاء"
-#: steps_gtk.pm:513
+#: steps_gtk.pm:516
#, c-format
msgid "Updating package selection"
msgstr "تحديث انتقاء الحزم"
-#: steps_gtk.pm:518
+#: steps_gtk.pm:521
#, c-format
msgid "Minimal install"
msgstr "تثبيت مصغر"
-#: steps_gtk.pm:531
+#: steps_gtk.pm:534
#, c-format
msgid "Software Management"
msgstr "إدارة البرامج"
-#: steps_gtk.pm:531 steps_interactive.pm:443
+#: steps_gtk.pm:534 steps_interactive.pm:443
#, c-format
msgid "Choose the packages you want to install"
msgstr "اختر الحزم التي تريد تثبيتها"
-#: steps_gtk.pm:548 steps_interactive.pm:670 steps_list.pm:32
+#: steps_gtk.pm:551 steps_interactive.pm:670 steps_list.pm:32
#, c-format
msgid "Installing"
msgstr "التثبيت"
-#: steps_gtk.pm:578
+#: steps_gtk.pm:581
#, c-format
msgid "No details"
msgstr "لا تفاصيل"
-#: steps_gtk.pm:597
+#: steps_gtk.pm:600
#, c-format
msgid "Time remaining:"
msgstr "الوقت المتبقي:"
-#: steps_gtk.pm:598
+#: steps_gtk.pm:601
#, c-format
msgid "(estimating...)"
msgstr "(حساب تقديري...)"
-#: steps_gtk.pm:628
+#: steps_gtk.pm:631
#, c-format
msgid "%d package"
msgid_plural "%d packages"
@@ -1053,17 +1110,17 @@ msgstr[3] "%d حزم"
msgstr[4] "%d حزم"
msgstr[5] "%d حزم"
-#: steps_gtk.pm:683 steps_interactive.pm:834 steps_list.pm:43
+#: steps_gtk.pm:687 steps_interactive.pm:837 steps_list.pm:43
#, c-format
msgid "Summary"
msgstr "ملخص"
-#: steps_gtk.pm:702
+#: steps_gtk.pm:706
#, c-format
msgid "Configure"
msgstr "اضبط"
-#: steps_gtk.pm:719 steps_interactive.pm:830 steps_interactive.pm:983
+#: steps_gtk.pm:723 steps_interactive.pm:833 steps_interactive.pm:986
#, c-format
msgid "not configured"
msgstr "غير مضبوط"
@@ -1077,7 +1134,7 @@ msgstr ""
"تم العثور على وسائط التثبيت التالية.\n"
"إن كنت تريد تخطي بعضها، فيمكنك إلغاء انتقائها الآن."
-#: steps_gtk.pm:778 steps_interactive.pm:349
+#: steps_gtk.pm:782 steps_interactive.pm:349
#, c-format
msgid ""
"You have the option to copy the contents of the CDs onto the hard disk drive "
@@ -1088,7 +1145,7 @@ msgstr ""
"لديك الخيار بنسخ محتويات الأقراص المدمجة إلى قرصك الصلب قبل التثبيت.\n"
"حيئذ، سيكمل التثبيت من القرص الصلب وستبقى الحزم متوفرة حتى يثبت النظام كاملا."
-#: steps_gtk.pm:780 steps_interactive.pm:351
+#: steps_gtk.pm:784 steps_interactive.pm:351
#, c-format
msgid "Copy whole CDs"
msgstr "نسخ الأقراص كاملة"
@@ -1391,101 +1448,101 @@ msgstr ""
"هل تريد تثبيت هذه التحديثات؟"
#. -PO: example: lilo-graphic on /dev/hda1
-#: steps_interactive.pm:878
+#: steps_interactive.pm:881
#, c-format
msgid "%s on %s"
msgstr "%s على %s"
-#: steps_interactive.pm:910 steps_interactive.pm:917 steps_interactive.pm:930
-#: steps_interactive.pm:947 steps_interactive.pm:962
+#: steps_interactive.pm:913 steps_interactive.pm:920 steps_interactive.pm:933
+#: steps_interactive.pm:950 steps_interactive.pm:965
#, c-format
msgid "Hardware"
msgstr "العتاد"
-#: steps_interactive.pm:931 steps_interactive.pm:948
+#: steps_interactive.pm:934 steps_interactive.pm:951
#, c-format
msgid "Sound card"
msgstr "بطاقة الصوت"
-#: steps_interactive.pm:951
+#: steps_interactive.pm:954
#, c-format
msgid "Do you have an ISA sound card?"
msgstr "هل لديك بطاقة صوت ISA؟"
-#: steps_interactive.pm:953
+#: steps_interactive.pm:956
#, c-format
msgid ""
"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
"card"
msgstr "شغّل \"alsaconf\" أو \"sndconfig\" بعد التّثبيت لضبط بطاقة الصّوت"
-#: steps_interactive.pm:955
+#: steps_interactive.pm:958
#, c-format
msgid "No sound card detected. Try \"harddrake\" after installation"
msgstr "لم يتم التعرف على أي بطاقة صوت. حاول تشغيل \"harddrake\" بعد التثبيت"
-#: steps_interactive.pm:963
+#: steps_interactive.pm:966
#, c-format
msgid "Graphical interface"
msgstr "الواجهة الرسومية"
-#: steps_interactive.pm:969 steps_interactive.pm:981
+#: steps_interactive.pm:972 steps_interactive.pm:984
#, c-format
msgid "Network & Internet"
msgstr "الشبكة والإنترنت"
-#: steps_interactive.pm:982
+#: steps_interactive.pm:985
#, c-format
msgid "Proxies"
msgstr "الخوادم الوسيطة"
-#: steps_interactive.pm:983
+#: steps_interactive.pm:986
#, c-format
msgid "configured"
msgstr "تم ضبطه"
-#: steps_interactive.pm:993
+#: steps_interactive.pm:996
#, c-format
msgid "Security Level"
msgstr "مستوى الأمن"
-#: steps_interactive.pm:1013
+#: steps_interactive.pm:1016
#, c-format
msgid "Firewall"
msgstr "جدار ناري"
-#: steps_interactive.pm:1017
+#: steps_interactive.pm:1020
#, c-format
msgid "activated"
msgstr "مفعلة"
-#: steps_interactive.pm:1017
+#: steps_interactive.pm:1020
#, c-format
msgid "disabled"
msgstr "معطلة"
-#: steps_interactive.pm:1031
+#: steps_interactive.pm:1034
#, c-format
msgid "You have not configured X. Are you sure you really want this?"
msgstr "لم تقم بضبط خادم (X). هل أنت متأكد أنك تريد ذلك؟"
-#: steps_interactive.pm:1060
+#: steps_interactive.pm:1063
#, c-format
msgid "Preparing bootloader..."
msgstr "تحضير محمل الإقلاع..."
#. -PO: This is NOT the boot loader!!!!
-#: steps_interactive.pm:1062
+#: steps_interactive.pm:1065
#, c-format
msgid "Preparing initial startup program..."
msgstr "تحضير برنامج بدء التشغيل الأولي..."
-#: steps_interactive.pm:1063
+#: steps_interactive.pm:1066
#, c-format
msgid "Be patient, this may take a while..."
msgstr "كن صبورا، ستستغرق العملية بعض الوقت..."
-#: steps_interactive.pm:1074
+#: steps_interactive.pm:1077
#, c-format
msgid ""
"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1497,7 +1554,7 @@ msgstr ""
"نظامك. ستستمر عملية التثبيت، لكنك بحاجة إلى استخدام BootX أو طريقة ما أخرى "
"لإقلاع نظامك. معطى النواة لنظام الملفات الجذر هو: root=%s"
-#: steps_interactive.pm:1087
+#: steps_interactive.pm:1090
#, c-format
msgid ""
"In this security level, access to the files in the Windows partition is "
@@ -1506,17 +1563,17 @@ msgstr ""
"في هذا المستوى الأمني، الوصول إلى الملفات في قسم وندوز سيكون مقصوراً على "
"المدير."
-#: steps_interactive.pm:1119
+#: steps_interactive.pm:1122
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr "أدخل قرصا مرنا فارغا في محرك الأقراص %s"
-#: steps_interactive.pm:1121
+#: steps_interactive.pm:1124
#, c-format
msgid "Creating auto install floppy..."
msgstr "إنشاء قرص مرن للتثبيت الآلي..."
-#: steps_interactive.pm:1132
+#: steps_interactive.pm:1135
#, c-format
msgid ""
"Some steps are not completed.\n"
@@ -1527,12 +1584,12 @@ msgstr ""
"\n"
"هل تريد الخروج الآن حقا؟"
-#: steps_interactive.pm:1142
+#: steps_interactive.pm:1145
#, c-format
msgid "Congratulations"
msgstr "تهانينا"
-#: steps_interactive.pm:1145
+#: steps_interactive.pm:1148
#, c-format
msgid "Reboot"
msgstr "إعادة اﻹقلاع"
diff --git a/perl-install/install/share/po/ast.po b/perl-install/install/share/po/ast.po
index ea9f19eec..adb47b87a 100644
--- a/perl-install/install/share/po/ast.po
+++ b/perl-install/install/share/po/ast.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: DrakX\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-03 10:51+0200\n"
+"POT-Creation-Date: 2013-11-03 12:08+0200\n"
"PO-Revision-Date: 2009-11-04 19:22+0100\n"
"Last-Translator: astur <malditoastur@gmail.com>\n"
"Language-Team: Asturian <alministradores@softastur.org>\n"
@@ -74,7 +74,7 @@ msgid "Do you have further supplementary media?"
msgstr "¿Tienes dalgún soporte d'instalación suplementariu?"
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:113
+#: any.pm:114
#, c-format
msgid ""
"The following media have been found and will be used during install: %s.\n"
@@ -87,90 +87,90 @@ msgstr ""
"\n"
"¿Tienes dalgún sofitu suplementariu que configurar?"
-#: any.pm:121
+#: any.pm:122
#, c-format
msgid "CD-ROM"
msgstr "CD-ROM"
-#: any.pm:122
+#: any.pm:123
#, c-format
msgid "Network (HTTP)"
msgstr "Rede(HTTP)"
-#: any.pm:123
+#: any.pm:124
#, c-format
msgid "Network (FTP)"
msgstr "Rede(FTP)"
-#: any.pm:124
+#: any.pm:125
#, c-format
msgid "Network (NFS)"
msgstr "Rede(NFS)"
-#: any.pm:171
+#: any.pm:173
#, c-format
msgid "URL of the mirror?"
msgstr "¿URL del espeyu?"
-#: any.pm:177
+#: any.pm:179
#, c-format
msgid "URL must start with ftp:// or http://"
msgstr "La URL tien d'entamar con ftp:// o http://"
-#: any.pm:188
+#: any.pm:190
#, c-format
msgid "Contacting %s web site to get the list of available mirrors..."
msgstr ""
"Contautando col sitiu web de %s p'algamar la llista d'espeyos disponibles"
-#: any.pm:193
+#: any.pm:195
#, c-format
msgid "Failed contacting %s web site to get the list of available mirrors"
msgstr ""
"Nun pudo coneutase col sitiu web de %s p'algamar la llista d'espeyos "
"disponibles"
-#: any.pm:203
+#: any.pm:205
#, c-format
msgid "Choose a mirror from which to get the packages"
msgstr "Escueye un espeyu del qu'algamar los paquetes"
-#: any.pm:233
+#: any.pm:235
#, c-format
msgid "NFS setup"
msgstr "Configuración NFS"
-#: any.pm:234
+#: any.pm:236
#, c-format
msgid "Please enter the hostname and directory of your NFS media"
msgstr "Introduz el nome de sirvidor y el direutoriu del to preséu NFS"
-#: any.pm:238
+#: any.pm:240
#, c-format
msgid "Hostname missing"
msgstr "Falta'l nome del sirvidor"
-#: any.pm:239
+#: any.pm:241
#, c-format
msgid "Directory must begin with \"/\""
msgstr "El direutoriu tien qu'entamar con \"/\""
-#: any.pm:243
+#: any.pm:245
#, c-format
msgid "Hostname of the NFS mount ?"
msgstr "¿Nome del sirvidor del montaxe NFS?"
-#: any.pm:244
+#: any.pm:246
#, c-format
msgid "Directory"
msgstr "Direutoriu"
-#: any.pm:266
+#: any.pm:268
#, c-format
msgid "Supplementary"
msgstr "Suplementariu"
-#: any.pm:301
+#: any.pm:303
#, c-format
msgid ""
"Can't find a package list file on this mirror. Make sure the location is "
@@ -179,90 +179,90 @@ msgstr ""
"Nun pudo alcontrase'l ficheru hdlist nesti espeyu. Asegúrate que "
"l'allugamientu ye correutu."
-#: any.pm:317
+#: any.pm:319
#, c-format
msgid "Core Release"
msgstr ""
-#: any.pm:319
+#: any.pm:321
#, c-format
msgid "Tainted Release"
msgstr ""
-#: any.pm:321
+#: any.pm:323
#, c-format
msgid "Nonfree Release"
msgstr ""
-#: any.pm:335
+#: any.pm:351
#, c-format
msgid ""
"Some hardware on your machine needs some non free firmwares in order for the "
"free software drivers to work."
msgstr ""
-#: any.pm:336
+#: any.pm:352
#, c-format
msgid "You should enable \"%s\""
msgstr ""
-#: any.pm:355
+#: any.pm:377
#, c-format
msgid "\"%s\" contains the various pieces of the systems and its applications"
msgstr ""
-#: any.pm:356
+#: any.pm:378
#, c-format
msgid "\"%s\" contains non free software.\n"
msgstr ""
-#: any.pm:357
+#: any.pm:379
#, c-format
msgid ""
"It also contains firmwares needed for certain devices to operate (eg: some "
"ATI/AMD graphic cards, some network cards, some RAID cards, ...)"
msgstr ""
-#: any.pm:358
+#: any.pm:380
#, c-format
msgid ""
"\"%s\" contains software that can not be distributed in every country due to "
"software patents."
msgstr ""
-#: any.pm:359
+#: any.pm:381
#, c-format
msgid ""
"It also contains software from \"%s\" rebuild with additional capabilities."
msgstr ""
-#: any.pm:363
+#: any.pm:387
#, c-format
msgid "Here you can enable more media if you want."
msgstr ""
-#: any.pm:378
+#: any.pm:404
#, fuzzy, c-format
msgid "This medium provides package updates for medium \"%s\""
msgstr "Omitir tolos paquetes del preséu \"%s\""
-#: any.pm:451
+#: any.pm:480
#, c-format
msgid "Looking at packages already installed..."
msgstr "Guetando paquetes ya instalaos..."
-#: any.pm:485
+#: any.pm:514
#, c-format
msgid "Finding packages to upgrade..."
msgstr "Alcontrando los paquetes a anovar..."
-#: any.pm:498
+#: any.pm:527
#, c-format
msgid "Removing packages prior to upgrade..."
msgstr "Desaniciando paquetes enantes d'anovar..."
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:713
+#: any.pm:743
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -276,72 +276,72 @@ msgstr ""
"\n"
"¿De xuro que quies desanciar estos paquetes?\n"
-#: any.pm:932
+#: any.pm:962
#, c-format
msgid "Error reading file %s"
msgstr "Fallu al lleer el ficheru %s"
-#: any.pm:1140
+#: any.pm:1170
#, c-format
msgid "The following disk(s) were renamed:"
msgstr "Renomáronse los siguientes discos:"
-#: any.pm:1142
+#: any.pm:1172
#, c-format
msgid "%s (previously named as %s)"
msgstr "%s (enantes conocíu como %s)"
-#: any.pm:1199
+#: any.pm:1229
#, c-format
msgid "HTTP"
msgstr "HTTP"
-#: any.pm:1199
+#: any.pm:1229
#, c-format
msgid "FTP"
msgstr "FTP"
-#: any.pm:1199
+#: any.pm:1229
#, c-format
msgid "NFS"
msgstr "NFS"
-#: any.pm:1218 steps_interactive.pm:970
+#: any.pm:1248 steps_interactive.pm:973
#, c-format
msgid "Network"
msgstr "Rede"
-#: any.pm:1222
+#: any.pm:1252
#, c-format
msgid "Please choose a media"
msgstr "Por favor, escueye un soporte"
-#: any.pm:1238
+#: any.pm:1268
#, c-format
msgid "File already exists. Overwrite it?"
msgstr "El ficheru yá existe. ¿Quies sobroscribilu?"
-#: any.pm:1242
+#: any.pm:1272
#, c-format
msgid "Permission denied"
msgstr "Permisu torgáu"
-#: any.pm:1290
+#: any.pm:1320
#, c-format
msgid "Bad NFS name"
msgstr "Nome NFS incorreutu"
-#: any.pm:1311
+#: any.pm:1341
#, c-format
msgid "Bad media %s"
msgstr "Mediu %s incorreutu"
-#: any.pm:1355
+#: any.pm:1385
#, c-format
msgid "Cannot make screenshots before partitioning"
msgstr "Nun pueden facese captures de pantalla enantes del particionáu"
-#: any.pm:1363
+#: any.pm:1393
#, c-format
msgid "Screenshots will be available after install in %s"
msgstr ""
@@ -353,7 +353,7 @@ msgstr ""
msgid "Installation"
msgstr "Instalación"
-#: gtk.pm:132 share/meta-task/compssUsers.pl:43
+#: gtk.pm:132 share/meta-task/compssUsers.pl:46
#, c-format
msgid "Configuration"
msgstr "Configuración"
@@ -454,42 +454,42 @@ msgstr ""
"Dalgunos paquetes que necesites %s nun pueden instalase:\n"
"%s"
-#: pkgs.pm:382 pkgs.pm:409
+#: pkgs.pm:383 pkgs.pm:410
#, c-format
msgid "An error occurred:"
msgstr "Hebo un fallu:"
-#: pkgs.pm:401
+#: pkgs.pm:402
#, c-format
msgid "A fatal error occurred: %s."
msgstr "Hebo un fallu grave: %s."
-#: pkgs.pm:891 pkgs.pm:928
+#: pkgs.pm:896 pkgs.pm:938
#, c-format
msgid "Do not ask again"
msgstr ""
-#: pkgs.pm:907
+#: pkgs.pm:912
#, c-format
msgid "%d installation transactions failed"
msgstr "Fallaron %d tresaiciones d'instalación"
-#: pkgs.pm:908
+#: pkgs.pm:913
#, c-format
msgid "Installation of packages failed:"
msgstr "Falló la instalación de paquetes:"
-#: share/meta-task/compssUsers.pl:13
+#: share/meta-task/compssUsers.pl:14
#, c-format
msgid "Workstation"
msgstr "Estación de trabayu"
-#: share/meta-task/compssUsers.pl:15
+#: share/meta-task/compssUsers.pl:16
#, c-format
msgid "Office Workstation"
msgstr "Estación de trabayu d'Oficina"
-#: share/meta-task/compssUsers.pl:17
+#: share/meta-task/compssUsers.pl:18
#, c-format
msgid ""
"Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets "
@@ -498,32 +498,32 @@ msgstr ""
"Programes d'Oficina: procesadores de testu (LibreOffice Writer, Kword), "
"fueyes de cálculu (LibreOffice Calc, Kspread), visualizadores PDF, etc"
-#: share/meta-task/compssUsers.pl:22
+#: share/meta-task/compssUsers.pl:24
#, c-format
msgid "Game station"
msgstr "Estación de Xuegos"
-#: share/meta-task/compssUsers.pl:23
+#: share/meta-task/compssUsers.pl:25
#, c-format
msgid "Amusement programs: arcade, boards, strategy, etc"
msgstr "Programes d'entretenimientu: arcade, tableros, estratexía, etc"
-#: share/meta-task/compssUsers.pl:26
+#: share/meta-task/compssUsers.pl:28
#, c-format
msgid "Multimedia station"
msgstr "Estación Multimedia"
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:29
#, c-format
msgid "Sound and video playing/editing programs"
msgstr "Programes de reproducción/edición de soníu y vidéu"
-#: share/meta-task/compssUsers.pl:32
+#: share/meta-task/compssUsers.pl:34
#, c-format
msgid "Internet station"
msgstr "Estación d'Internet"
-#: share/meta-task/compssUsers.pl:33
+#: share/meta-task/compssUsers.pl:35
#, c-format
msgid ""
"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -532,193 +532,193 @@ msgstr ""
"Conxuntu de ferramientes pa lleer y unviar corréu y noticies (mutt, tin...) "
"y pa restolar pola Web"
-#: share/meta-task/compssUsers.pl:38
+#: share/meta-task/compssUsers.pl:40
#, c-format
msgid "Network Computer (client)"
msgstr "Ordenador de Rede (veceru)"
-#: share/meta-task/compssUsers.pl:39
+#: share/meta-task/compssUsers.pl:41
#, c-format
msgid "Clients for different protocols including ssh"
msgstr "Veceros pa los distintos protocolos incluyendo a SSH"
-#: share/meta-task/compssUsers.pl:44
+#: share/meta-task/compssUsers.pl:47
#, c-format
msgid "Tools to ease the configuration of your computer"
msgstr "Ferramientes pa facilitar la configuración del to ordenador"
-#: share/meta-task/compssUsers.pl:48
+#: share/meta-task/compssUsers.pl:51
#, c-format
msgid "Console Tools"
msgstr "Ferramientes pa la consola"
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:52
#, c-format
msgid "Editors, shells, file tools, terminals"
msgstr "Editores, shells, manipulación de ficheros, terminales"
-#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156
-#: share/meta-task/compssUsers.pl:158
+#: share/meta-task/compssUsers.pl:56 share/meta-task/compssUsers.pl:200
+#: share/meta-task/compssUsers.pl:202
#, c-format
msgid "Development"
msgstr "Desendolcu"
-#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:203
#, c-format
msgid "C and C++ development libraries, programs and include files"
msgstr "Biblioteques de desendolcu C y C++, programes y ficheros *.h"
-#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163
+#: share/meta-task/compssUsers.pl:61 share/meta-task/compssUsers.pl:207
#, c-format
msgid "Documentation"
msgstr "Documentación"
-#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
+#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:208
#, c-format
msgid "Books and Howto's on Linux and Free Software"
msgstr "Llibros y aides sobro Linux y Software Llibre"
-#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167
+#: share/meta-task/compssUsers.pl:66 share/meta-task/compssUsers.pl:211
#, c-format
msgid "LSB"
msgstr "LSB"
-#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:67 share/meta-task/compssUsers.pl:212
#, c-format
msgid "Linux Standard Base. Third party applications support"
msgstr "Linux Standard Base. Sofitu d'aplicaciones de terceros"
-#: share/meta-task/compssUsers.pl:72
+#: share/meta-task/compssUsers.pl:77
#, c-format
msgid "Web Server"
msgstr "Sirvidor web"
-#: share/meta-task/compssUsers.pl:73
+#: share/meta-task/compssUsers.pl:78
#, c-format
msgid "Apache"
msgstr "Apache"
-#: share/meta-task/compssUsers.pl:76
+#: share/meta-task/compssUsers.pl:82
#, c-format
msgid "Groupware"
msgstr "Grupos de trabayu"
-#: share/meta-task/compssUsers.pl:77
+#: share/meta-task/compssUsers.pl:83
#, c-format
msgid "Kolab Server"
msgstr "Sirvidor Kolab"
-#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121
+#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl:136
#, c-format
msgid "Firewall/Router"
msgstr "Tornafuegos/Router"
-#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
+#: share/meta-task/compssUsers.pl:87 share/meta-task/compssUsers.pl:137
#, c-format
msgid "Internet gateway"
msgstr "Pasarela d'accesu a Internet"
-#: share/meta-task/compssUsers.pl:84
+#: share/meta-task/compssUsers.pl:90
#, c-format
msgid "Mail/News"
msgstr "Corréu/Noticies"
-#: share/meta-task/compssUsers.pl:85
+#: share/meta-task/compssUsers.pl:91
#, c-format
msgid "Postfix mail server, Inn news server"
msgstr "Sirvidor de corréu Postfix, sirvidor de noticies Inn"
-#: share/meta-task/compssUsers.pl:88
+#: share/meta-task/compssUsers.pl:95
#, c-format
msgid "Directory Server"
msgstr "Sirvidor de direutorios"
-#: share/meta-task/compssUsers.pl:92
+#: share/meta-task/compssUsers.pl:100
#, c-format
msgid "FTP Server"
msgstr "Sirvidor FTP"
-#: share/meta-task/compssUsers.pl:93
+#: share/meta-task/compssUsers.pl:101
#, c-format
msgid "ProFTPd"
msgstr "ProFTPd"
-#: share/meta-task/compssUsers.pl:96
+#: share/meta-task/compssUsers.pl:105
#, c-format
msgid "DNS/NIS"
msgstr "DNS/NIS"
-#: share/meta-task/compssUsers.pl:97
+#: share/meta-task/compssUsers.pl:106
#, c-format
msgid "Domain Name and Network Information Server"
msgstr "Sirvidor de nomes de dominiu y sirvidor d'información de rede"
-#: share/meta-task/compssUsers.pl:100
+#: share/meta-task/compssUsers.pl:110
#, c-format
msgid "File and Printer Sharing Server"
msgstr "Sirvidor de ficheros ya impresión"
-#: share/meta-task/compssUsers.pl:101
+#: share/meta-task/compssUsers.pl:111
#, c-format
msgid "NFS Server, Samba server"
msgstr "Sirvidor NFS, sirvidor Samba"
-#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117
+#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl:131
#, c-format
msgid "Database"
msgstr "Base de Datos"
-#: share/meta-task/compssUsers.pl:105
+#: share/meta-task/compssUsers.pl:116
#, c-format
msgid "PostgreSQL and MariaDB Database Server"
msgstr "Sirvidor de base de datos PostgreSQL y MariaDB"
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:121
#, c-format
msgid "Web/FTP"
msgstr "Web/FTP"
-#: share/meta-task/compssUsers.pl:110
+#: share/meta-task/compssUsers.pl:122
#, c-format
msgid "Apache, Pro-ftpd"
msgstr "Apache y Pro-ftpd"
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:126
#, c-format
msgid "Mail"
msgstr "Corréu"
-#: share/meta-task/compssUsers.pl:114
+#: share/meta-task/compssUsers.pl:127
#, c-format
msgid "Postfix mail server"
msgstr "Sirvidor de corréu Postfix"
-#: share/meta-task/compssUsers.pl:118
+#: share/meta-task/compssUsers.pl:132
#, c-format
msgid "PostgreSQL or MariaDB database server"
msgstr "Sirvidor de base de datos PostgreSQL o MariaDB"
-#: share/meta-task/compssUsers.pl:125
+#: share/meta-task/compssUsers.pl:140
#, c-format
msgid "Network Computer server"
msgstr "Sirvidor de rede"
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:141
#, c-format
msgid "NFS server, SMB server, Proxy server, ssh server"
msgstr "Sirvidor NFS, sirvidor SMB, sirvidor proxy, sirvidor SSH"
-#: share/meta-task/compssUsers.pl:132
+#: share/meta-task/compssUsers.pl:148
#, c-format
msgid "Graphical Environment"
msgstr "Entornu gráficu"
-#: share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:150
#, c-format
msgid "KDE Workstation"
msgstr "Estación de trabayu KDE"
-#: share/meta-task/compssUsers.pl:135
+#: share/meta-task/compssUsers.pl:151
#, c-format
msgid ""
"The K Desktop Environment, the basic graphical environment with a collection "
@@ -727,12 +727,12 @@ msgstr ""
"L'entornu d'Escritoriu K, l'entornu gráficu básicu con una coleición de "
"ferramientes que lu acompañen"
-#: share/meta-task/compssUsers.pl:139
+#: share/meta-task/compssUsers.pl:156
#, c-format
msgid "GNOME Workstation"
msgstr "Estación de trabayu GNOME"
-#: share/meta-task/compssUsers.pl:140
+#: share/meta-task/compssUsers.pl:157 share/meta-task/compssUsers.pl:168
#, c-format
msgid ""
"A graphical environment with user-friendly set of applications and desktop "
@@ -741,12 +741,41 @@ msgstr ""
"Entornu gráficu con un conxuntu de ferramientes d'escritoriu y aplicaciones "
"amigables"
-#: share/meta-task/compssUsers.pl:144
+#: share/meta-task/compssUsers.pl:162
+#, fuzzy, c-format
+msgid "XFCE Workstation"
+msgstr "Estación de trabayu KDE"
+
+#: share/meta-task/compssUsers.pl:163
+#, fuzzy, c-format
+msgid ""
+"A lighter graphical environment with user-friendly set of applications and "
+"desktop tools"
+msgstr ""
+"Entornu gráficu con un conxuntu de ferramientes d'escritoriu y aplicaciones "
+"amigables"
+
+#: share/meta-task/compssUsers.pl:167
+#, fuzzy, c-format
+msgid "MATE Workstation"
+msgstr "Estación de trabayu GNOME"
+
+#: share/meta-task/compssUsers.pl:172
+#, fuzzy, c-format
+msgid "Cinnamon Workstation"
+msgstr "Estación de trabayu"
+
+#: share/meta-task/compssUsers.pl:173
+#, fuzzy, c-format
+msgid "A graphical environment based on GNOME"
+msgstr "Entornu gráficu"
+
+#: share/meta-task/compssUsers.pl:177
#, c-format
msgid "LXDE Desktop"
msgstr "Escritoriu LXDE"
-#: share/meta-task/compssUsers.pl:146
+#: share/meta-task/compssUsers.pl:179
#, c-format
msgid ""
"A lightweight & fast graphical environment with user-friendly set of "
@@ -755,52 +784,74 @@ msgstr ""
"Un entornu gráficu llixeru y rápidu con un conxuntu de ferramientes "
"d'escritoriu y aplicaciones amigables"
-#: share/meta-task/compssUsers.pl:149
+#: share/meta-task/compssUsers.pl:183
+#, fuzzy, c-format
+msgid "RazorQT Desktop"
+msgstr "Escritoriu personalizáu"
+
+#: share/meta-task/compssUsers.pl:185
+#, c-format
+msgid "A less developed lightweight fast graphical environment"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:188
+#, c-format
+msgid "Enlightenment e17 Desktop"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:190
+#, fuzzy, c-format
+msgid "A lightweight fast graphical environment with a dedicated following"
+msgstr ""
+"Un entornu gráficu llixeru y rápidu con un conxuntu de ferramientes "
+"d'escritoriu y aplicaciones amigables"
+
+#: share/meta-task/compssUsers.pl:193
#, c-format
msgid "Other Graphical Desktops"
msgstr "Otros entornos gráficos"
-#: share/meta-task/compssUsers.pl:150
-#, c-format
-msgid "Window Maker, Enlightenment, Fvwm, etc"
+#: share/meta-task/compssUsers.pl:194
+#, fuzzy, c-format
+msgid "Window Maker, Fvwm, etc"
msgstr "Window Maker, Enlightenment, Fvwm, etc"
-#: share/meta-task/compssUsers.pl:173
+#: share/meta-task/compssUsers.pl:217
#, c-format
msgid "Utilities"
msgstr "Utilidaes"
-#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176
+#: share/meta-task/compssUsers.pl:219 share/meta-task/compssUsers.pl:220
#, c-format
msgid "SSH Server"
msgstr "Sirvidor SSH"
-#: share/meta-task/compssUsers.pl:180
+#: share/meta-task/compssUsers.pl:224
#, c-format
msgid "Webmin"
msgstr "Webmin"
-#: share/meta-task/compssUsers.pl:181
+#: share/meta-task/compssUsers.pl:225
#, c-format
msgid "Webmin Remote Configuration Server"
msgstr "Sirvidor de configuración remota Webmin"
-#: share/meta-task/compssUsers.pl:185
+#: share/meta-task/compssUsers.pl:229
#, c-format
msgid "Network Utilities/Monitoring"
msgstr "Utilidaes/Supervisión de rede"
-#: share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:230
#, c-format
msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
msgstr "Ferramientes de supervisión, control de procesos, tcpdump, nmap, ..."
-#: share/meta-task/compssUsers.pl:190
+#: share/meta-task/compssUsers.pl:234
#, c-format
msgid "Mageia Wizards"
msgstr "Asistentes de Mageia"
-#: share/meta-task/compssUsers.pl:191
+#: share/meta-task/compssUsers.pl:235
#, c-format
msgid "Wizards to configure server"
msgstr "Asistentes pa configurar el sirvidor"
@@ -814,7 +865,7 @@ msgstr ""
"Hebo un fallu y nun puede resolvese de mou adecuáu.\n"
"Sigui baxo'l to propiu riesgu."
-#: steps.pm:461
+#: steps.pm:458
#, c-format
msgid ""
"Some important packages did not get installed properly.\n"
@@ -868,107 +919,107 @@ msgstr "Seleición de preseos"
msgid "Install %s KDE Desktop"
msgstr "Instalar l'escritoriu KDE de %s"
-#: steps_gtk.pm:244
+#: steps_gtk.pm:252
#, c-format
msgid "Install %s GNOME Desktop"
msgstr "Instalar l'escritoriu GNOME de %s"
-#: steps_gtk.pm:245
+#: steps_gtk.pm:253
#, c-format
msgid "Custom install"
msgstr "Instalación personalizada"
-#: steps_gtk.pm:266
+#: steps_gtk.pm:274
#, c-format
msgid "KDE Desktop"
msgstr "Escritoriu KDE"
-#: steps_gtk.pm:267
+#: steps_gtk.pm:275
#, c-format
msgid "GNOME Desktop"
msgstr "Escritoriu GNOME"
-#: steps_gtk.pm:268
+#: steps_gtk.pm:276
#, c-format
msgid "Custom Desktop"
msgstr "Escritoriu personalizáu"
-#: steps_gtk.pm:274
+#: steps_gtk.pm:282
#, c-format
msgid "Here's a preview of the '%s' desktop."
msgstr "Equí tienes una previsualización del escritoriu '%s'."
-#: steps_gtk.pm:301
+#: steps_gtk.pm:309
#, c-format
msgid "Click on images in order to see a bigger preview"
msgstr "Calca nes semeyes p'agrandales"
-#: steps_gtk.pm:319 steps_interactive.pm:633 steps_list.pm:30
+#: steps_gtk.pm:325 steps_interactive.pm:633 steps_list.pm:30
#, c-format
msgid "Package Group Selection"
msgstr "Seleición de grupos de paquetes"
-#: steps_gtk.pm:344 steps_interactive.pm:650
+#: steps_gtk.pm:350 steps_interactive.pm:650
#, c-format
msgid "Individual package selection"
msgstr "Seleición de paquetes individuales"
-#: steps_gtk.pm:351
+#: steps_gtk.pm:357
#, c-format
msgid "Unselect All"
msgstr ""
-#: steps_gtk.pm:370 steps_interactive.pm:562
+#: steps_gtk.pm:376 steps_interactive.pm:562
#, c-format
msgid "Total size: %d / %d MB"
msgstr "Tamañu total: %d / %d MB"
-#: steps_gtk.pm:415
+#: steps_gtk.pm:421
#, c-format
msgid "Version: "
msgstr "Versión: "
-#: steps_gtk.pm:416
+#: steps_gtk.pm:422
#, c-format
msgid "Size: "
msgstr "Tamañu: "
-#: steps_gtk.pm:416
+#: steps_gtk.pm:422
#, c-format
msgid "%d KB\n"
msgstr "%d KB\n"
-#: steps_gtk.pm:417
+#: steps_gtk.pm:423
#, c-format
msgid "Importance: "
msgstr "Importancia: "
-#: steps_gtk.pm:452
+#: steps_gtk.pm:458
#, c-format
msgid "You cannot select/unselect this package"
msgstr "Nun puede seleicionase/deseleicionase esti paquete"
-#: steps_gtk.pm:456
+#: steps_gtk.pm:462
#, c-format
msgid "due to missing %s"
msgstr "debíu a que falta %s"
-#: steps_gtk.pm:457
+#: steps_gtk.pm:463
#, c-format
msgid "due to unsatisfied %s"
msgstr "debíu a que nun se satisfizo %s"
-#: steps_gtk.pm:458
+#: steps_gtk.pm:464
#, c-format
msgid "trying to promote %s"
msgstr "intentando promover a %s"
-#: steps_gtk.pm:459
+#: steps_gtk.pm:465
#, c-format
msgid "in order to keep %s"
msgstr "pa caltener %s"
-#: steps_gtk.pm:464
+#: steps_gtk.pm:470
#, c-format
msgid ""
"You cannot select this package as there is not enough space left to install "
@@ -976,104 +1027,104 @@ msgid ""
msgstr ""
"Nun pudo seleicionase esti paquete porque nun hai espaciu abondo pa instalalu"
-#: steps_gtk.pm:467
+#: steps_gtk.pm:473
#, c-format
msgid "The following packages are going to be installed"
msgstr "Van instalase los paquetes siguientes"
-#: steps_gtk.pm:468
+#: steps_gtk.pm:474
#, c-format
msgid "The following packages are going to be removed"
msgstr "Van desaniciase los paquetes siguientes"
-#: steps_gtk.pm:494
+#: steps_gtk.pm:500
#, c-format
msgid "This is a mandatory package, it cannot be unselected"
msgstr "Esti ye un paquete obligatoriu, nun puedes desmarcalu"
-#: steps_gtk.pm:496
+#: steps_gtk.pm:502
#, c-format
msgid "You cannot unselect this package. It is already installed"
msgstr "Nun puedes desmarcar esti paquete. Yá ta instaláu"
-#: steps_gtk.pm:498
+#: steps_gtk.pm:504
#, c-format
msgid "You cannot unselect this package. It must be upgraded"
msgstr "Nun puedes desmarcar esti paquete. Tien d'anovase"
-#: steps_gtk.pm:502
+#: steps_gtk.pm:508
#, c-format
msgid "Show automatically selected packages"
msgstr "Amosar los paquetes esbillaos automáticamente"
-#: steps_gtk.pm:509
+#: steps_gtk.pm:512
#, c-format
msgid "Install"
msgstr "Instalar"
-#: steps_gtk.pm:512
+#: steps_gtk.pm:515
#, c-format
msgid "Load/Save selection"
msgstr "Cargar/Guardar seleición"
-#: steps_gtk.pm:513
+#: steps_gtk.pm:516
#, c-format
msgid "Updating package selection"
msgstr "Anovando la seleición de paquetes"
-#: steps_gtk.pm:518
+#: steps_gtk.pm:521
#, c-format
msgid "Minimal install"
msgstr "Instalación mínima"
-#: steps_gtk.pm:531
+#: steps_gtk.pm:534
#, c-format
msgid "Software Management"
msgstr "Alministración de software"
-#: steps_gtk.pm:531 steps_interactive.pm:443
+#: steps_gtk.pm:534 steps_interactive.pm:443
#, c-format
msgid "Choose the packages you want to install"
msgstr "Escueyi los paquetes que quies instalar"
-#: steps_gtk.pm:548 steps_interactive.pm:670 steps_list.pm:32
+#: steps_gtk.pm:551 steps_interactive.pm:670 steps_list.pm:32
#, c-format
msgid "Installing"
msgstr "Instalando"
-#: steps_gtk.pm:578
+#: steps_gtk.pm:581
#, c-format
msgid "No details"
msgstr "Ensin detalles"
-#: steps_gtk.pm:597
+#: steps_gtk.pm:600
#, c-format
msgid "Time remaining:"
msgstr "Tiempu restante:"
-#: steps_gtk.pm:598
+#: steps_gtk.pm:601
#, c-format
msgid "(estimating...)"
msgstr "(estimando...)"
-#: steps_gtk.pm:628
+#: steps_gtk.pm:631
#, c-format
msgid "%d package"
msgid_plural "%d packages"
msgstr[0] "%d paquete"
msgstr[1] "%d paquetes"
-#: steps_gtk.pm:683 steps_interactive.pm:834 steps_list.pm:43
+#: steps_gtk.pm:687 steps_interactive.pm:837 steps_list.pm:43
#, c-format
msgid "Summary"
msgstr "Resume"
-#: steps_gtk.pm:702
+#: steps_gtk.pm:706
#, c-format
msgid "Configure"
msgstr "Configurar"
-#: steps_gtk.pm:719 steps_interactive.pm:830 steps_interactive.pm:983
+#: steps_gtk.pm:723 steps_interactive.pm:833 steps_interactive.pm:986
#, c-format
msgid "not configured"
msgstr "non configuráu"
@@ -1087,7 +1138,7 @@ msgstr ""
"Alcontrarónse los siguientes preseos d'instalación.\n"
"Si quies saltate dalgún d'ellos, puedes deseleicionalos agora."
-#: steps_gtk.pm:778 steps_interactive.pm:349
+#: steps_gtk.pm:782 steps_interactive.pm:349
#, c-format
msgid ""
"You have the option to copy the contents of the CDs onto the hard disk drive "
@@ -1100,7 +1151,7 @@ msgstr ""
"La mesma siguirá dende'l discu duru y los paquetes tarán disponibles una "
"vegada que'l sistema tea instaláu ensembre."
-#: steps_gtk.pm:780 steps_interactive.pm:351
+#: steps_gtk.pm:784 steps_interactive.pm:351
#, c-format
msgid "Copy whole CDs"
msgstr "Copiar los CD por completu"
@@ -1411,28 +1462,28 @@ msgstr ""
"¿Quies instalar los anovamientos?"
#. -PO: example: lilo-graphic on /dev/hda1
-#: steps_interactive.pm:878
+#: steps_interactive.pm:881
#, c-format
msgid "%s on %s"
msgstr "%s en %s"
-#: steps_interactive.pm:910 steps_interactive.pm:917 steps_interactive.pm:930
-#: steps_interactive.pm:947 steps_interactive.pm:962
+#: steps_interactive.pm:913 steps_interactive.pm:920 steps_interactive.pm:933
+#: steps_interactive.pm:950 steps_interactive.pm:965
#, c-format
msgid "Hardware"
msgstr "Hardware"
-#: steps_interactive.pm:931 steps_interactive.pm:948
+#: steps_interactive.pm:934 steps_interactive.pm:951
#, c-format
msgid "Sound card"
msgstr "Tarxeta de soníu"
-#: steps_interactive.pm:951
+#: steps_interactive.pm:954
#, c-format
msgid "Do you have an ISA sound card?"
msgstr "¿Tienes una tarxeta de soníu ISA?"
-#: steps_interactive.pm:953
+#: steps_interactive.pm:956
#, c-format
msgid ""
"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1441,75 +1492,75 @@ msgstr ""
"Usa \"alsaconf\" o \"sndconfig\" dempués de la instalación pa configurar la "
"to tarxeta de soníu"
-#: steps_interactive.pm:955
+#: steps_interactive.pm:958
#, c-format
msgid "No sound card detected. Try \"harddrake\" after installation"
msgstr ""
"Nun se deteutó tarxeta de soníu. Preba \"harddrake\" dempués de la "
"instalación"
-#: steps_interactive.pm:963
+#: steps_interactive.pm:966
#, c-format
msgid "Graphical interface"
msgstr "Interface gráfica"
-#: steps_interactive.pm:969 steps_interactive.pm:981
+#: steps_interactive.pm:972 steps_interactive.pm:984
#, c-format
msgid "Network & Internet"
msgstr "Redes ya Internet"
-#: steps_interactive.pm:982
+#: steps_interactive.pm:985
#, c-format
msgid "Proxies"
msgstr "Proxies"
-#: steps_interactive.pm:983
+#: steps_interactive.pm:986
#, c-format
msgid "configured"
msgstr "configuráu"
-#: steps_interactive.pm:993
+#: steps_interactive.pm:996
#, c-format
msgid "Security Level"
msgstr "Nivel de seguridá"
-#: steps_interactive.pm:1013
+#: steps_interactive.pm:1016
#, c-format
msgid "Firewall"
msgstr "Tornafueos"
-#: steps_interactive.pm:1017
+#: steps_interactive.pm:1020
#, c-format
msgid "activated"
msgstr "activáu"
-#: steps_interactive.pm:1017
+#: steps_interactive.pm:1020
#, c-format
msgid "disabled"
msgstr "desactiváu"
-#: steps_interactive.pm:1031
+#: steps_interactive.pm:1034
#, c-format
msgid "You have not configured X. Are you sure you really want this?"
msgstr "X Ensin configurar ¿De xuru que quies esto daveres?"
-#: steps_interactive.pm:1060
+#: steps_interactive.pm:1063
#, c-format
msgid "Preparing bootloader..."
msgstr "Tresnando'l cargador d'arranque"
#. -PO: This is NOT the boot loader!!!!
-#: steps_interactive.pm:1062
+#: steps_interactive.pm:1065
#, fuzzy, c-format
msgid "Preparing initial startup program..."
msgstr "Tresnando la instalación"
-#: steps_interactive.pm:1063
+#: steps_interactive.pm:1066
#, c-format
msgid "Be patient, this may take a while..."
msgstr "Aposenta por favor, pues esto puede llevar un ratu."
-#: steps_interactive.pm:1074
+#: steps_interactive.pm:1077
#, c-format
msgid ""
"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1522,7 +1573,7 @@ msgstr ""
"necesitará usar BootX o dalguna otra manera p'arrancar la to máquina. El "
"parámetru del kernel pal sistema de ficheros raíz ye: root=%s"
-#: steps_interactive.pm:1087
+#: steps_interactive.pm:1090
#, c-format
msgid ""
"In this security level, access to the files in the Windows partition is "
@@ -1531,17 +1582,17 @@ msgstr ""
"Nesti nivel de seguridá, l'accesu a los ficheros na partición Windows ta "
"restrinxíu sólo al alministrador."
-#: steps_interactive.pm:1119
+#: steps_interactive.pm:1122
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr "Inxerta un disquete en blancu na unidá %s"
-#: steps_interactive.pm:1121
+#: steps_interactive.pm:1124
#, c-format
msgid "Creating auto install floppy..."
msgstr "Criando'l disquete d'instalación automática"
-#: steps_interactive.pm:1132
+#: steps_interactive.pm:1135
#, c-format
msgid ""
"Some steps are not completed.\n"
@@ -1552,12 +1603,12 @@ msgstr ""
"\n"
"¿De xuru quies colar agora?"
-#: steps_interactive.pm:1142
+#: steps_interactive.pm:1145
#, c-format
msgid "Congratulations"
msgstr "Felicidaes"
-#: steps_interactive.pm:1145
+#: steps_interactive.pm:1148
#, c-format
msgid "Reboot"
msgstr "Reaniciar"
diff --git a/perl-install/install/share/po/az.po b/perl-install/install/share/po/az.po
index 6e752e7c0..ecb597003 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: 2013-05-03 10:51+0200\n"
+"POT-Creation-Date: 2013-11-03 12:08+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"
@@ -77,7 +77,7 @@ msgid "Do you have further supplementary media?"
msgstr "Başqası var?"
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:113
+#: any.pm:114
#, c-format
msgid ""
"The following media have been found and will be used during install: %s.\n"
@@ -86,177 +86,177 @@ msgid ""
"Do you have a supplementary installation medium to configure?"
msgstr ""
-#: any.pm:121
+#: any.pm:122
#, c-format
msgid "CD-ROM"
msgstr "CD-ROM"
-#: any.pm:122
+#: any.pm:123
#, fuzzy, c-format
msgid "Network (HTTP)"
msgstr "Şəbəkə %s"
-#: any.pm:123
+#: any.pm:124
#, fuzzy, c-format
msgid "Network (FTP)"
msgstr "Şəbəkə %s"
-#: any.pm:124
+#: any.pm:125
#, c-format
msgid "Network (NFS)"
msgstr ""
-#: any.pm:171
+#: any.pm:173
#, c-format
msgid "URL of the mirror?"
msgstr ""
-#: any.pm:177
+#: any.pm:179
#, c-format
msgid "URL must start with ftp:// or http://"
msgstr ""
-#: any.pm:188
+#: any.pm:190
#, c-format
msgid "Contacting %s web site to get the list of available mirrors..."
msgstr "Mövcud əkslərin siyahısını almaq üçün %s səhifəsi ilə təmas qurulur..."
-#: any.pm:193
+#: any.pm:195
#, fuzzy, c-format
msgid "Failed contacting %s web site to get the list of available mirrors"
msgstr "Mövcud əkslərin siyahısını almaq üçün %s səhifəsi ilə təmas qurulur..."
-#: any.pm:203
+#: any.pm:205
#, c-format
msgid "Choose a mirror from which to get the packages"
msgstr "Paketleri almaq üçün bir əks ünvanı seçin"
-#: any.pm:233
+#: any.pm:235
#, c-format
msgid "NFS setup"
msgstr ""
-#: any.pm:234
+#: any.pm:236
#, c-format
msgid "Please enter the hostname and directory of your NFS media"
msgstr ""
-#: any.pm:238
+#: any.pm:240
#, c-format
msgid "Hostname missing"
msgstr ""
-#: any.pm:239
+#: any.pm:241
#, c-format
msgid "Directory must begin with \"/\""
msgstr ""
-#: any.pm:243
+#: any.pm:245
#, c-format
msgid "Hostname of the NFS mount ?"
msgstr ""
-#: any.pm:244
+#: any.pm:246
#, c-format
msgid "Directory"
msgstr "Qovluq"
-#: any.pm:266
+#: any.pm:268
#, c-format
msgid "Supplementary"
msgstr ""
-#: any.pm:301
+#: any.pm:303
#, 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:317
+#: any.pm:319
#, c-format
msgid "Core Release"
msgstr ""
-#: any.pm:319
+#: any.pm:321
#, c-format
msgid "Tainted Release"
msgstr ""
-#: any.pm:321
+#: any.pm:323
#, c-format
msgid "Nonfree Release"
msgstr ""
-#: any.pm:335
+#: any.pm:351
#, c-format
msgid ""
"Some hardware on your machine needs some non free firmwares in order for the "
"free software drivers to work."
msgstr ""
-#: any.pm:336
+#: any.pm:352
#, c-format
msgid "You should enable \"%s\""
msgstr ""
-#: any.pm:355
+#: any.pm:377
#, c-format
msgid "\"%s\" contains the various pieces of the systems and its applications"
msgstr ""
-#: any.pm:356
+#: any.pm:378
#, c-format
msgid "\"%s\" contains non free software.\n"
msgstr ""
-#: any.pm:357
+#: any.pm:379
#, c-format
msgid ""
"It also contains firmwares needed for certain devices to operate (eg: some "
"ATI/AMD graphic cards, some network cards, some RAID cards, ...)"
msgstr ""
-#: any.pm:358
+#: any.pm:380
#, c-format
msgid ""
"\"%s\" contains software that can not be distributed in every country due to "
"software patents."
msgstr ""
-#: any.pm:359
+#: any.pm:381
#, c-format
msgid ""
"It also contains software from \"%s\" rebuild with additional capabilities."
msgstr ""
-#: any.pm:363
+#: any.pm:387
#, c-format
msgid "Here you can enable more media if you want."
msgstr ""
-#: any.pm:378
+#: any.pm:404
#, c-format
msgid "This medium provides package updates for medium \"%s\""
msgstr ""
-#: any.pm:451
+#: any.pm:480
#, c-format
msgid "Looking at packages already installed..."
msgstr "Qurulu olan paketlər yoxlanır..."
-#: any.pm:485
+#: any.pm:514
#, c-format
msgid "Finding packages to upgrade..."
msgstr "Güncəllənəcək paketlar tapılır"
-#: any.pm:498
+#: any.pm:527
#, c-format
msgid "Removing packages prior to upgrade..."
msgstr ""
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:713
+#: any.pm:743
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -269,72 +269,72 @@ msgstr ""
"\n"
"Bu paketləri həqiqətən də silmək istəyirsiniz?\n"
-#: any.pm:932
+#: any.pm:962
#, c-format
msgid "Error reading file %s"
msgstr "%s faylı oxunurkan xəta oldu"
-#: any.pm:1140
+#: any.pm:1170
#, fuzzy, c-format
msgid "The following disk(s) were renamed:"
msgstr "Aşağıdakı paketlər qurulmalıdır:\n"
-#: any.pm:1142
+#: any.pm:1172
#, c-format
msgid "%s (previously named as %s)"
msgstr ""
-#: any.pm:1199
+#: any.pm:1229
#, c-format
msgid "HTTP"
msgstr ""
-#: any.pm:1199
+#: any.pm:1229
#, c-format
msgid "FTP"
msgstr "FTP"
-#: any.pm:1199
+#: any.pm:1229
#, c-format
msgid "NFS"
msgstr "NFS"
-#: any.pm:1218 steps_interactive.pm:970
+#: any.pm:1248 steps_interactive.pm:973
#, c-format
msgid "Network"
msgstr "Şəbəkə"
-#: any.pm:1222
+#: any.pm:1252
#, fuzzy, c-format
msgid "Please choose a media"
msgstr "Xahiş edirik seçin"
-#: any.pm:1238
+#: any.pm:1268
#, fuzzy, c-format
msgid "File already exists. Overwrite it?"
msgstr "Fayl onsuz da mövcuddur. Üstünə yazım?"
-#: any.pm:1242
+#: any.pm:1272
#, c-format
msgid "Permission denied"
msgstr "Səlahiyyət yoxdur"
-#: any.pm:1290
+#: any.pm:1320
#, c-format
msgid "Bad NFS name"
msgstr ""
-#: any.pm:1311
+#: any.pm:1341
#, fuzzy, c-format
msgid "Bad media %s"
msgstr "%s medyası əlavə edildi"
-#: any.pm:1355
+#: any.pm:1385
#, c-format
msgid "Cannot make screenshots before partitioning"
msgstr "Bölmələmədən əvvəl görüntü alına bilməz"
-#: any.pm:1363
+#: any.pm:1393
#, 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"
@@ -344,7 +344,7 @@ msgstr "Ekran görüntüləri qurulumdan sonra %s mövqeyində olacaqdır"
msgid "Installation"
msgstr "Qurulur"
-#: gtk.pm:132 share/meta-task/compssUsers.pl:43
+#: gtk.pm:132 share/meta-task/compssUsers.pl:46
#, c-format
msgid "Configuration"
msgstr "Quraşdırma"
@@ -441,42 +441,42 @@ msgid ""
"%s"
msgstr ""
-#: pkgs.pm:382 pkgs.pm:409
+#: pkgs.pm:383 pkgs.pm:410
#, fuzzy, c-format
msgid "An error occurred:"
msgstr "Bir xəta oldu"
-#: pkgs.pm:401
+#: pkgs.pm:402
#, c-format
msgid "A fatal error occurred: %s."
msgstr "Ölümcül xəta yarandı: %s."
-#: pkgs.pm:891 pkgs.pm:928
+#: pkgs.pm:896 pkgs.pm:938
#, c-format
msgid "Do not ask again"
msgstr ""
-#: pkgs.pm:907
+#: pkgs.pm:912
#, fuzzy, c-format
msgid "%d installation transactions failed"
msgstr "Qurulum bacarılmadı"
-#: pkgs.pm:908
+#: pkgs.pm:913
#, fuzzy, c-format
msgid "Installation of packages failed:"
msgstr "%s paketi qurulur"
-#: share/meta-task/compssUsers.pl:13
+#: share/meta-task/compssUsers.pl:14
#, c-format
msgid "Workstation"
msgstr "İş Stansiyası"
-#: share/meta-task/compssUsers.pl:15
+#: share/meta-task/compssUsers.pl:16
#, c-format
msgid "Office Workstation"
msgstr "Ofis İş Stansiyası"
-#: share/meta-task/compssUsers.pl:17
+#: share/meta-task/compssUsers.pl:18
#, c-format
msgid ""
"Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets "
@@ -485,32 +485,32 @@ msgstr ""
"İdarə proqramları: kəlmə işləyənlər (LibreOffice Writer, Kword), "
"hesablayıcılar və pdf göstəriciləri, vs."
-#: share/meta-task/compssUsers.pl:22
+#: share/meta-task/compssUsers.pl:24
#, c-format
msgid "Game station"
msgstr "Oyun stansiyası"
-#: share/meta-task/compssUsers.pl:23
+#: share/meta-task/compssUsers.pl:25
#, 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:26
+#: share/meta-task/compssUsers.pl:28
#, c-format
msgid "Multimedia station"
msgstr "Multimedya stansiyası"
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:29
#, 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:32
+#: share/meta-task/compssUsers.pl:34
#, c-format
msgid "Internet station"
msgstr "İnternet stansiyası"
-#: share/meta-task/compssUsers.pl:33
+#: share/meta-task/compssUsers.pl:35
#, c-format
msgid ""
"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -519,205 +519,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:38
+#: share/meta-task/compssUsers.pl:40
#, c-format
msgid "Network Computer (client)"
msgstr "Şəbəkə Kompüteri (alıcı)"
-#: share/meta-task/compssUsers.pl:39
+#: share/meta-task/compssUsers.pl:41
#, c-format
msgid "Clients for different protocols including ssh"
msgstr "SSH daxil bir çox protokolların alıcıları"
-#: share/meta-task/compssUsers.pl:44
+#: share/meta-task/compssUsers.pl:47
#, 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:48
+#: share/meta-task/compssUsers.pl:51
#, c-format
msgid "Console Tools"
msgstr "Konsol Vasitələri"
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:52
#, c-format
msgid "Editors, shells, file tools, terminals"
msgstr "Editorlar, rəflər, fayl vasitələri, terminallar"
-#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156
-#: share/meta-task/compssUsers.pl:158
+#: share/meta-task/compssUsers.pl:56 share/meta-task/compssUsers.pl:200
+#: share/meta-task/compssUsers.pl:202
#, c-format
msgid "Development"
msgstr "İnkişaf"
-#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:203
#, c-format
msgid "C and C++ development libraries, programs and include files"
msgstr "C və C++ inkişaf kitabxanaları, proqramları və daxil ediləcək fayllar"
-#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163
+#: share/meta-task/compssUsers.pl:61 share/meta-task/compssUsers.pl:207
#, c-format
msgid "Documentation"
msgstr "Sənədlər"
-#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
+#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:208
#, c-format
msgid "Books and Howto's on Linux and Free Software"
msgstr "Linuks və sərbəst proqram tə'minatı haqqında Kitablar və Howtolar"
-#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167
+#: share/meta-task/compssUsers.pl:66 share/meta-task/compssUsers.pl:211
#, c-format
msgid "LSB"
msgstr "LSB"
-#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:67 share/meta-task/compssUsers.pl:212
#, c-format
msgid "Linux Standard Base. Third party applications support"
msgstr "Linux Standartları Bazası. Üçüncü partiya tə'minat dəstəyi"
-#: share/meta-task/compssUsers.pl:72
+#: share/meta-task/compssUsers.pl:77
#, c-format
msgid "Web Server"
msgstr "Veb Vericisi"
-#: share/meta-task/compssUsers.pl:73
+#: share/meta-task/compssUsers.pl:78
#, c-format
msgid "Apache"
msgstr "Apache"
-#: share/meta-task/compssUsers.pl:76
+#: share/meta-task/compssUsers.pl:82
#, fuzzy, c-format
msgid "Groupware"
msgstr "Qrup"
-#: share/meta-task/compssUsers.pl:77
+#: share/meta-task/compssUsers.pl:83
#, c-format
msgid "Kolab Server"
msgstr "Kolab Vericisi"
-#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121
+#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl:136
#, c-format
msgid "Firewall/Router"
msgstr "Atəş Divarı/İstiqamətləndirici"
-#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
+#: share/meta-task/compssUsers.pl:87 share/meta-task/compssUsers.pl:137
#, c-format
msgid "Internet gateway"
msgstr "İnternet keçidi"
-#: share/meta-task/compssUsers.pl:84
+#: share/meta-task/compssUsers.pl:90
#, fuzzy, c-format
msgid "Mail/News"
msgstr "/Fayl/_Təze"
-#: share/meta-task/compssUsers.pl:85
+#: share/meta-task/compssUsers.pl:91
#, fuzzy, c-format
msgid "Postfix mail server, Inn news server"
msgstr "Postfix poçt vericisi"
-#: share/meta-task/compssUsers.pl:88
+#: share/meta-task/compssUsers.pl:95
#, fuzzy, c-format
msgid "Directory Server"
msgstr "CD'dən Geri Yüklə"
-#: share/meta-task/compssUsers.pl:92
+#: share/meta-task/compssUsers.pl:100
#, fuzzy, c-format
msgid "FTP Server"
msgstr "NTP Verici"
-#: share/meta-task/compssUsers.pl:93
+#: share/meta-task/compssUsers.pl:101
#, c-format
msgid "ProFTPd"
msgstr ""
-#: share/meta-task/compssUsers.pl:96
+#: share/meta-task/compssUsers.pl:105
#, fuzzy, c-format
msgid "DNS/NIS"
msgstr "DNS"
-#: share/meta-task/compssUsers.pl:97
+#: share/meta-task/compssUsers.pl:106
#, fuzzy, c-format
msgid "Domain Name and Network Information Server"
msgstr "Domen Adı Vericisi"
-#: share/meta-task/compssUsers.pl:100
+#: share/meta-task/compssUsers.pl:110
#, fuzzy, c-format
msgid "File and Printer Sharing Server"
msgstr "Çapçı Vericisi"
-#: share/meta-task/compssUsers.pl:101
+#: share/meta-task/compssUsers.pl:111
#, fuzzy, c-format
msgid "NFS Server, Samba server"
msgstr "Samba vericisi"
-#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117
+#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl:131
#, c-format
msgid "Database"
msgstr "Mə'lumat Bazası"
-#: share/meta-task/compssUsers.pl:105
+#: share/meta-task/compssUsers.pl:116
#, fuzzy, c-format
msgid "PostgreSQL and MariaDB Database Server"
msgstr "PostgreSQL ya da MariaDB mə'lumat bazası vericisi"
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:121
#, c-format
msgid "Web/FTP"
msgstr "Veb/FTP"
-#: share/meta-task/compssUsers.pl:110
+#: share/meta-task/compssUsers.pl:122
#, c-format
msgid "Apache, Pro-ftpd"
msgstr "Apache, Pro-ftpd"
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:126
#, c-format
msgid "Mail"
msgstr "Poçt"
-#: share/meta-task/compssUsers.pl:114
+#: share/meta-task/compssUsers.pl:127
#, c-format
msgid "Postfix mail server"
msgstr "Postfix poçt vericisi"
-#: share/meta-task/compssUsers.pl:118
+#: share/meta-task/compssUsers.pl:132
#, c-format
msgid "PostgreSQL or MariaDB database server"
msgstr "PostgreSQL ya da MariaDB mə'lumat bazası vericisi"
-#: share/meta-task/compssUsers.pl:125
+#: share/meta-task/compssUsers.pl:140
#, c-format
msgid "Network Computer server"
msgstr "Şəbəkə Kompüter vericisi"
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:141
#, c-format
msgid "NFS server, SMB server, Proxy server, ssh server"
msgstr "NFS vericisi, SMB vericisi, Vəkil vericisi, SSH verici"
-#: share/meta-task/compssUsers.pl:132
+#: share/meta-task/compssUsers.pl:148
#, c-format
msgid "Graphical Environment"
msgstr "Qrafiki Mühit"
-#: share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:150
#, c-format
msgid "KDE Workstation"
msgstr "KDE iş stansiyası"
-#: share/meta-task/compssUsers.pl:135
+#: share/meta-task/compssUsers.pl:151
#, c-format
msgid ""
"The K Desktop Environment, the basic graphical environment with a collection "
"of accompanying tools"
msgstr "KDE, əsas qrafiki ara üz və yardımçi proqramlar kolleksiyası"
-#: share/meta-task/compssUsers.pl:139
+#: share/meta-task/compssUsers.pl:156
#, c-format
msgid "GNOME Workstation"
msgstr "GNOME iş stansiyası"
-#: share/meta-task/compssUsers.pl:140
+#: share/meta-task/compssUsers.pl:157 share/meta-task/compssUsers.pl:168
#, c-format
msgid ""
"A graphical environment with user-friendly set of applications and desktop "
@@ -725,12 +725,40 @@ msgid ""
msgstr ""
"İstifadəçi dostu proqram və masa üstü ilə bərabər qrafiki ara üz vasitələri"
-#: share/meta-task/compssUsers.pl:144
+#: share/meta-task/compssUsers.pl:162
+#, fuzzy, c-format
+msgid "XFCE Workstation"
+msgstr "KDE iş stansiyası"
+
+#: share/meta-task/compssUsers.pl:163
+#, fuzzy, c-format
+msgid ""
+"A lighter graphical environment with user-friendly set of applications and "
+"desktop tools"
+msgstr ""
+"İstifadəçi dostu proqram və masa üstü ilə bərabər qrafiki ara üz vasitələri"
+
+#: share/meta-task/compssUsers.pl:167
+#, fuzzy, c-format
+msgid "MATE Workstation"
+msgstr "GNOME iş stansiyası"
+
+#: share/meta-task/compssUsers.pl:172
+#, fuzzy, c-format
+msgid "Cinnamon Workstation"
+msgstr "İş Stansiyası"
+
+#: share/meta-task/compssUsers.pl:173
+#, fuzzy, c-format
+msgid "A graphical environment based on GNOME"
+msgstr "Qrafiki Mühit"
+
+#: share/meta-task/compssUsers.pl:177
#, fuzzy, c-format
msgid "LXDE Desktop"
msgstr "Masa üstü"
-#: share/meta-task/compssUsers.pl:146
+#: share/meta-task/compssUsers.pl:179
#, fuzzy, c-format
msgid ""
"A lightweight & fast graphical environment with user-friendly set of "
@@ -738,52 +766,73 @@ msgid ""
msgstr ""
"İstifadəçi dostu proqram və masa üstü ilə bərabər qrafiki ara üz vasitələri"
-#: share/meta-task/compssUsers.pl:149
+#: share/meta-task/compssUsers.pl:183
+#, fuzzy, c-format
+msgid "RazorQT Desktop"
+msgstr "Masa üstü"
+
+#: share/meta-task/compssUsers.pl:185
+#, c-format
+msgid "A less developed lightweight fast graphical environment"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:188
+#, c-format
+msgid "Enlightenment e17 Desktop"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:190
+#, fuzzy, c-format
+msgid "A lightweight fast graphical environment with a dedicated following"
+msgstr ""
+"İstifadəçi dostu proqram və masa üstü ilə bərabər qrafiki ara üz vasitələri"
+
+#: share/meta-task/compssUsers.pl:193
#, c-format
msgid "Other Graphical Desktops"
msgstr "Başqa qrafiki ara üzlər"
-#: share/meta-task/compssUsers.pl:150
+#: share/meta-task/compssUsers.pl:194
#, fuzzy, c-format
-msgid "Window Maker, Enlightenment, Fvwm, etc"
+msgid "Window Maker, Fvwm, etc"
msgstr "Icewm, Window Maker, Enlightenment, Fvwm, vs."
-#: share/meta-task/compssUsers.pl:173
+#: share/meta-task/compssUsers.pl:217
#, c-format
msgid "Utilities"
msgstr "Vasitələr"
-#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176
+#: share/meta-task/compssUsers.pl:219 share/meta-task/compssUsers.pl:220
#, c-format
msgid "SSH Server"
msgstr "SSH Vericisi"
-#: share/meta-task/compssUsers.pl:180
+#: share/meta-task/compssUsers.pl:224
#, fuzzy, c-format
msgid "Webmin"
msgstr "Veb kamerası"
-#: share/meta-task/compssUsers.pl:181
+#: share/meta-task/compssUsers.pl:225
#, fuzzy, c-format
msgid "Webmin Remote Configuration Server"
msgstr "Terminal Server Quraşdırılması"
-#: share/meta-task/compssUsers.pl:185
+#: share/meta-task/compssUsers.pl:229
#, fuzzy, c-format
msgid "Network Utilities/Monitoring"
msgstr "Şəbəkə İzlənməsi"
-#: share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:230
#, c-format
msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
msgstr ""
-#: share/meta-task/compssUsers.pl:190
+#: share/meta-task/compssUsers.pl:234
#, fuzzy, c-format
msgid "Mageia Wizards"
msgstr "<b>Mageia Store</b>"
-#: share/meta-task/compssUsers.pl:191
+#: share/meta-task/compssUsers.pl:235
#, fuzzy, c-format
msgid "Wizards to configure server"
msgstr "\"%s\" çapçısı quraşdırıla bilmədi!"
@@ -797,7 +846,7 @@ msgstr ""
"Bir xəta oldu, yalnız necə düzəldiləcəyi bilinmir.\n"
"Davam edin, riski sizə aitdir!"
-#: steps.pm:461
+#: steps.pm:458
#, c-format
msgid ""
"Some important packages did not get installed properly.\n"
@@ -853,210 +902,210 @@ msgstr "Paket Qruplarının Seçimi"
msgid "Install %s KDE Desktop"
msgstr ""
-#: steps_gtk.pm:244
+#: steps_gtk.pm:252
#, c-format
msgid "Install %s GNOME Desktop"
msgstr ""
-#: steps_gtk.pm:245
+#: steps_gtk.pm:253
#, fuzzy, c-format
msgid "Custom install"
msgstr "Minimal qurulum"
-#: steps_gtk.pm:266
+#: steps_gtk.pm:274
#, fuzzy, c-format
msgid "KDE Desktop"
msgstr "Masa üstü"
-#: steps_gtk.pm:267
+#: steps_gtk.pm:275
#, fuzzy, c-format
msgid "GNOME Desktop"
msgstr "Masa üstü"
-#: steps_gtk.pm:268
+#: steps_gtk.pm:276
#, fuzzy, c-format
msgid "Custom Desktop"
msgstr "Masa üstü"
-#: steps_gtk.pm:274
+#: steps_gtk.pm:282
#, c-format
msgid "Here's a preview of the '%s' desktop."
msgstr ""
-#: steps_gtk.pm:301
+#: steps_gtk.pm:309
#, c-format
msgid "Click on images in order to see a bigger preview"
msgstr ""
-#: steps_gtk.pm:319 steps_interactive.pm:633 steps_list.pm:30
+#: steps_gtk.pm:325 steps_interactive.pm:633 steps_list.pm:30
#, c-format
msgid "Package Group Selection"
msgstr "Paket Qruplarının Seçimi"
-#: steps_gtk.pm:344 steps_interactive.pm:650
+#: steps_gtk.pm:350 steps_interactive.pm:650
#, c-format
msgid "Individual package selection"
msgstr "Fərdi paket seçimi"
-#: steps_gtk.pm:351
+#: steps_gtk.pm:357
#, c-format
msgid "Unselect All"
msgstr "Seçili olmayan hamısını"
-#: steps_gtk.pm:370 steps_interactive.pm:562
+#: steps_gtk.pm:376 steps_interactive.pm:562
#, c-format
msgid "Total size: %d / %d MB"
msgstr "Ümumi böyüklük: %d / %d Mb"
-#: steps_gtk.pm:415
+#: steps_gtk.pm:421
#, c-format
msgid "Version: "
msgstr "Buraxılış: "
-#: steps_gtk.pm:416
+#: steps_gtk.pm:422
#, c-format
msgid "Size: "
msgstr "Böyüklük: "
-#: steps_gtk.pm:416
+#: steps_gtk.pm:422
#, c-format
msgid "%d KB\n"
msgstr "%d KB\n"
-#: steps_gtk.pm:417
+#: steps_gtk.pm:423
#, c-format
msgid "Importance: "
msgstr "Əhəmiyyət:"
-#: steps_gtk.pm:452
+#: steps_gtk.pm:458
#, c-format
msgid "You cannot select/unselect this package"
msgstr "Bu paketi seçə bilməzsiniz/sistemdən çıxarda bilməzsınız"
-#: steps_gtk.pm:456
+#: steps_gtk.pm:462
#, c-format
msgid "due to missing %s"
msgstr "%s əksik olduğuna görə"
-#: steps_gtk.pm:457
+#: steps_gtk.pm:463
#, c-format
msgid "due to unsatisfied %s"
msgstr "%s razı qalmadığına görə"
-#: steps_gtk.pm:458
+#: steps_gtk.pm:464
#, c-format
msgid "trying to promote %s"
msgstr "%s irəliləndirməyə çalışılır"
-#: steps_gtk.pm:459
+#: steps_gtk.pm:465
#, c-format
msgid "in order to keep %s"
msgstr "%s-i saxlamaq üçün"
-#: steps_gtk.pm:464
+#: steps_gtk.pm:470
#, c-format
msgid ""
"You cannot select this package as there is not enough space left to install "
"it"
msgstr "Bu paketi seçə bilməzsiniz, çünki qurmaq üçün yer çatmır."
-#: steps_gtk.pm:467
+#: steps_gtk.pm:473
#, c-format
msgid "The following packages are going to be installed"
msgstr "Aşağıdakı paketlər qurulacaq"
-#: steps_gtk.pm:468
+#: steps_gtk.pm:474
#, c-format
msgid "The following packages are going to be removed"
msgstr "Aşağıdakı paketlər sistemdən silinəcəklər"
-#: steps_gtk.pm:494
+#: steps_gtk.pm:500
#, c-format
msgid "This is a mandatory package, it cannot be unselected"
msgstr "Bu lazımlı bir paketdir, sistemdən çıxardıla bilməz"
-#: steps_gtk.pm:496
+#: steps_gtk.pm:502
#, c-format
msgid "You cannot unselect this package. It is already installed"
msgstr "Bu paketi sistemdən çıxarda bilməzsınız. Artıq qurulmuşdur."
-#: steps_gtk.pm:498
+#: steps_gtk.pm:504
#, c-format
msgid "You cannot unselect this package. It must be upgraded"
msgstr "Bu paketi sistemdən çıxarda bilməzsiniz. Yenilənməlidir"
-#: steps_gtk.pm:502
+#: steps_gtk.pm:508
#, c-format
msgid "Show automatically selected packages"
msgstr "Avtomatik seçili paketləri göstər"
-#: steps_gtk.pm:509
+#: steps_gtk.pm:512
#, c-format
msgid "Install"
msgstr "Qur"
-#: steps_gtk.pm:512
+#: steps_gtk.pm:515
#, fuzzy, c-format
msgid "Load/Save selection"
msgstr "Seçili olanı qeyd et"
-#: steps_gtk.pm:513
+#: steps_gtk.pm:516
#, c-format
msgid "Updating package selection"
msgstr "Paket seçkiləri yenilənir"
-#: steps_gtk.pm:518
+#: steps_gtk.pm:521
#, c-format
msgid "Minimal install"
msgstr "Minimal qurulum"
-#: steps_gtk.pm:531
+#: steps_gtk.pm:534
#, c-format
msgid "Software Management"
msgstr "Proqram Tə'minatı İdarəsi"
-#: steps_gtk.pm:531 steps_interactive.pm:443
+#: steps_gtk.pm:534 steps_interactive.pm:443
#, c-format
msgid "Choose the packages you want to install"
msgstr "Qurmaq istədiyiniz paketləri seçin"
-#: steps_gtk.pm:548 steps_interactive.pm:670 steps_list.pm:32
+#: steps_gtk.pm:551 steps_interactive.pm:670 steps_list.pm:32
#, c-format
msgid "Installing"
msgstr "Qurulur"
-#: steps_gtk.pm:578
+#: steps_gtk.pm:581
#, c-format
msgid "No details"
msgstr "Təfsilatsız"
-#: steps_gtk.pm:597
+#: steps_gtk.pm:600
#, fuzzy, c-format
msgid "Time remaining:"
msgstr "Qalan müddət"
-#: steps_gtk.pm:598
+#: steps_gtk.pm:601
#, fuzzy, c-format
msgid "(estimating...)"
msgstr "Təxmini olaraq hesaplanır"
-#: steps_gtk.pm:628
+#: steps_gtk.pm:631
#, c-format
msgid "%d package"
msgid_plural "%d packages"
msgstr[0] "%d paket"
-#: steps_gtk.pm:683 steps_interactive.pm:834 steps_list.pm:43
+#: steps_gtk.pm:687 steps_interactive.pm:837 steps_list.pm:43
#, c-format
msgid "Summary"
msgstr "İcmal"
-#: steps_gtk.pm:702
+#: steps_gtk.pm:706
#, c-format
msgid "Configure"
msgstr "Qur"
-#: steps_gtk.pm:719 steps_interactive.pm:830 steps_interactive.pm:983
+#: steps_gtk.pm:723 steps_interactive.pm:833 steps_interactive.pm:986
#, c-format
msgid "not configured"
msgstr "quraşdırılmayıb"
@@ -1068,7 +1117,7 @@ msgid ""
"If you want to skip some of them, you can unselect them now."
msgstr ""
-#: steps_gtk.pm:778 steps_interactive.pm:349
+#: steps_gtk.pm:782 steps_interactive.pm:349
#, c-format
msgid ""
"You have the option to copy the contents of the CDs onto the hard disk drive "
@@ -1077,7 +1126,7 @@ msgid ""
"available once the system is fully installed."
msgstr ""
-#: steps_gtk.pm:780 steps_interactive.pm:351
+#: steps_gtk.pm:784 steps_interactive.pm:351
#, c-format
msgid "Copy whole CDs"
msgstr ""
@@ -1378,28 +1427,28 @@ msgstr ""
"Yeniləmələri qurmaq istəyirsiniz ?"
#. -PO: example: lilo-graphic on /dev/hda1
-#: steps_interactive.pm:878
+#: steps_interactive.pm:881
#, c-format
msgid "%s on %s"
msgstr "%2$s üstündə %1$s"
-#: steps_interactive.pm:910 steps_interactive.pm:917 steps_interactive.pm:930
-#: steps_interactive.pm:947 steps_interactive.pm:962
+#: steps_interactive.pm:913 steps_interactive.pm:920 steps_interactive.pm:933
+#: steps_interactive.pm:950 steps_interactive.pm:965
#, c-format
msgid "Hardware"
msgstr "Avadanlıq"
-#: steps_interactive.pm:931 steps_interactive.pm:948
+#: steps_interactive.pm:934 steps_interactive.pm:951
#, c-format
msgid "Sound card"
msgstr "Səs kartı"
-#: steps_interactive.pm:951
+#: steps_interactive.pm:954
#, c-format
msgid "Do you have an ISA sound card?"
msgstr "Heç İSA səs kartınız var?"
-#: steps_interactive.pm:953
+#: steps_interactive.pm:956
#, fuzzy, c-format
msgid ""
"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1407,73 +1456,73 @@ msgid ""
msgstr ""
"Qurulumdan sonra səs kartınızı qurğulamaq üçün \"sndconfig\" əmrini icra edin"
-#: steps_interactive.pm:955
+#: steps_interactive.pm:958
#, 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:963
+#: steps_interactive.pm:966
#, c-format
msgid "Graphical interface"
msgstr "Qrafiki ara üz"
-#: steps_interactive.pm:969 steps_interactive.pm:981
+#: steps_interactive.pm:972 steps_interactive.pm:984
#, c-format
msgid "Network & Internet"
msgstr "Şəbəkə və İnternet"
-#: steps_interactive.pm:982
+#: steps_interactive.pm:985
#, c-format
msgid "Proxies"
msgstr "Vəkil vericiləri"
-#: steps_interactive.pm:983
+#: steps_interactive.pm:986
#, c-format
msgid "configured"
msgstr "quraşdırılıb"
-#: steps_interactive.pm:993
+#: steps_interactive.pm:996
#, c-format
msgid "Security Level"
msgstr "Təhlükəsizlik Səviyyəsi"
-#: steps_interactive.pm:1013
+#: steps_interactive.pm:1016
#, c-format
msgid "Firewall"
msgstr "Atəş Divarı"
-#: steps_interactive.pm:1017
+#: steps_interactive.pm:1020
#, c-format
msgid "activated"
msgstr "fəal"
-#: steps_interactive.pm:1017
+#: steps_interactive.pm:1020
#, c-format
msgid "disabled"
msgstr "qeyri-fəal"
-#: steps_interactive.pm:1031
+#: steps_interactive.pm:1034
#, 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:1060
+#: steps_interactive.pm:1063
#, c-format
msgid "Preparing bootloader..."
msgstr "Açılış yükləyici hazırlanır"
#. -PO: This is NOT the boot loader!!!!
-#: steps_interactive.pm:1062
+#: steps_interactive.pm:1065
#, fuzzy, c-format
msgid "Preparing initial startup program..."
msgstr "Qurulum hazırlanır"
-#: steps_interactive.pm:1063
+#: steps_interactive.pm:1066
#, c-format
msgid "Be patient, this may take a while..."
msgstr ""
-#: steps_interactive.pm:1074
+#: steps_interactive.pm:1077
#, fuzzy, c-format
msgid ""
"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1486,24 +1535,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:1087
+#: steps_interactive.pm:1090
#, c-format
msgid ""
"In this security level, access to the files in the Windows partition is "
"restricted to the administrator."
msgstr ""
-#: steps_interactive.pm:1119
+#: steps_interactive.pm:1122
#, 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:1121
+#: steps_interactive.pm:1124
#, c-format
msgid "Creating auto install floppy..."
msgstr "Avtomatik qurulum disketi hazırlanır"
-#: steps_interactive.pm:1132
+#: steps_interactive.pm:1135
#, c-format
msgid ""
"Some steps are not completed.\n"
@@ -1514,12 +1563,12 @@ msgstr ""
"\n"
"Həqiqətən də çıxmaq istəyirsiniz?"
-#: steps_interactive.pm:1142
+#: steps_interactive.pm:1145
#, c-format
msgid "Congratulations"
msgstr "Təbriklər"
-#: steps_interactive.pm:1145
+#: steps_interactive.pm:1148
#, c-format
msgid "Reboot"
msgstr "Yenidən başlat"
diff --git a/perl-install/install/share/po/be.po b/perl-install/install/share/po/be.po
index a8526b727..1a91a7595 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: 2013-05-03 10:51+0200\n"
+"POT-Creation-Date: 2013-11-03 12:08+0200\n"
"PO-Revision-Date: 2000-09-24 12:30 +0100\n"
"Last-Translator: Alexander Bokovoy <ab@avilink.net>\n"
"Language-Team: be\n"
@@ -71,7 +71,7 @@ msgid "Do you have further supplementary media?"
msgstr "Ці ёсць у вас іншы?"
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:113
+#: any.pm:114
#, c-format
msgid ""
"The following media have been found and will be used during install: %s.\n"
@@ -80,177 +80,177 @@ msgid ""
"Do you have a supplementary installation medium to configure?"
msgstr ""
-#: any.pm:121
+#: any.pm:122
#, c-format
msgid "CD-ROM"
msgstr "CD-ROM"
-#: any.pm:122
+#: any.pm:123
#, fuzzy, c-format
msgid "Network (HTTP)"
msgstr "Сетка"
-#: any.pm:123
+#: any.pm:124
#, fuzzy, c-format
msgid "Network (FTP)"
msgstr "Сетка"
-#: any.pm:124
+#: any.pm:125
#, c-format
msgid "Network (NFS)"
msgstr ""
-#: any.pm:171
+#: any.pm:173
#, c-format
msgid "URL of the mirror?"
msgstr ""
-#: any.pm:177
+#: any.pm:179
#, c-format
msgid "URL must start with ftp:// or http://"
msgstr ""
-#: any.pm:188
+#: any.pm:190
#, fuzzy, c-format
msgid "Contacting %s web site to get the list of available mirrors..."
msgstr "Сувязь з люрам для атрымання спісу даступных пакетаў"
-#: any.pm:193
+#: any.pm:195
#, fuzzy, c-format
msgid "Failed contacting %s web site to get the list of available mirrors"
msgstr "Сувязь з люрам для атрымання спісу даступных пакетаў"
-#: any.pm:203
+#: any.pm:205
#, c-format
msgid "Choose a mirror from which to get the packages"
msgstr "Выбар люстра для атрымання пакетаў"
-#: any.pm:233
+#: any.pm:235
#, c-format
msgid "NFS setup"
msgstr ""
-#: any.pm:234
+#: any.pm:236
#, c-format
msgid "Please enter the hostname and directory of your NFS media"
msgstr ""
-#: any.pm:238
+#: any.pm:240
#, c-format
msgid "Hostname missing"
msgstr ""
-#: any.pm:239
+#: any.pm:241
#, c-format
msgid "Directory must begin with \"/\""
msgstr ""
-#: any.pm:243
+#: any.pm:245
#, c-format
msgid "Hostname of the NFS mount ?"
msgstr ""
-#: any.pm:244
+#: any.pm:246
#, c-format
msgid "Directory"
msgstr "Каталёг"
-#: any.pm:266
+#: any.pm:268
#, c-format
msgid "Supplementary"
msgstr ""
-#: any.pm:301
+#: any.pm:303
#, fuzzy, c-format
msgid ""
"Can't find a package list file on this mirror. Make sure the location is "
"correct."
msgstr "Не знойздены праграмы\n"
-#: any.pm:317
+#: any.pm:319
#, c-format
msgid "Core Release"
msgstr ""
-#: any.pm:319
+#: any.pm:321
#, c-format
msgid "Tainted Release"
msgstr ""
-#: any.pm:321
+#: any.pm:323
#, c-format
msgid "Nonfree Release"
msgstr ""
-#: any.pm:335
+#: any.pm:351
#, c-format
msgid ""
"Some hardware on your machine needs some non free firmwares in order for the "
"free software drivers to work."
msgstr ""
-#: any.pm:336
+#: any.pm:352
#, c-format
msgid "You should enable \"%s\""
msgstr ""
-#: any.pm:355
+#: any.pm:377
#, c-format
msgid "\"%s\" contains the various pieces of the systems and its applications"
msgstr ""
-#: any.pm:356
+#: any.pm:378
#, c-format
msgid "\"%s\" contains non free software.\n"
msgstr ""
-#: any.pm:357
+#: any.pm:379
#, c-format
msgid ""
"It also contains firmwares needed for certain devices to operate (eg: some "
"ATI/AMD graphic cards, some network cards, some RAID cards, ...)"
msgstr ""
-#: any.pm:358
+#: any.pm:380
#, c-format
msgid ""
"\"%s\" contains software that can not be distributed in every country due to "
"software patents."
msgstr ""
-#: any.pm:359
+#: any.pm:381
#, c-format
msgid ""
"It also contains software from \"%s\" rebuild with additional capabilities."
msgstr ""
-#: any.pm:363
+#: any.pm:387
#, c-format
msgid "Here you can enable more media if you want."
msgstr ""
-#: any.pm:378
+#: any.pm:404
#, c-format
msgid "This medium provides package updates for medium \"%s\""
msgstr ""
-#: any.pm:451
+#: any.pm:480
#, fuzzy, c-format
msgid "Looking at packages already installed..."
msgstr "Вы не можаце адмяніць вылучэнне гэтага пакету. Ён ужо ўсталяваны"
-#: any.pm:485
+#: any.pm:514
#, c-format
msgid "Finding packages to upgrade..."
msgstr "Пошук пакетаў для абнаўлення"
-#: any.pm:498
+#: any.pm:527
#, c-format
msgid "Removing packages prior to upgrade..."
msgstr ""
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:713
+#: any.pm:743
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -259,72 +259,72 @@ msgid ""
"Do you really want to remove these packages?\n"
msgstr ""
-#: any.pm:932
+#: any.pm:962
#, c-format
msgid "Error reading file %s"
msgstr "Памылка чытання файлу %s"
-#: any.pm:1140
+#: any.pm:1170
#, fuzzy, c-format
msgid "The following disk(s) were renamed:"
msgstr "Наступныя пакеты будуць даданы да сістэмы"
-#: any.pm:1142
+#: any.pm:1172
#, c-format
msgid "%s (previously named as %s)"
msgstr ""
-#: any.pm:1199
+#: any.pm:1229
#, c-format
msgid "HTTP"
msgstr ""
-#: any.pm:1199
+#: any.pm:1229
#, c-format
msgid "FTP"
msgstr "FTP"
-#: any.pm:1199
+#: any.pm:1229
#, fuzzy, c-format
msgid "NFS"
msgstr "ФС"
-#: any.pm:1218 steps_interactive.pm:970
+#: any.pm:1248 steps_interactive.pm:973
#, c-format
msgid "Network"
msgstr "Сетка"
-#: any.pm:1222
+#: any.pm:1252
#, fuzzy, c-format
msgid "Please choose a media"
msgstr "Калі ласка выбярыце відарыс відэа"
-#: any.pm:1238
+#: any.pm:1268
#, fuzzy, c-format
msgid "File already exists. Overwrite it?"
msgstr "Файл ужо йснуе. Перапісаць?"
-#: any.pm:1242
+#: any.pm:1272
#, c-format
msgid "Permission denied"
msgstr "Адмоўлена ў доступе"
-#: any.pm:1290
+#: any.pm:1320
#, fuzzy, c-format
msgid "Bad NFS name"
msgstr "Бяз назвы"
-#: any.pm:1311
+#: any.pm:1341
#, fuzzy, c-format
msgid "Bad media %s"
msgstr "Загружаецца файл %s"
-#: any.pm:1355
+#: any.pm:1385
#, fuzzy, c-format
msgid "Cannot make screenshots before partitioning"
msgstr "Дадаць раздзел немагчыма"
-#: any.pm:1363
+#: any.pm:1393
#, c-format
msgid "Screenshots will be available after install in %s"
msgstr ""
@@ -334,7 +334,7 @@ msgstr ""
msgid "Installation"
msgstr "Усталёўваем"
-#: gtk.pm:132 share/meta-task/compssUsers.pl:43
+#: gtk.pm:132 share/meta-task/compssUsers.pl:46
#, c-format
msgid "Configuration"
msgstr "Канфігурацыя"
@@ -430,44 +430,44 @@ msgid ""
"%s"
msgstr ""
-#: pkgs.pm:382 pkgs.pm:409
+#: pkgs.pm:383 pkgs.pm:410
#, fuzzy, c-format
msgid "An error occurred:"
msgstr "Адбылася памылка"
-#: pkgs.pm:401
+#: pkgs.pm:402
#, fuzzy, c-format
msgid "A fatal error occurred: %s."
msgstr ""
"ПАМЫЛАЧКА АТРЫМАЛАСЯ: \n"
"%s"
-#: pkgs.pm:891 pkgs.pm:928
+#: pkgs.pm:896 pkgs.pm:938
#, c-format
msgid "Do not ask again"
msgstr ""
-#: pkgs.pm:907
+#: pkgs.pm:912
#, fuzzy, c-format
msgid "%d installation transactions failed"
msgstr "Усталяванне SILO"
-#: pkgs.pm:908
+#: pkgs.pm:913
#, fuzzy, c-format
msgid "Installation of packages failed:"
msgstr "Усталяванне пакету %s"
-#: share/meta-task/compssUsers.pl:13
+#: share/meta-task/compssUsers.pl:14
#, fuzzy, c-format
msgid "Workstation"
msgstr "Канфігурацыя"
-#: share/meta-task/compssUsers.pl:15
+#: share/meta-task/compssUsers.pl:16
#, fuzzy, c-format
msgid "Office Workstation"
msgstr "Працоўныя мейсцы"
-#: share/meta-task/compssUsers.pl:17
+#: share/meta-task/compssUsers.pl:18
#, c-format
msgid ""
"Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets "
@@ -476,225 +476,225 @@ msgstr ""
"Офісныя праграмы: працэсары словаў (LibreOffice Writer, Kword), электроныя "
"табліцы, аглядальнікі pdf-файлаў, і г.д."
-#: share/meta-task/compssUsers.pl:22
+#: share/meta-task/compssUsers.pl:24
#, fuzzy, c-format
msgid "Game station"
msgstr "Аўтэнтыфікацыя"
-#: share/meta-task/compssUsers.pl:23
+#: share/meta-task/compssUsers.pl:25
#, c-format
msgid "Amusement programs: arcade, boards, strategy, etc"
msgstr "Забаўляльныя праграмы: аркады, стратэгіі і г.д."
-#: share/meta-task/compssUsers.pl:26
+#: share/meta-task/compssUsers.pl:28
#, fuzzy, c-format
msgid "Multimedia station"
msgstr "Мульцімедыя"
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:29
#, c-format
msgid "Sound and video playing/editing programs"
msgstr "Рэдактары і прайгравальнікі гуку і відэа"
-#: share/meta-task/compssUsers.pl:32
+#: share/meta-task/compssUsers.pl:34
#, fuzzy, c-format
msgid "Internet station"
msgstr "Інтэрнэт"
-#: share/meta-task/compssUsers.pl:33
+#: share/meta-task/compssUsers.pl:35
#, c-format
msgid ""
"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
"Web"
msgstr ""
-#: share/meta-task/compssUsers.pl:38
+#: share/meta-task/compssUsers.pl:40
#, fuzzy, c-format
msgid "Network Computer (client)"
msgstr "Сеткавы прынтэр (TCP/Socket)"
-#: share/meta-task/compssUsers.pl:39
+#: share/meta-task/compssUsers.pl:41
#, c-format
msgid "Clients for different protocols including ssh"
msgstr ""
-#: share/meta-task/compssUsers.pl:44
+#: share/meta-task/compssUsers.pl:47
#, fuzzy, c-format
msgid "Tools to ease the configuration of your computer"
msgstr "Ці жадаеце пратэсціраваць настройкі?"
-#: share/meta-task/compssUsers.pl:48
+#: share/meta-task/compssUsers.pl:51
#, c-format
msgid "Console Tools"
msgstr "Кансольныя інструментальныя сродкі"
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:52
#, c-format
msgid "Editors, shells, file tools, terminals"
msgstr "Рэдактары, абалонкі, тэрміналы"
-#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156
-#: share/meta-task/compssUsers.pl:158
+#: share/meta-task/compssUsers.pl:56 share/meta-task/compssUsers.pl:200
+#: share/meta-task/compssUsers.pl:202
#, c-format
msgid "Development"
msgstr "Распрацоўка"
-#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:203
#, c-format
msgid "C and C++ development libraries, programs and include files"
msgstr "Бібліятэкі і праграмы для распрацоўкі на С і С++"
-#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163
+#: share/meta-task/compssUsers.pl:61 share/meta-task/compssUsers.pl:207
#, c-format
msgid "Documentation"
msgstr "Дакумэнтацыя"
-#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
+#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:208
#, c-format
msgid "Books and Howto's on Linux and Free Software"
msgstr "нігі і Howto па Linux і Free Software"
-#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167
+#: share/meta-task/compssUsers.pl:66 share/meta-task/compssUsers.pl:211
#, c-format
msgid "LSB"
msgstr ""
-#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:67 share/meta-task/compssUsers.pl:212
#, c-format
msgid "Linux Standard Base. Third party applications support"
msgstr ""
-#: share/meta-task/compssUsers.pl:72
+#: share/meta-task/compssUsers.pl:77
#, fuzzy, c-format
msgid "Web Server"
msgstr "Сервак"
-#: share/meta-task/compssUsers.pl:73
+#: share/meta-task/compssUsers.pl:78
#, fuzzy, c-format
msgid "Apache"
msgstr "Шлях:"
-#: share/meta-task/compssUsers.pl:76
+#: share/meta-task/compssUsers.pl:82
#, fuzzy, c-format
msgid "Groupware"
msgstr "Групы"
-#: share/meta-task/compssUsers.pl:77
+#: share/meta-task/compssUsers.pl:83
#, fuzzy, c-format
msgid "Kolab Server"
msgstr "NIS сэервер:"
-#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121
+#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl:136
#, fuzzy, c-format
msgid "Firewall/Router"
msgstr "Рэстарт"
-#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
+#: share/meta-task/compssUsers.pl:87 share/meta-task/compssUsers.pl:137
#, fuzzy, c-format
msgid "Internet gateway"
msgstr "Інтэрнэт"
-#: share/meta-task/compssUsers.pl:84
+#: share/meta-task/compssUsers.pl:90
#, fuzzy, c-format
msgid "Mail/News"
msgstr "/Файл/_Стварыць"
-#: share/meta-task/compssUsers.pl:85
+#: share/meta-task/compssUsers.pl:91
#, c-format
msgid "Postfix mail server, Inn news server"
msgstr ""
-#: share/meta-task/compssUsers.pl:88
+#: share/meta-task/compssUsers.pl:95
#, fuzzy, c-format
msgid "Directory Server"
msgstr "Каталог %s Так"
-#: share/meta-task/compssUsers.pl:92
+#: share/meta-task/compssUsers.pl:100
#, fuzzy, c-format
msgid "FTP Server"
msgstr "NIS сэервер:"
-#: share/meta-task/compssUsers.pl:93
+#: share/meta-task/compssUsers.pl:101
#, c-format
msgid "ProFTPd"
msgstr ""
-#: share/meta-task/compssUsers.pl:96
+#: share/meta-task/compssUsers.pl:105
#, c-format
msgid "DNS/NIS"
msgstr ""
-#: share/meta-task/compssUsers.pl:97
+#: share/meta-task/compssUsers.pl:106
#, fuzzy, c-format
msgid "Domain Name and Network Information Server"
msgstr "Імя дамену"
-#: share/meta-task/compssUsers.pl:100
+#: share/meta-task/compssUsers.pl:110
#, fuzzy, c-format
msgid "File and Printer Sharing Server"
msgstr "Сервер друку"
-#: share/meta-task/compssUsers.pl:101
+#: share/meta-task/compssUsers.pl:111
#, fuzzy, c-format
msgid "NFS Server, Samba server"
msgstr "X сэервер"
-#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117
+#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl:131
#, c-format
msgid "Database"
msgstr "База даньняў"
-#: share/meta-task/compssUsers.pl:105
+#: share/meta-task/compssUsers.pl:116
#, c-format
msgid "PostgreSQL and MariaDB Database Server"
msgstr ""
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:121
#, c-format
msgid "Web/FTP"
msgstr ""
-#: share/meta-task/compssUsers.pl:110
+#: share/meta-task/compssUsers.pl:122
#, c-format
msgid "Apache, Pro-ftpd"
msgstr ""
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:126
#, c-format
msgid "Mail"
msgstr "Пошта"
-#: share/meta-task/compssUsers.pl:114
+#: share/meta-task/compssUsers.pl:127
#, c-format
msgid "Postfix mail server"
msgstr ""
-#: share/meta-task/compssUsers.pl:118
+#: share/meta-task/compssUsers.pl:132
#, c-format
msgid "PostgreSQL or MariaDB database server"
msgstr ""
-#: share/meta-task/compssUsers.pl:125
+#: share/meta-task/compssUsers.pl:140
#, fuzzy, c-format
msgid "Network Computer server"
msgstr "Сеткавыя інтэрфэйсы"
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:141
#, c-format
msgid "NFS server, SMB server, Proxy server, ssh server"
msgstr ""
-#: share/meta-task/compssUsers.pl:132
+#: share/meta-task/compssUsers.pl:148
#, fuzzy, c-format
msgid "Graphical Environment"
msgstr "Абалонка"
-#: share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:150
#, fuzzy, c-format
msgid "KDE Workstation"
msgstr "Канфігурацыя"
-#: share/meta-task/compssUsers.pl:135
+#: share/meta-task/compssUsers.pl:151
#, c-format
msgid ""
"The K Desktop Environment, the basic graphical environment with a collection "
@@ -703,12 +703,12 @@ msgstr ""
"The K Desktop Environment - асноўнае графічнае асяродзе з калекцыяй "
"інструментальных сродкаў"
-#: share/meta-task/compssUsers.pl:139
+#: share/meta-task/compssUsers.pl:156
#, fuzzy, c-format
msgid "GNOME Workstation"
msgstr "Інфармацыя аб памяці"
-#: share/meta-task/compssUsers.pl:140
+#: share/meta-task/compssUsers.pl:157 share/meta-task/compssUsers.pl:168
#, c-format
msgid ""
"A graphical environment with user-friendly set of applications and desktop "
@@ -717,12 +717,41 @@ msgstr ""
"Графічнае асяродзе са зручным дзеля выкарыстання наборам прыкладанняў і "
"інструментальных сродкаў"
-#: share/meta-task/compssUsers.pl:144
+#: share/meta-task/compssUsers.pl:162
+#, fuzzy, c-format
+msgid "XFCE Workstation"
+msgstr "Канфігурацыя"
+
+#: share/meta-task/compssUsers.pl:163
+#, fuzzy, c-format
+msgid ""
+"A lighter graphical environment with user-friendly set of applications and "
+"desktop tools"
+msgstr ""
+"Графічнае асяродзе са зручным дзеля выкарыстання наборам прыкладанняў і "
+"інструментальных сродкаў"
+
+#: share/meta-task/compssUsers.pl:167
+#, fuzzy, c-format
+msgid "MATE Workstation"
+msgstr "Інфармацыя аб памяці"
+
+#: share/meta-task/compssUsers.pl:172
+#, fuzzy, c-format
+msgid "Cinnamon Workstation"
+msgstr "Канфігурацыя"
+
+#: share/meta-task/compssUsers.pl:173
+#, fuzzy, c-format
+msgid "A graphical environment based on GNOME"
+msgstr "Абалонка"
+
+#: share/meta-task/compssUsers.pl:177
#, fuzzy, c-format
msgid "LXDE Desktop"
msgstr "Працоўны стол"
-#: share/meta-task/compssUsers.pl:146
+#: share/meta-task/compssUsers.pl:179
#, fuzzy, c-format
msgid ""
"A lightweight & fast graphical environment with user-friendly set of "
@@ -731,52 +760,74 @@ msgstr ""
"Графічнае асяродзе са зручным дзеля выкарыстання наборам прыкладанняў і "
"інструментальных сродкаў"
-#: share/meta-task/compssUsers.pl:149
+#: share/meta-task/compssUsers.pl:183
+#, fuzzy, c-format
+msgid "RazorQT Desktop"
+msgstr "Працоўны стол"
+
+#: share/meta-task/compssUsers.pl:185
+#, c-format
+msgid "A less developed lightweight fast graphical environment"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:188
+#, c-format
+msgid "Enlightenment e17 Desktop"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:190
+#, fuzzy, c-format
+msgid "A lightweight fast graphical environment with a dedicated following"
+msgstr ""
+"Графічнае асяродзе са зручным дзеля выкарыстання наборам прыкладанняў і "
+"інструментальных сродкаў"
+
+#: share/meta-task/compssUsers.pl:193
#, c-format
msgid "Other Graphical Desktops"
msgstr "Іншыя графічныя Працоўныя сталы"
-#: share/meta-task/compssUsers.pl:150
+#: share/meta-task/compssUsers.pl:194
#, c-format
-msgid "Window Maker, Enlightenment, Fvwm, etc"
+msgid "Window Maker, Fvwm, etc"
msgstr ""
-#: share/meta-task/compssUsers.pl:173
+#: share/meta-task/compssUsers.pl:217
#, c-format
msgid "Utilities"
msgstr "Карыснасьці"
-#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176
+#: share/meta-task/compssUsers.pl:219 share/meta-task/compssUsers.pl:220
#, fuzzy, c-format
msgid "SSH Server"
msgstr "NIS сэервер:"
-#: share/meta-task/compssUsers.pl:180
+#: share/meta-task/compssUsers.pl:224
#, fuzzy, c-format
msgid "Webmin"
msgstr "Прылады"
-#: share/meta-task/compssUsers.pl:181
+#: share/meta-task/compssUsers.pl:225
#, fuzzy, c-format
msgid "Webmin Remote Configuration Server"
msgstr "Сістэмнае адміністраваньне"
-#: share/meta-task/compssUsers.pl:185
+#: share/meta-task/compssUsers.pl:229
#, fuzzy, c-format
msgid "Network Utilities/Monitoring"
msgstr "Канфігурацыя сеткі"
-#: share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:230
#, c-format
msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
msgstr ""
-#: share/meta-task/compssUsers.pl:190
+#: share/meta-task/compssUsers.pl:234
#, fuzzy, c-format
msgid "Mageia Wizards"
msgstr "Цэнтар кіраваньня"
-#: share/meta-task/compssUsers.pl:191
+#: share/meta-task/compssUsers.pl:235
#, fuzzy, c-format
msgid "Wizards to configure server"
msgstr "Немагчыма выдаліць \"%s\": %s."
@@ -790,7 +841,7 @@ msgstr ""
"Узнікла памылка, якую не атрымліваецца карэктна апрацаваць,\n"
"таму працягвайце на сваю рызыку."
-#: steps.pm:461
+#: steps.pm:458
#, c-format
msgid ""
"Some important packages did not get installed properly.\n"
@@ -845,107 +896,107 @@ msgstr "Выбар групы пакетаў"
msgid "Install %s KDE Desktop"
msgstr ""
-#: steps_gtk.pm:244
+#: steps_gtk.pm:252
#, c-format
msgid "Install %s GNOME Desktop"
msgstr ""
-#: steps_gtk.pm:245
+#: steps_gtk.pm:253
#, fuzzy, c-format
msgid "Custom install"
msgstr "Ахоўнік экрану"
-#: steps_gtk.pm:266
+#: steps_gtk.pm:274
#, fuzzy, c-format
msgid "KDE Desktop"
msgstr "Працоўны стол"
-#: steps_gtk.pm:267
+#: steps_gtk.pm:275
#, fuzzy, c-format
msgid "GNOME Desktop"
msgstr "Працоўны стол"
-#: steps_gtk.pm:268
+#: steps_gtk.pm:276
#, fuzzy, c-format
msgid "Custom Desktop"
msgstr "Працоўны стол"
-#: steps_gtk.pm:274
+#: steps_gtk.pm:282
#, c-format
msgid "Here's a preview of the '%s' desktop."
msgstr ""
-#: steps_gtk.pm:301
+#: steps_gtk.pm:309
#, c-format
msgid "Click on images in order to see a bigger preview"
msgstr ""
-#: steps_gtk.pm:319 steps_interactive.pm:633 steps_list.pm:30
+#: steps_gtk.pm:325 steps_interactive.pm:633 steps_list.pm:30
#, c-format
msgid "Package Group Selection"
msgstr "Выбар групы пакетаў"
-#: steps_gtk.pm:344 steps_interactive.pm:650
+#: steps_gtk.pm:350 steps_interactive.pm:650
#, c-format
msgid "Individual package selection"
msgstr "Асабісты выбар пакетаў"
-#: steps_gtk.pm:351
+#: steps_gtk.pm:357
#, fuzzy, c-format
msgid "Unselect All"
msgstr "Дадаць выбраныя файлы"
-#: steps_gtk.pm:370 steps_interactive.pm:562
+#: steps_gtk.pm:376 steps_interactive.pm:562
#, c-format
msgid "Total size: %d / %d MB"
msgstr "Агульны памер: %d / %d Мб"
-#: steps_gtk.pm:415
+#: steps_gtk.pm:421
#, c-format
msgid "Version: "
msgstr "Вэрсія: "
-#: steps_gtk.pm:416
+#: steps_gtk.pm:422
#, c-format
msgid "Size: "
msgstr "Памер: "
-#: steps_gtk.pm:416
+#: steps_gtk.pm:422
#, c-format
msgid "%d KB\n"
msgstr ""
-#: steps_gtk.pm:417
+#: steps_gtk.pm:423
#, fuzzy, c-format
msgid "Importance: "
msgstr "важна"
-#: steps_gtk.pm:452
+#: steps_gtk.pm:458
#, c-format
msgid "You cannot select/unselect this package"
msgstr "Вы не можаце вылучаць і адмяняць вылучэнне гэтага пакету"
-#: steps_gtk.pm:456
+#: steps_gtk.pm:462
#, c-format
msgid "due to missing %s"
msgstr ""
-#: steps_gtk.pm:457
+#: steps_gtk.pm:463
#, c-format
msgid "due to unsatisfied %s"
msgstr ""
-#: steps_gtk.pm:458
+#: steps_gtk.pm:464
#, c-format
msgid "trying to promote %s"
msgstr ""
-#: steps_gtk.pm:459
+#: steps_gtk.pm:465
#, fuzzy, c-format
msgid "in order to keep %s"
msgstr "Уласьцівасьці акна"
-#: steps_gtk.pm:464
+#: steps_gtk.pm:470
#, c-format
msgid ""
"You cannot select this package as there is not enough space left to install "
@@ -953,104 +1004,104 @@ msgid ""
msgstr ""
"Вы не можаце выбраць гэты пакет, таму як не хапае месца для яго ўсталявання"
-#: steps_gtk.pm:467
+#: steps_gtk.pm:473
#, c-format
msgid "The following packages are going to be installed"
msgstr "Наступныя пакеты будуць даданы да сістэмы"
-#: steps_gtk.pm:468
+#: steps_gtk.pm:474
#, c-format
msgid "The following packages are going to be removed"
msgstr "Наступныя пакеты будуць выдалены"
-#: steps_gtk.pm:494
+#: steps_gtk.pm:500
#, c-format
msgid "This is a mandatory package, it cannot be unselected"
msgstr "Гэта абавязковы пакет, яго вылучэнне нельга адмяніць"
-#: steps_gtk.pm:496
+#: steps_gtk.pm:502
#, c-format
msgid "You cannot unselect this package. It is already installed"
msgstr "Вы не можаце адмяніць вылучэнне гэтага пакету. Ён ужо ўсталяваны"
-#: steps_gtk.pm:498
+#: steps_gtk.pm:504
#, c-format
msgid "You cannot unselect this package. It must be upgraded"
msgstr "Вы не можаце адмяніць вылучэнне гэтага пакету. Яго патрэбна абнавіць"
-#: steps_gtk.pm:502
+#: steps_gtk.pm:508
#, c-format
msgid "Show automatically selected packages"
msgstr ""
-#: steps_gtk.pm:509
+#: steps_gtk.pm:512
#, c-format
msgid "Install"
msgstr "Усталёўка"
-#: steps_gtk.pm:512
+#: steps_gtk.pm:515
#, fuzzy, c-format
msgid "Load/Save selection"
msgstr "Перанесьці вылучэньне"
-#: steps_gtk.pm:513
+#: steps_gtk.pm:516
#, fuzzy, c-format
msgid "Updating package selection"
msgstr "Асабісты выбар пакетаў"
-#: steps_gtk.pm:518
+#: steps_gtk.pm:521
#, fuzzy, c-format
msgid "Minimal install"
msgstr "Ахоўнік экрану"
-#: steps_gtk.pm:531
+#: steps_gtk.pm:534
#, fuzzy, c-format
msgid "Software Management"
msgstr "Мэнэджэр сэрвісаў"
-#: steps_gtk.pm:531 steps_interactive.pm:443
+#: steps_gtk.pm:534 steps_interactive.pm:443
#, c-format
msgid "Choose the packages you want to install"
msgstr "Выбар пакетаў для ўсталявання"
-#: steps_gtk.pm:548 steps_interactive.pm:670 steps_list.pm:32
+#: steps_gtk.pm:551 steps_interactive.pm:670 steps_list.pm:32
#, c-format
msgid "Installing"
msgstr "Усталёўваем"
-#: steps_gtk.pm:578
+#: steps_gtk.pm:581
#, fuzzy, c-format
msgid "No details"
msgstr "Падрабязнасці"
-#: steps_gtk.pm:597
+#: steps_gtk.pm:600
#, fuzzy, c-format
msgid "Time remaining:"
msgstr "Засталося часу "
-#: steps_gtk.pm:598
+#: steps_gtk.pm:601
#, fuzzy, c-format
msgid "(estimating...)"
msgstr "Чакаецца"
-#: steps_gtk.pm:628
+#: steps_gtk.pm:631
#, fuzzy, c-format
msgid "%d package"
msgid_plural "%d packages"
msgstr[0] "%d пакетаў"
msgstr[1] "%d пакетаў"
-#: steps_gtk.pm:683 steps_interactive.pm:834 steps_list.pm:43
+#: steps_gtk.pm:687 steps_interactive.pm:837 steps_list.pm:43
#, c-format
msgid "Summary"
msgstr "Агульныя зьвесткі"
-#: steps_gtk.pm:702
+#: steps_gtk.pm:706
#, c-format
msgid "Configure"
msgstr "Настройка"
-#: steps_gtk.pm:719 steps_interactive.pm:830 steps_interactive.pm:983
+#: steps_gtk.pm:723 steps_interactive.pm:833 steps_interactive.pm:986
#, fuzzy, c-format
msgid "not configured"
msgstr "Настроіць панэль"
@@ -1062,7 +1113,7 @@ msgid ""
"If you want to skip some of them, you can unselect them now."
msgstr ""
-#: steps_gtk.pm:778 steps_interactive.pm:349
+#: steps_gtk.pm:782 steps_interactive.pm:349
#, c-format
msgid ""
"You have the option to copy the contents of the CDs onto the hard disk drive "
@@ -1071,7 +1122,7 @@ msgid ""
"available once the system is fully installed."
msgstr ""
-#: steps_gtk.pm:780 steps_interactive.pm:351
+#: steps_gtk.pm:784 steps_interactive.pm:351
#, c-format
msgid "Copy whole CDs"
msgstr ""
@@ -1355,101 +1406,101 @@ msgid ""
msgstr ""
#. -PO: example: lilo-graphic on /dev/hda1
-#: steps_interactive.pm:878
+#: steps_interactive.pm:881
#, c-format
msgid "%s on %s"
msgstr "%s на %s"
-#: steps_interactive.pm:910 steps_interactive.pm:917 steps_interactive.pm:930
-#: steps_interactive.pm:947 steps_interactive.pm:962
+#: steps_interactive.pm:913 steps_interactive.pm:920 steps_interactive.pm:933
+#: steps_interactive.pm:950 steps_interactive.pm:965
#, c-format
msgid "Hardware"
msgstr "Абсталяваньне"
-#: steps_interactive.pm:931 steps_interactive.pm:948
+#: steps_interactive.pm:934 steps_interactive.pm:951
#, fuzzy, c-format
msgid "Sound card"
msgstr "Праграма гуказапісу"
-#: steps_interactive.pm:951
+#: steps_interactive.pm:954
#, fuzzy, c-format
msgid "Do you have an ISA sound card?"
msgstr "Ці ёсць у вас іншы?"
-#: steps_interactive.pm:953
+#: steps_interactive.pm:956
#, c-format
msgid ""
"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
"card"
msgstr ""
-#: steps_interactive.pm:955
+#: steps_interactive.pm:958
#, c-format
msgid "No sound card detected. Try \"harddrake\" after installation"
msgstr ""
-#: steps_interactive.pm:963
+#: steps_interactive.pm:966
#, fuzzy, c-format
msgid "Graphical interface"
msgstr "Запуск X пры старце сістэмы"
-#: steps_interactive.pm:969 steps_interactive.pm:981
+#: steps_interactive.pm:972 steps_interactive.pm:984
#, fuzzy, c-format
msgid "Network & Internet"
msgstr "Сеткавы інтэрфейс"
-#: steps_interactive.pm:982
+#: steps_interactive.pm:985
#, fuzzy, c-format
msgid "Proxies"
msgstr "Проксі"
-#: steps_interactive.pm:983
+#: steps_interactive.pm:986
#, fuzzy, c-format
msgid "configured"
msgstr "Настроіць панэль"
-#: steps_interactive.pm:993
+#: steps_interactive.pm:996
#, c-format
msgid "Security Level"
msgstr "Узровень бясьпекі"
-#: steps_interactive.pm:1013
+#: steps_interactive.pm:1016
#, c-format
msgid "Firewall"
msgstr ""
-#: steps_interactive.pm:1017
+#: steps_interactive.pm:1020
#, c-format
msgid "activated"
msgstr ""
-#: steps_interactive.pm:1017
+#: steps_interactive.pm:1020
#, c-format
msgid "disabled"
msgstr "выключаны"
-#: steps_interactive.pm:1031
+#: steps_interactive.pm:1034
#, fuzzy, c-format
msgid "You have not configured X. Are you sure you really want this?"
msgstr "Меню не было захавана. Ці сапраўды вы жадаеце выйсці?"
-#: steps_interactive.pm:1060
+#: steps_interactive.pm:1063
#, c-format
msgid "Preparing bootloader..."
msgstr "Падрыхтоўка загрузчыка"
#. -PO: This is NOT the boot loader!!!!
-#: steps_interactive.pm:1062
+#: steps_interactive.pm:1065
#, fuzzy, c-format
msgid "Preparing initial startup program..."
msgstr "Падрыхтоўка ўсталяваньня"
-#: steps_interactive.pm:1063
+#: steps_interactive.pm:1066
#, c-format
msgid "Be patient, this may take a while..."
msgstr ""
-#: steps_interactive.pm:1074
+#: steps_interactive.pm:1077
#, c-format
msgid ""
"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1458,24 +1509,24 @@ msgid ""
"root fs is: root=%s"
msgstr ""
-#: steps_interactive.pm:1087
+#: steps_interactive.pm:1090
#, c-format
msgid ""
"In this security level, access to the files in the Windows partition is "
"restricted to the administrator."
msgstr ""
-#: steps_interactive.pm:1119
+#: steps_interactive.pm:1122
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr "Устаўце дыскету ў дыскавод %s"
-#: steps_interactive.pm:1121
+#: steps_interactive.pm:1124
#, c-format
msgid "Creating auto install floppy..."
msgstr "Стварэнне дыскеты для ўсталявання"
-#: steps_interactive.pm:1132
+#: steps_interactive.pm:1135
#, c-format
msgid ""
"Some steps are not completed.\n"
@@ -1485,12 +1536,12 @@ msgstr ""
"Некаторыя крокі не завершаны.\n"
"Вы сапраўды жадаеце выйсці зараз?"
-#: steps_interactive.pm:1142
+#: steps_interactive.pm:1145
#, fuzzy, c-format
msgid "Congratulations"
msgstr "Прыміце віншаванні!"
-#: steps_interactive.pm:1145
+#: steps_interactive.pm:1148
#, c-format
msgid "Reboot"
msgstr "Перазагрузка"
diff --git a/perl-install/install/share/po/bg.po b/perl-install/install/share/po/bg.po
index 122364ba9..321067a5c 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: 2013-05-03 10:51+0200\n"
+"POT-Creation-Date: 2013-11-03 12:08+0200\n"
"PO-Revision-Date: 2009-03-20 23:42+0200\n"
"Last-Translator: Kolio Kolev <kolio_kolev@biotronica.net>\n"
"Language-Team: Bulgarian <Mageia User Group - Bulgaria <mandriva-"
@@ -79,7 +79,7 @@ msgid "Do you have further supplementary media?"
msgstr "Имате ли друг(и) ?"
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:113
+#: any.pm:114
#, c-format
msgid ""
"The following media have been found and will be used during install: %s.\n"
@@ -88,181 +88,181 @@ msgid ""
"Do you have a supplementary installation medium to configure?"
msgstr ""
-#: any.pm:121
+#: any.pm:122
#, c-format
msgid "CD-ROM"
msgstr "CD-ROM"
-#: any.pm:122
+#: any.pm:123
#, fuzzy, c-format
msgid "Network (HTTP)"
msgstr "Мрежа %s"
-#: any.pm:123
+#: any.pm:124
#, fuzzy, c-format
msgid "Network (FTP)"
msgstr "Мрежа %s"
-#: any.pm:124
+#: any.pm:125
#, c-format
msgid "Network (NFS)"
msgstr ""
-#: any.pm:171
+#: any.pm:173
#, c-format
msgid "URL of the mirror?"
msgstr ""
-#: any.pm:177
+#: any.pm:179
#, c-format
msgid "URL must start with ftp:// or http://"
msgstr ""
-#: any.pm:188
+#: any.pm:190
#, c-format
msgid "Contacting %s web site to get the list of available mirrors..."
msgstr ""
"Свързване с %s web сайт за получаване на списъка с налични огледални "
"сървъри..."
-#: any.pm:193
+#: any.pm:195
#, fuzzy, c-format
msgid "Failed contacting %s web site to get the list of available mirrors"
msgstr ""
"Свързване с %s web сайт за получаване на списъка с налични огледални "
"сървъри..."
-#: any.pm:203
+#: any.pm:205
#, c-format
msgid "Choose a mirror from which to get the packages"
msgstr "Изберете огледален сървър,от който да получите пакетите"
-#: any.pm:233
+#: any.pm:235
#, c-format
msgid "NFS setup"
msgstr ""
-#: any.pm:234
+#: any.pm:236
#, c-format
msgid "Please enter the hostname and directory of your NFS media"
msgstr ""
-#: any.pm:238
+#: any.pm:240
#, c-format
msgid "Hostname missing"
msgstr ""
-#: any.pm:239
+#: any.pm:241
#, c-format
msgid "Directory must begin with \"/\""
msgstr ""
-#: any.pm:243
+#: any.pm:245
#, c-format
msgid "Hostname of the NFS mount ?"
msgstr ""
-#: any.pm:244
+#: any.pm:246
#, c-format
msgid "Directory"
msgstr "Директория"
-#: any.pm:266
+#: any.pm:268
#, c-format
msgid "Supplementary"
msgstr ""
-#: any.pm:301
+#: any.pm:303
#, 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:317
+#: any.pm:319
#, c-format
msgid "Core Release"
msgstr ""
-#: any.pm:319
+#: any.pm:321
#, c-format
msgid "Tainted Release"
msgstr ""
-#: any.pm:321
+#: any.pm:323
#, c-format
msgid "Nonfree Release"
msgstr ""
-#: any.pm:335
+#: any.pm:351
#, c-format
msgid ""
"Some hardware on your machine needs some non free firmwares in order for the "
"free software drivers to work."
msgstr ""
-#: any.pm:336
+#: any.pm:352
#, c-format
msgid "You should enable \"%s\""
msgstr ""
-#: any.pm:355
+#: any.pm:377
#, c-format
msgid "\"%s\" contains the various pieces of the systems and its applications"
msgstr ""
-#: any.pm:356
+#: any.pm:378
#, c-format
msgid "\"%s\" contains non free software.\n"
msgstr ""
-#: any.pm:357
+#: any.pm:379
#, c-format
msgid ""
"It also contains firmwares needed for certain devices to operate (eg: some "
"ATI/AMD graphic cards, some network cards, some RAID cards, ...)"
msgstr ""
-#: any.pm:358
+#: any.pm:380
#, c-format
msgid ""
"\"%s\" contains software that can not be distributed in every country due to "
"software patents."
msgstr ""
-#: any.pm:359
+#: any.pm:381
#, c-format
msgid ""
"It also contains software from \"%s\" rebuild with additional capabilities."
msgstr ""
-#: any.pm:363
+#: any.pm:387
#, c-format
msgid "Here you can enable more media if you want."
msgstr ""
-#: any.pm:378
+#: any.pm:404
#, c-format
msgid "This medium provides package updates for medium \"%s\""
msgstr ""
-#: any.pm:451
+#: any.pm:480
#, c-format
msgid "Looking at packages already installed..."
msgstr "Търси във вече инсталираните пакети..."
-#: any.pm:485
+#: any.pm:514
#, c-format
msgid "Finding packages to upgrade..."
msgstr "Търся пакети за обновяване"
-#: any.pm:498
+#: any.pm:527
#, c-format
msgid "Removing packages prior to upgrade..."
msgstr ""
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:713
+#: any.pm:743
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -276,72 +276,72 @@ msgstr ""
"\n"
"Действително ли искате да изтриете тези пакети?\n"
-#: any.pm:932
+#: any.pm:962
#, c-format
msgid "Error reading file %s"
msgstr "Грешка при четенето на файла %s"
-#: any.pm:1140
+#: any.pm:1170
#, fuzzy, c-format
msgid "The following disk(s) were renamed:"
msgstr "Следните пакети ще трябва да се инсталират:\n"
-#: any.pm:1142
+#: any.pm:1172
#, c-format
msgid "%s (previously named as %s)"
msgstr ""
-#: any.pm:1199
+#: any.pm:1229
#, c-format
msgid "HTTP"
msgstr "HTTP"
-#: any.pm:1199
+#: any.pm:1229
#, c-format
msgid "FTP"
msgstr "FTP"
-#: any.pm:1199
+#: any.pm:1229
#, c-format
msgid "NFS"
msgstr "NFS"
-#: any.pm:1218 steps_interactive.pm:970
+#: any.pm:1248 steps_interactive.pm:973
#, c-format
msgid "Network"
msgstr "Мрежа"
-#: any.pm:1222
+#: any.pm:1252
#, fuzzy, c-format
msgid "Please choose a media"
msgstr "Моля изберете"
-#: any.pm:1238
+#: any.pm:1268
#, fuzzy, c-format
msgid "File already exists. Overwrite it?"
msgstr "Файлът съществува. Да бъде ли презаписан?"
-#: any.pm:1242
+#: any.pm:1272
#, c-format
msgid "Permission denied"
msgstr "Лисват права"
-#: any.pm:1290
+#: any.pm:1320
#, c-format
msgid "Bad NFS name"
msgstr ""
-#: any.pm:1311
+#: any.pm:1341
#, fuzzy, c-format
msgid "Bad media %s"
msgstr "добавен източник %s"
-#: any.pm:1355
+#: any.pm:1385
#, c-format
msgid "Cannot make screenshots before partitioning"
msgstr "Не мога да направя моментна \"снимка\" преди разделянето на диска "
-#: any.pm:1363
+#: any.pm:1393
#, c-format
msgid "Screenshots will be available after install in %s"
msgstr "Снимки ще бъдат налични след инсталиране в %s"
@@ -351,7 +351,7 @@ msgstr "Снимки ще бъдат налични след инсталира
msgid "Installation"
msgstr "Инсталирам"
-#: gtk.pm:132 share/meta-task/compssUsers.pl:43
+#: gtk.pm:132 share/meta-task/compssUsers.pl:46
#, c-format
msgid "Configuration"
msgstr "Настройка"
@@ -448,42 +448,42 @@ msgid ""
"%s"
msgstr ""
-#: pkgs.pm:382 pkgs.pm:409
+#: pkgs.pm:383 pkgs.pm:410
#, fuzzy, c-format
msgid "An error occurred:"
msgstr "Появи се грешка"
-#: pkgs.pm:401
+#: pkgs.pm:402
#, c-format
msgid "A fatal error occurred: %s."
msgstr "Получи се непоправима грешка: %s"
-#: pkgs.pm:891 pkgs.pm:928
+#: pkgs.pm:896 pkgs.pm:938
#, c-format
msgid "Do not ask again"
msgstr "Без въпроси отново"
-#: pkgs.pm:907
+#: pkgs.pm:912
#, c-format
msgid "%d installation transactions failed"
msgstr "%d инсталационни транзакции пропаднаха"
-#: pkgs.pm:908
+#: pkgs.pm:913
#, fuzzy, c-format
msgid "Installation of packages failed:"
msgstr "Инсталиране на пакета %s"
-#: share/meta-task/compssUsers.pl:13
+#: share/meta-task/compssUsers.pl:14
#, c-format
msgid "Workstation"
msgstr "Работна станция"
-#: share/meta-task/compssUsers.pl:15
+#: share/meta-task/compssUsers.pl:16
#, c-format
msgid "Office Workstation"
msgstr "Офисна работна станция"
-#: share/meta-task/compssUsers.pl:17
+#: share/meta-task/compssUsers.pl:18
#, c-format
msgid ""
"Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets "
@@ -492,32 +492,32 @@ msgstr ""
"Офис програми: word-процесори (LibreOffice Writer, Kword), таблици "
"(LibreOffice Calc, Kspread), преглед на PDF, и т.н."
-#: share/meta-task/compssUsers.pl:22
+#: share/meta-task/compssUsers.pl:24
#, c-format
msgid "Game station"
msgstr "Игрална станция"
-#: share/meta-task/compssUsers.pl:23
+#: share/meta-task/compssUsers.pl:25
#, c-format
msgid "Amusement programs: arcade, boards, strategy, etc"
msgstr "Забавни програми: аркадни игри, игри на маса, стратегии и т.н."
-#: share/meta-task/compssUsers.pl:26
+#: share/meta-task/compssUsers.pl:28
#, c-format
msgid "Multimedia station"
msgstr "Мутимедийна станция"
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:29
#, c-format
msgid "Sound and video playing/editing programs"
msgstr "Програми за пускане/поправяне на звук и видео"
-#: share/meta-task/compssUsers.pl:32
+#: share/meta-task/compssUsers.pl:34
#, c-format
msgid "Internet station"
msgstr "Интернет станция"
-#: share/meta-task/compssUsers.pl:33
+#: share/meta-task/compssUsers.pl:35
#, fuzzy, c-format
msgid ""
"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -526,193 +526,193 @@ msgstr ""
"Набор от инструменти за четене и изпращане на поща и новини (pine, mutt, "
"tin..) и за обикаляне из Мрежата"
-#: share/meta-task/compssUsers.pl:38
+#: share/meta-task/compssUsers.pl:40
#, c-format
msgid "Network Computer (client)"
msgstr "Мрежов компютър (клиент)"
-#: share/meta-task/compssUsers.pl:39
+#: share/meta-task/compssUsers.pl:41
#, c-format
msgid "Clients for different protocols including ssh"
msgstr "Клиенти за различни протоколи включително SSH"
-#: share/meta-task/compssUsers.pl:44
+#: share/meta-task/compssUsers.pl:47
#, c-format
msgid "Tools to ease the configuration of your computer"
msgstr "Инструменти за улесняване настройката на компютъра ви"
-#: share/meta-task/compssUsers.pl:48
+#: share/meta-task/compssUsers.pl:51
#, c-format
msgid "Console Tools"
msgstr "Конзолни инструменти"
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:52
#, c-format
msgid "Editors, shells, file tools, terminals"
msgstr "Редактори, шелове, файлови инстрименти, терминали"
-#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156
-#: share/meta-task/compssUsers.pl:158
+#: share/meta-task/compssUsers.pl:56 share/meta-task/compssUsers.pl:200
+#: share/meta-task/compssUsers.pl:202
#, c-format
msgid "Development"
msgstr "Разработка"
-#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:203
#, c-format
msgid "C and C++ development libraries, programs and include files"
msgstr "Библиотеки за разработка на C и C++, програми и include файлове"
-#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163
+#: share/meta-task/compssUsers.pl:61 share/meta-task/compssUsers.pl:207
#, c-format
msgid "Documentation"
msgstr "Документация"
-#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
+#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:208
#, c-format
msgid "Books and Howto's on Linux and Free Software"
msgstr "Книги и HOTWO-та за Linux и свободния софтуер"
-#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167
+#: share/meta-task/compssUsers.pl:66 share/meta-task/compssUsers.pl:211
#, c-format
msgid "LSB"
msgstr ""
-#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:67 share/meta-task/compssUsers.pl:212
#, c-format
msgid "Linux Standard Base. Third party applications support"
msgstr ""
-#: share/meta-task/compssUsers.pl:72
+#: share/meta-task/compssUsers.pl:77
#, c-format
msgid "Web Server"
msgstr "Web Сървър"
-#: share/meta-task/compssUsers.pl:73
+#: share/meta-task/compssUsers.pl:78
#, c-format
msgid "Apache"
msgstr "Apache"
-#: share/meta-task/compssUsers.pl:76
+#: share/meta-task/compssUsers.pl:82
#, c-format
msgid "Groupware"
msgstr "Групуер"
-#: share/meta-task/compssUsers.pl:77
+#: share/meta-task/compssUsers.pl:83
#, c-format
msgid "Kolab Server"
msgstr "Kolab Сървър"
-#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121
+#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl:136
#, c-format
msgid "Firewall/Router"
msgstr "Сървър, Firewall/Рутер"
-#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
+#: share/meta-task/compssUsers.pl:87 share/meta-task/compssUsers.pl:137
#, c-format
msgid "Internet gateway"
msgstr "Интернет gateway"
-#: share/meta-task/compssUsers.pl:84
+#: share/meta-task/compssUsers.pl:90
#, fuzzy, c-format
msgid "Mail/News"
msgstr "/Файл/_Нов"
-#: share/meta-task/compssUsers.pl:85
+#: share/meta-task/compssUsers.pl:91
#, fuzzy, c-format
msgid "Postfix mail server, Inn news server"
msgstr "Postfix пощенски сървър"
-#: share/meta-task/compssUsers.pl:88
+#: share/meta-task/compssUsers.pl:95
#, c-format
msgid "Directory Server"
msgstr "Сървър с директории"
-#: share/meta-task/compssUsers.pl:92
+#: share/meta-task/compssUsers.pl:100
#, c-format
msgid "FTP Server"
msgstr "FTP сървър"
-#: share/meta-task/compssUsers.pl:93
+#: share/meta-task/compssUsers.pl:101
#, c-format
msgid "ProFTPd"
msgstr ""
-#: share/meta-task/compssUsers.pl:96
+#: share/meta-task/compssUsers.pl:105
#, c-format
msgid "DNS/NIS"
msgstr "DNS/NIS"
-#: share/meta-task/compssUsers.pl:97
+#: share/meta-task/compssUsers.pl:106
#, c-format
msgid "Domain Name and Network Information Server"
msgstr "Име на домейн и Мрежов Информационен Сървър"
-#: share/meta-task/compssUsers.pl:100
+#: share/meta-task/compssUsers.pl:110
#, fuzzy, c-format
msgid "File and Printer Sharing Server"
msgstr "Сървър на принтера"
-#: share/meta-task/compssUsers.pl:101
+#: share/meta-task/compssUsers.pl:111
#, fuzzy, c-format
msgid "NFS Server, Samba server"
msgstr "Samba Сървър"
-#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117
+#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl:131
#, c-format
msgid "Database"
msgstr "Сървър, Бази-данни"
-#: share/meta-task/compssUsers.pl:105
+#: share/meta-task/compssUsers.pl:116
#, fuzzy, c-format
msgid "PostgreSQL and MariaDB Database Server"
msgstr "PostgreSQL или MariaDB сървър за бази-данни"
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:121
#, c-format
msgid "Web/FTP"
msgstr "Сървър, Web/FTP"
-#: share/meta-task/compssUsers.pl:110
+#: share/meta-task/compssUsers.pl:122
#, c-format
msgid "Apache, Pro-ftpd"
msgstr "Apache и Pro-ftpd"
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:126
#, c-format
msgid "Mail"
msgstr "Е-поща"
-#: share/meta-task/compssUsers.pl:114
+#: share/meta-task/compssUsers.pl:127
#, c-format
msgid "Postfix mail server"
msgstr "Postfix пощенски сървър"
-#: share/meta-task/compssUsers.pl:118
+#: share/meta-task/compssUsers.pl:132
#, c-format
msgid "PostgreSQL or MariaDB database server"
msgstr "PostgreSQL или MariaDB сървър за бази-данни"
-#: share/meta-task/compssUsers.pl:125
+#: share/meta-task/compssUsers.pl:140
#, c-format
msgid "Network Computer server"
msgstr "Мрежов компютър, сървър"
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:141
#, c-format
msgid "NFS server, SMB server, Proxy server, ssh server"
msgstr "NFS сървър, SMB сървър, Proxy сървър, SSH сървър"
-#: share/meta-task/compssUsers.pl:132
+#: share/meta-task/compssUsers.pl:148
#, c-format
msgid "Graphical Environment"
msgstr "Графична среда"
-#: share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:150
#, c-format
msgid "KDE Workstation"
msgstr "KDE работна станция"
-#: share/meta-task/compssUsers.pl:135
+#: share/meta-task/compssUsers.pl:151
#, c-format
msgid ""
"The K Desktop Environment, the basic graphical environment with a collection "
@@ -721,12 +721,12 @@ msgstr ""
"The K Desktop Environment, проста среда с колекция от придружаващи "
"инструменти"
-#: share/meta-task/compssUsers.pl:139
+#: share/meta-task/compssUsers.pl:156
#, c-format
msgid "GNOME Workstation"
msgstr "Gnome работна станция"
-#: share/meta-task/compssUsers.pl:140
+#: share/meta-task/compssUsers.pl:157 share/meta-task/compssUsers.pl:168
#, c-format
msgid ""
"A graphical environment with user-friendly set of applications and desktop "
@@ -734,12 +734,40 @@ msgid ""
msgstr ""
"Графична среда с потребителски набор от приложения и desktop инструменти"
-#: share/meta-task/compssUsers.pl:144
+#: share/meta-task/compssUsers.pl:162
+#, fuzzy, c-format
+msgid "XFCE Workstation"
+msgstr "KDE работна станция"
+
+#: share/meta-task/compssUsers.pl:163
+#, fuzzy, c-format
+msgid ""
+"A lighter graphical environment with user-friendly set of applications and "
+"desktop tools"
+msgstr ""
+"Графична среда с потребителски набор от приложения и desktop инструменти"
+
+#: share/meta-task/compssUsers.pl:167
+#, fuzzy, c-format
+msgid "MATE Workstation"
+msgstr "Gnome работна станция"
+
+#: share/meta-task/compssUsers.pl:172
+#, fuzzy, c-format
+msgid "Cinnamon Workstation"
+msgstr "Работна станция"
+
+#: share/meta-task/compssUsers.pl:173
+#, fuzzy, c-format
+msgid "A graphical environment based on GNOME"
+msgstr "Графична среда"
+
+#: share/meta-task/compssUsers.pl:177
#, fuzzy, c-format
msgid "LXDE Desktop"
msgstr "настолен компютър"
-#: share/meta-task/compssUsers.pl:146
+#: share/meta-task/compssUsers.pl:179
#, fuzzy, c-format
msgid ""
"A lightweight & fast graphical environment with user-friendly set of "
@@ -747,52 +775,73 @@ msgid ""
msgstr ""
"Графична среда с потребителски набор от приложения и desktop инструменти"
-#: share/meta-task/compssUsers.pl:149
+#: share/meta-task/compssUsers.pl:183
+#, fuzzy, c-format
+msgid "RazorQT Desktop"
+msgstr "настолен компютър"
+
+#: share/meta-task/compssUsers.pl:185
+#, c-format
+msgid "A less developed lightweight fast graphical environment"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:188
+#, c-format
+msgid "Enlightenment e17 Desktop"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:190
+#, fuzzy, c-format
+msgid "A lightweight fast graphical environment with a dedicated following"
+msgstr ""
+"Графична среда с потребителски набор от приложения и desktop инструменти"
+
+#: share/meta-task/compssUsers.pl:193
#, c-format
msgid "Other Graphical Desktops"
msgstr "Други графични desktop-и"
-#: share/meta-task/compssUsers.pl:150
+#: share/meta-task/compssUsers.pl:194
#, fuzzy, c-format
-msgid "Window Maker, Enlightenment, Fvwm, etc"
+msgid "Window Maker, Fvwm, etc"
msgstr "Icewm, Window Maker, Enlightenment, Fvwm и т.н."
-#: share/meta-task/compssUsers.pl:173
+#: share/meta-task/compssUsers.pl:217
#, c-format
msgid "Utilities"
msgstr "Помощни програми"
-#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176
+#: share/meta-task/compssUsers.pl:219 share/meta-task/compssUsers.pl:220
#, c-format
msgid "SSH Server"
msgstr "SSH Сървър"
-#: share/meta-task/compssUsers.pl:180
+#: share/meta-task/compssUsers.pl:224
#, fuzzy, c-format
msgid "Webmin"
msgstr "Webmin Обслужване"
-#: share/meta-task/compssUsers.pl:181
+#: share/meta-task/compssUsers.pl:225
#, fuzzy, c-format
msgid "Webmin Remote Configuration Server"
msgstr "Конфигурация на Терминален Сървър в Mageia"
-#: share/meta-task/compssUsers.pl:185
+#: share/meta-task/compssUsers.pl:229
#, fuzzy, c-format
msgid "Network Utilities/Monitoring"
msgstr "Мониторинг на мрежата"
-#: share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:230
#, c-format
msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
msgstr ""
-#: share/meta-task/compssUsers.pl:190
+#: share/meta-task/compssUsers.pl:234
#, fuzzy, c-format
msgid "Mageia Wizards"
msgstr "Контролен център на Mageia"
-#: share/meta-task/compssUsers.pl:191
+#: share/meta-task/compssUsers.pl:235
#, fuzzy, c-format
msgid "Wizards to configure server"
msgstr "ННеуспешна настройка на принтер \"%s\"!"
@@ -806,7 +855,7 @@ msgstr ""
"Появи се грешка, но не знам как да се справя с нея деликатно.\n"
"Можете да продължите на свой риск."
-#: steps.pm:461
+#: steps.pm:458
#, c-format
msgid ""
"Some important packages did not get installed properly.\n"
@@ -860,107 +909,107 @@ msgstr "Избор на група пакети"
msgid "Install %s KDE Desktop"
msgstr ""
-#: steps_gtk.pm:244
+#: steps_gtk.pm:252
#, c-format
msgid "Install %s GNOME Desktop"
msgstr ""
-#: steps_gtk.pm:245
+#: steps_gtk.pm:253
#, fuzzy, c-format
msgid "Custom install"
msgstr "Миминална инсталация"
-#: steps_gtk.pm:266
+#: steps_gtk.pm:274
#, fuzzy, c-format
msgid "KDE Desktop"
msgstr "настолен компютър"
-#: steps_gtk.pm:267
+#: steps_gtk.pm:275
#, fuzzy, c-format
msgid "GNOME Desktop"
msgstr "настолен компютър"
-#: steps_gtk.pm:268
+#: steps_gtk.pm:276
#, fuzzy, c-format
msgid "Custom Desktop"
msgstr "настолен компютър"
-#: steps_gtk.pm:274
+#: steps_gtk.pm:282
#, c-format
msgid "Here's a preview of the '%s' desktop."
msgstr ""
-#: steps_gtk.pm:301
+#: steps_gtk.pm:309
#, c-format
msgid "Click on images in order to see a bigger preview"
msgstr ""
-#: steps_gtk.pm:319 steps_interactive.pm:633 steps_list.pm:30
+#: steps_gtk.pm:325 steps_interactive.pm:633 steps_list.pm:30
#, c-format
msgid "Package Group Selection"
msgstr "Избор на група пакети"
-#: steps_gtk.pm:344 steps_interactive.pm:650
+#: steps_gtk.pm:350 steps_interactive.pm:650
#, c-format
msgid "Individual package selection"
msgstr "Избиране на пакети един по един"
-#: steps_gtk.pm:351
+#: steps_gtk.pm:357
#, c-format
msgid "Unselect All"
msgstr ""
-#: steps_gtk.pm:370 steps_interactive.pm:562
+#: steps_gtk.pm:376 steps_interactive.pm:562
#, c-format
msgid "Total size: %d / %d MB"
msgstr "Обща големина: %d / %d MB"
-#: steps_gtk.pm:415
+#: steps_gtk.pm:421
#, c-format
msgid "Version: "
msgstr "Версия: "
-#: steps_gtk.pm:416
+#: steps_gtk.pm:422
#, c-format
msgid "Size: "
msgstr "Размер: "
-#: steps_gtk.pm:416
+#: steps_gtk.pm:422
#, c-format
msgid "%d KB\n"
msgstr "%d КБ\n"
-#: steps_gtk.pm:417
+#: steps_gtk.pm:423
#, c-format
msgid "Importance: "
msgstr "Важност:"
-#: steps_gtk.pm:452
+#: steps_gtk.pm:458
#, c-format
msgid "You cannot select/unselect this package"
msgstr "Не можете да отбележете/деотбележете този пакет"
-#: steps_gtk.pm:456
+#: steps_gtk.pm:462
#, fuzzy, c-format
msgid "due to missing %s"
msgstr "липсва kdesu"
-#: steps_gtk.pm:457
+#: steps_gtk.pm:463
#, c-format
msgid "due to unsatisfied %s"
msgstr "поради неопределен %s"
-#: steps_gtk.pm:458
+#: steps_gtk.pm:464
#, c-format
msgid "trying to promote %s"
msgstr ""
-#: steps_gtk.pm:459
+#: steps_gtk.pm:465
#, c-format
msgid "in order to keep %s"
msgstr ""
-#: steps_gtk.pm:464
+#: steps_gtk.pm:470
#, c-format
msgid ""
"You cannot select this package as there is not enough space left to install "
@@ -969,104 +1018,104 @@ msgstr ""
"Не можете да оставите пакета немаркиран, защото нямате място да го "
"инсталирате"
-#: steps_gtk.pm:467
+#: steps_gtk.pm:473
#, c-format
msgid "The following packages are going to be installed"
msgstr "Следните пакети ще бъдат инсталирани"
-#: steps_gtk.pm:468
+#: steps_gtk.pm:474
#, c-format
msgid "The following packages are going to be removed"
msgstr "Следните пакети ще бъдат премахнати"
-#: steps_gtk.pm:494
+#: steps_gtk.pm:500
#, c-format
msgid "This is a mandatory package, it cannot be unselected"
msgstr "Това е нужен пакет, не може да бъде немаркиран"
-#: steps_gtk.pm:496
+#: steps_gtk.pm:502
#, c-format
msgid "You cannot unselect this package. It is already installed"
msgstr "Не можете да оставите този пакет немаркиран. Той вече е инсталиран"
-#: steps_gtk.pm:498
+#: steps_gtk.pm:504
#, c-format
msgid "You cannot unselect this package. It must be upgraded"
msgstr "Не можете да изключите този пакет. Той трябва да бъде обновен"
-#: steps_gtk.pm:502
+#: steps_gtk.pm:508
#, c-format
msgid "Show automatically selected packages"
msgstr "Покажи автоматично отбелязаните пакети"
-#: steps_gtk.pm:509
+#: steps_gtk.pm:512
#, c-format
msgid "Install"
msgstr "Инсталирай"
-#: steps_gtk.pm:512
+#: steps_gtk.pm:515
#, c-format
msgid "Load/Save selection"
msgstr "Прочитане/Запис на направения избор"
-#: steps_gtk.pm:513
+#: steps_gtk.pm:516
#, c-format
msgid "Updating package selection"
msgstr "Обновяване на избора на пакети"
-#: steps_gtk.pm:518
+#: steps_gtk.pm:521
#, c-format
msgid "Minimal install"
msgstr "Миминална инсталация"
-#: steps_gtk.pm:531
+#: steps_gtk.pm:534
#, c-format
msgid "Software Management"
msgstr "Управление на софтуер"
-#: steps_gtk.pm:531 steps_interactive.pm:443
+#: steps_gtk.pm:534 steps_interactive.pm:443
#, c-format
msgid "Choose the packages you want to install"
msgstr "Изберете пакетите, които искате да инсталирате"
-#: steps_gtk.pm:548 steps_interactive.pm:670 steps_list.pm:32
+#: steps_gtk.pm:551 steps_interactive.pm:670 steps_list.pm:32
#, c-format
msgid "Installing"
msgstr "Инсталирам"
-#: steps_gtk.pm:578
+#: steps_gtk.pm:581
#, c-format
msgid "No details"
msgstr "Без подробности"
-#: steps_gtk.pm:597
+#: steps_gtk.pm:600
#, fuzzy, c-format
msgid "Time remaining:"
msgstr "Оставащо време "
-#: steps_gtk.pm:598
+#: steps_gtk.pm:601
#, fuzzy, c-format
msgid "(estimating...)"
msgstr "Пресмятане"
-#: steps_gtk.pm:628
+#: steps_gtk.pm:631
#, fuzzy, c-format
msgid "%d package"
msgid_plural "%d packages"
msgstr[0] "%d пакета"
msgstr[1] "%d пакета"
-#: steps_gtk.pm:683 steps_interactive.pm:834 steps_list.pm:43
+#: steps_gtk.pm:687 steps_interactive.pm:837 steps_list.pm:43
#, c-format
msgid "Summary"
msgstr "Обобщение"
-#: steps_gtk.pm:702
+#: steps_gtk.pm:706
#, c-format
msgid "Configure"
msgstr "Настройка"
-#: steps_gtk.pm:719 steps_interactive.pm:830 steps_interactive.pm:983
+#: steps_gtk.pm:723 steps_interactive.pm:833 steps_interactive.pm:986
#, c-format
msgid "not configured"
msgstr "не е конфигуриран"
@@ -1078,7 +1127,7 @@ msgid ""
"If you want to skip some of them, you can unselect them now."
msgstr ""
-#: steps_gtk.pm:778 steps_interactive.pm:349
+#: steps_gtk.pm:782 steps_interactive.pm:349
#, c-format
msgid ""
"You have the option to copy the contents of the CDs onto the hard disk drive "
@@ -1087,7 +1136,7 @@ msgid ""
"available once the system is fully installed."
msgstr ""
-#: steps_gtk.pm:780 steps_interactive.pm:351
+#: steps_gtk.pm:784 steps_interactive.pm:351
#, c-format
msgid "Copy whole CDs"
msgstr ""
@@ -1381,28 +1430,28 @@ msgid ""
msgstr ""
#. -PO: example: lilo-graphic on /dev/hda1
-#: steps_interactive.pm:878
+#: steps_interactive.pm:881
#, c-format
msgid "%s on %s"
msgstr "%s на %s"
-#: steps_interactive.pm:910 steps_interactive.pm:917 steps_interactive.pm:930
-#: steps_interactive.pm:947 steps_interactive.pm:962
+#: steps_interactive.pm:913 steps_interactive.pm:920 steps_interactive.pm:933
+#: steps_interactive.pm:950 steps_interactive.pm:965
#, c-format
msgid "Hardware"
msgstr "Хардуер"
-#: steps_interactive.pm:931 steps_interactive.pm:948
+#: steps_interactive.pm:934 steps_interactive.pm:951
#, c-format
msgid "Sound card"
msgstr "Звукова карта"
-#: steps_interactive.pm:951
+#: steps_interactive.pm:954
#, c-format
msgid "Do you have an ISA sound card?"
msgstr "Имате ли ISA звукова карта?"
-#: steps_interactive.pm:953
+#: steps_interactive.pm:956
#, fuzzy, c-format
msgid ""
"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1411,73 +1460,73 @@ msgstr ""
"Изпълнете \"sndconfig\" след инсталация за да конфигурирате вашата звукова "
"карта"
-#: steps_interactive.pm:955
+#: steps_interactive.pm:958
#, c-format
msgid "No sound card detected. Try \"harddrake\" after installation"
msgstr "Няма открита звукова карта. Опитайте \"harddrake\" след инсталацията"
-#: steps_interactive.pm:963
+#: steps_interactive.pm:966
#, c-format
msgid "Graphical interface"
msgstr "Графичен интерфайс"
-#: steps_interactive.pm:969 steps_interactive.pm:981
+#: steps_interactive.pm:972 steps_interactive.pm:984
#, c-format
msgid "Network & Internet"
msgstr "Мрежа и интернет"
-#: steps_interactive.pm:982
+#: steps_interactive.pm:985
#, fuzzy, c-format
msgid "Proxies"
msgstr "Профил "
-#: steps_interactive.pm:983
+#: steps_interactive.pm:986
#, fuzzy, c-format
msgid "configured"
msgstr "пренастройка"
-#: steps_interactive.pm:993
+#: steps_interactive.pm:996
#, c-format
msgid "Security Level"
msgstr "Ниво на защита"
-#: steps_interactive.pm:1013
+#: steps_interactive.pm:1016
#, c-format
msgid "Firewall"
msgstr "Защитна стена"
-#: steps_interactive.pm:1017
+#: steps_interactive.pm:1020
#, c-format
msgid "activated"
msgstr "активирано"
-#: steps_interactive.pm:1017
+#: steps_interactive.pm:1020
#, c-format
msgid "disabled"
msgstr "изключен"
-#: steps_interactive.pm:1031
+#: steps_interactive.pm:1034
#, c-format
msgid "You have not configured X. Are you sure you really want this?"
msgstr "Вие не сте конфигурирали X. Сигурни ли сте, че искате това?"
-#: steps_interactive.pm:1060
+#: steps_interactive.pm:1063
#, c-format
msgid "Preparing bootloader..."
msgstr "Подготовка на bootloader"
#. -PO: This is NOT the boot loader!!!!
-#: steps_interactive.pm:1062
+#: steps_interactive.pm:1065
#, fuzzy, c-format
msgid "Preparing initial startup program..."
msgstr "Подготвям инсталацията"
-#: steps_interactive.pm:1063
+#: steps_interactive.pm:1066
#, c-format
msgid "Be patient, this may take a while..."
msgstr ""
-#: steps_interactive.pm:1074
+#: steps_interactive.pm:1077
#, fuzzy, c-format
msgid ""
"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1490,24 +1539,24 @@ msgstr ""
"Инсталацията ще продължи, но ще трябва\n"
"да иползвате BootX, за да стартирате машината си"
-#: steps_interactive.pm:1087
+#: steps_interactive.pm:1090
#, c-format
msgid ""
"In this security level, access to the files in the Windows partition is "
"restricted to the administrator."
msgstr ""
-#: steps_interactive.pm:1119
+#: steps_interactive.pm:1122
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr "Сложете празна дискета в устройство %s"
-#: steps_interactive.pm:1121
+#: steps_interactive.pm:1124
#, c-format
msgid "Creating auto install floppy..."
msgstr "Подготвям дискета с автоматична инсталация"
-#: steps_interactive.pm:1132
+#: steps_interactive.pm:1135
#, c-format
msgid ""
"Some steps are not completed.\n"
@@ -1518,12 +1567,12 @@ msgstr ""
"\n"
"Наистина ли искате да излезете сега ?"
-#: steps_interactive.pm:1142
+#: steps_interactive.pm:1145
#, c-format
msgid "Congratulations"
msgstr "Поздравления"
-#: steps_interactive.pm:1145
+#: steps_interactive.pm:1148
#, c-format
msgid "Reboot"
msgstr "Престартира"
diff --git a/perl-install/install/share/po/bn.po b/perl-install/install/share/po/bn.po
index 4d6e7bfe5..c5e348c93 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: 2013-05-03 10:51+0200\n"
+"POT-Creation-Date: 2013-11-03 12:08+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"
@@ -76,7 +76,7 @@ msgid "Do you have further supplementary media?"
msgstr "আপনার কি আরও একটি সম্পুরক মাধ্যম আছে?"
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:113
+#: any.pm:114
#, c-format
msgid ""
"The following media have been found and will be used during install: %s.\n"
@@ -89,177 +89,177 @@ msgstr ""
"\n"
"আপনার কি কনফিগার করার জন্য কোনো সম্পুরক ইনস্টলেশন মিডিয়াম আছে?"
-#: any.pm:121
+#: any.pm:122
#, c-format
msgid "CD-ROM"
msgstr "সিডি-রম"
-#: any.pm:122
+#: any.pm:123
#, c-format
msgid "Network (HTTP)"
msgstr "নেটওয়ার্ক (HTTP)"
-#: any.pm:123
+#: any.pm:124
#, c-format
msgid "Network (FTP)"
msgstr "নেটওয়ার্ক (FTP)"
-#: any.pm:124
+#: any.pm:125
#, c-format
msgid "Network (NFS)"
msgstr "নেটওয়ার্ক (NFS)"
-#: any.pm:171
+#: any.pm:173
#, c-format
msgid "URL of the mirror?"
msgstr "mirror এর ইউ-আর-এল?"
-#: any.pm:177
+#: any.pm:179
#, c-format
msgid "URL must start with ftp:// or http://"
msgstr "ইউআরএল অবশ্যই ftp:// অথবা http:// দিয়ে শুরু হবে"
-#: any.pm:188
+#: any.pm:190
#, c-format
msgid "Contacting %s web site to get the list of available mirrors..."
msgstr "উপস্থিত মিররের তালিকার জন্য %s-এ সংযুক্ত করা হচ্ছে..."
-#: any.pm:193
+#: any.pm:195
#, c-format
msgid "Failed contacting %s web site to get the list of available mirrors"
msgstr "উপস্থিত মিররের তালিকার জন্য %s-এ যোগাযোগ করতে ব্যর্থ হয়েছে..."
-#: any.pm:203
+#: any.pm:205
#, c-format
msgid "Choose a mirror from which to get the packages"
msgstr "আপনি একটি মিরর পছন্দ করুন যেখান থেকে প্যাকেজগুলি নেবেন"
-#: any.pm:233
+#: any.pm:235
#, c-format
msgid "NFS setup"
msgstr "NFS সেটআপ"
-#: any.pm:234
+#: any.pm:236
#, c-format
msgid "Please enter the hostname and directory of your NFS media"
msgstr "অনুগ্রহ করে আপনার NFS মিডিয়ার হোস্টনাম এবং ডিরেক্টরী প্রবেশ করান"
-#: any.pm:238
+#: any.pm:240
#, c-format
msgid "Hostname missing"
msgstr "হোস্টনাম পাওয়া যাচ্ছে না"
-#: any.pm:239
+#: any.pm:241
#, c-format
msgid "Directory must begin with \"/\""
msgstr "ডিরেক্টরী অবশ্যই \"/\" দিয়ে শুরু হবে"
-#: any.pm:243
+#: any.pm:245
#, c-format
msgid "Hostname of the NFS mount ?"
msgstr "NFS মাউন্টের জন্য হোস্টনাম ?"
-#: any.pm:244
+#: any.pm:246
#, c-format
msgid "Directory"
msgstr "ডিরেক্টরি"
-#: any.pm:266
+#: any.pm:268
#, c-format
msgid "Supplementary"
msgstr "সম্পুরক"
-#: any.pm:301
+#: any.pm:303
#, c-format
msgid ""
"Can't find a package list file on this mirror. Make sure the location is "
"correct."
msgstr "এই mirror এ কোন hdlist ফাইল পাওয়া যাচ্ছে না"
-#: any.pm:317
+#: any.pm:319
#, c-format
msgid "Core Release"
msgstr ""
-#: any.pm:319
+#: any.pm:321
#, c-format
msgid "Tainted Release"
msgstr ""
-#: any.pm:321
+#: any.pm:323
#, c-format
msgid "Nonfree Release"
msgstr ""
-#: any.pm:335
+#: any.pm:351
#, c-format
msgid ""
"Some hardware on your machine needs some non free firmwares in order for the "
"free software drivers to work."
msgstr ""
-#: any.pm:336
+#: any.pm:352
#, c-format
msgid "You should enable \"%s\""
msgstr ""
-#: any.pm:355
+#: any.pm:377
#, c-format
msgid "\"%s\" contains the various pieces of the systems and its applications"
msgstr ""
-#: any.pm:356
+#: any.pm:378
#, c-format
msgid "\"%s\" contains non free software.\n"
msgstr ""
-#: any.pm:357
+#: any.pm:379
#, c-format
msgid ""
"It also contains firmwares needed for certain devices to operate (eg: some "
"ATI/AMD graphic cards, some network cards, some RAID cards, ...)"
msgstr ""
-#: any.pm:358
+#: any.pm:380
#, c-format
msgid ""
"\"%s\" contains software that can not be distributed in every country due to "
"software patents."
msgstr ""
-#: any.pm:359
+#: any.pm:381
#, c-format
msgid ""
"It also contains software from \"%s\" rebuild with additional capabilities."
msgstr ""
-#: any.pm:363
+#: any.pm:387
#, c-format
msgid "Here you can enable more media if you want."
msgstr ""
-#: any.pm:378
+#: any.pm:404
#, fuzzy, c-format
msgid "This medium provides package updates for medium \"%s\""
msgstr "\"%s\" মাধ্যমের সব প্যাকেজ এড়িয়ে যাও"
-#: any.pm:451
+#: any.pm:480
#, c-format
msgid "Looking at packages already installed..."
msgstr "যে সমস্থ প্যাকেজ ইনস্টল হয়ে আছে সেগুলি পর্যবেক্ষন করা হচ্ছে..."
-#: any.pm:485
+#: any.pm:514
#, c-format
msgid "Finding packages to upgrade..."
msgstr "আপগ্রেড করার জন্য প্যাকেজ খোঁজা হচ্ছে..."
-#: any.pm:498
+#: any.pm:527
#, c-format
msgid "Removing packages prior to upgrade..."
msgstr "আপগ্রেডের পূর্বে প্যাকেজ মুছে ফেলা হচ্ছে..."
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:713
+#: any.pm:743
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -272,72 +272,72 @@ msgstr ""
"\n"
"আপনি কি আসলেই এই প্যাকেজগুলো মুছে ফেলতে চান?\n"
-#: any.pm:932
+#: any.pm:962
#, c-format
msgid "Error reading file %s"
msgstr "%s ফাইল পড়াতে ত্রুটি"
-#: any.pm:1140
+#: any.pm:1170
#, c-format
msgid "The following disk(s) were renamed:"
msgstr "নিম্নলিখিত ডিস্কগুলো নামান্তর করা হয়েছে:"
-#: any.pm:1142
+#: any.pm:1172
#, c-format
msgid "%s (previously named as %s)"
msgstr "%s (পূর্বের নাম %s)"
-#: any.pm:1199
+#: any.pm:1229
#, c-format
msgid "HTTP"
msgstr "এইচ-টি-টি-পি"
-#: any.pm:1199
+#: any.pm:1229
#, c-format
msgid "FTP"
msgstr "এফ-টি-পি"
-#: any.pm:1199
+#: any.pm:1229
#, c-format
msgid "NFS"
msgstr "NFS"
-#: any.pm:1218 steps_interactive.pm:970
+#: any.pm:1248 steps_interactive.pm:973
#, c-format
msgid "Network"
msgstr "নেটওয়ার্ক"
-#: any.pm:1222
+#: any.pm:1252
#, c-format
msgid "Please choose a media"
msgstr "অনুগ্রহ করে একটি মিডিয়া নির্বাচন করুন"
-#: any.pm:1238
+#: any.pm:1268
#, c-format
msgid "File already exists. Overwrite it?"
msgstr "এই ফাইলটি আগে থেকেই আছে। করব?"
-#: any.pm:1242
+#: any.pm:1272
#, c-format
msgid "Permission denied"
msgstr "অনুমতি প্রদান করা হয়নি"
-#: any.pm:1290
+#: any.pm:1320
#, c-format
msgid "Bad NFS name"
msgstr "ত্রুটিপূর্ণ NFS নাম"
-#: any.pm:1311
+#: any.pm:1341
#, c-format
msgid "Bad media %s"
msgstr "অগ্রহণযোগ্য মিডিয়া %s"
-#: any.pm:1355
+#: any.pm:1385
#, c-format
msgid "Cannot make screenshots before partitioning"
msgstr "পার্টিশন করার আগে স্ক্রিনশট তৈরী করা যায়নি"
-#: any.pm:1363
+#: any.pm:1393
#, c-format
msgid "Screenshots will be available after install in %s"
msgstr "%s -এ ইনস্টল করার পরে স্ক্রিনশট পাওয়া যাবে"
@@ -347,7 +347,7 @@ msgstr "%s -এ ইনস্টল করার পরে স্ক্রিন
msgid "Installation"
msgstr " ইনস্টলেশন"
-#: gtk.pm:132 share/meta-task/compssUsers.pl:43
+#: gtk.pm:132 share/meta-task/compssUsers.pl:46
#, c-format
msgid "Configuration"
msgstr "কনফিগারেশন"
@@ -443,42 +443,42 @@ msgid ""
"%s"
msgstr ""
-#: pkgs.pm:382 pkgs.pm:409
+#: pkgs.pm:383 pkgs.pm:410
#, fuzzy, c-format
msgid "An error occurred:"
msgstr "একটি ত্রুটি সম্পাদিত হয়েছে"
-#: pkgs.pm:401
+#: pkgs.pm:402
#, c-format
msgid "A fatal error occurred: %s."
msgstr "একটি মারাত্মক ত্রুটি ঘটেছে: %s"
-#: pkgs.pm:891 pkgs.pm:928
+#: pkgs.pm:896 pkgs.pm:938
#, c-format
msgid "Do not ask again"
msgstr ""
-#: pkgs.pm:907
+#: pkgs.pm:912
#, fuzzy, c-format
msgid "%d installation transactions failed"
msgstr "ইনস্টলেশন বিফল হয়েছে"
-#: pkgs.pm:908
+#: pkgs.pm:913
#, fuzzy, c-format
msgid "Installation of packages failed:"
msgstr "%s প্যাকেজ সমূহ ইনস্টল করা হচ্ছে"
-#: share/meta-task/compssUsers.pl:13
+#: share/meta-task/compssUsers.pl:14
#, c-format
msgid "Workstation"
msgstr "ওয়ার্কষ্টেশন"
-#: share/meta-task/compssUsers.pl:15
+#: share/meta-task/compssUsers.pl:16
#, c-format
msgid "Office Workstation"
msgstr "অফিস ওয়ার্কষ্টেশন"
-#: share/meta-task/compssUsers.pl:17
+#: share/meta-task/compssUsers.pl:18
#, c-format
msgid ""
"Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets "
@@ -487,32 +487,32 @@ msgstr ""
"অফিস প্রোগ্রামসমূহ: ওয়ার্ডপ্রসেসর (LibreOffice Writer, Kword), স্প্রেডসিট "
"(LibreOffice Calc, Kspread), PDF ফাইল প্রদর্শক ইত্যাদী"
-#: share/meta-task/compssUsers.pl:22
+#: share/meta-task/compssUsers.pl:24
#, c-format
msgid "Game station"
msgstr "গেশ ষ্টেশন"
-#: share/meta-task/compssUsers.pl:23
+#: share/meta-task/compssUsers.pl:25
#, c-format
msgid "Amusement programs: arcade, boards, strategy, etc"
msgstr "উদ্দীপনামূলক প্রোগ্রামসমূহ: আর্কেড, বোর্ড, স্ট্রেটেজি, ইত্যাদি"
-#: share/meta-task/compssUsers.pl:26
+#: share/meta-task/compssUsers.pl:28
#, c-format
msgid "Multimedia station"
msgstr "মাল্টিমিডিয়া ষ্টেশন"
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:29
#, c-format
msgid "Sound and video playing/editing programs"
msgstr "সাউন্ড এবং ভিডিও দেখার/এডিট করার প্রোগ্রামসমূহ"
-#: share/meta-task/compssUsers.pl:32
+#: share/meta-task/compssUsers.pl:34
#, c-format
msgid "Internet station"
msgstr "ইন্টারনেট ষ্টেশন"
-#: share/meta-task/compssUsers.pl:33
+#: share/meta-task/compssUsers.pl:35
#, c-format
msgid ""
"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -520,205 +520,205 @@ msgid ""
msgstr ""
"মেইল আদানপ্রদান, খবর পড়া এবং ওয়েব ব্রাউজিং (mutt, tin..) এর জন্য কিছু টুলের সেট"
-#: share/meta-task/compssUsers.pl:38
+#: share/meta-task/compssUsers.pl:40
#, c-format
msgid "Network Computer (client)"
msgstr "নেটওয়ার্ক কম্পিউটার (ক্লাইন্ট)"
-#: share/meta-task/compssUsers.pl:39
+#: share/meta-task/compssUsers.pl:41
#, c-format
msgid "Clients for different protocols including ssh"
msgstr "SSH সহ বিভিন্ন প্রোটকলের জন্য ক্লাইন্টসমূহ"
-#: share/meta-task/compssUsers.pl:44
+#: share/meta-task/compssUsers.pl:47
#, c-format
msgid "Tools to ease the configuration of your computer"
msgstr "আপনার কম্পিউটারের কনফিগারেশন সহজ করার জন্য কিছু টুল"
-#: share/meta-task/compssUsers.pl:48
+#: share/meta-task/compssUsers.pl:51
#, c-format
msgid "Console Tools"
msgstr "কনসল টুল"
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:52
#, c-format
msgid "Editors, shells, file tools, terminals"
msgstr "এডিটর, শেল, ফাইল টুল, টার্মিনাল সমূহ"
-#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156
-#: share/meta-task/compssUsers.pl:158
+#: share/meta-task/compssUsers.pl:56 share/meta-task/compssUsers.pl:200
+#: share/meta-task/compssUsers.pl:202
#, c-format
msgid "Development"
msgstr "ডেভলপমেন্ট"
-#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:203
#, c-format
msgid "C and C++ development libraries, programs and include files"
msgstr "C এবং C++ ডেভলপমেন্টের লাইব্রেরী, প্রগ্রাম এবং include ফাইলসমূহ"
-#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163
+#: share/meta-task/compssUsers.pl:61 share/meta-task/compssUsers.pl:207
#, c-format
msgid "Documentation"
msgstr "ডকুমেন্টেশন"
-#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
+#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:208
#, c-format
msgid "Books and Howto's on Linux and Free Software"
msgstr "লিনাক্স এবং ফ্রী সফটওয়ার সংক্রান্ত বই ও হাউটু (HOWTO)"
-#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167
+#: share/meta-task/compssUsers.pl:66 share/meta-task/compssUsers.pl:211
#, c-format
msgid "LSB"
msgstr "LSB"
-#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:67 share/meta-task/compssUsers.pl:212
#, c-format
msgid "Linux Standard Base. Third party applications support"
msgstr "লিনাক্সের সাধারণ আধার। তৃতীয়পক্ষ এপ্লিকেশন সমূহের সাপোর্ট"
-#: share/meta-task/compssUsers.pl:72
+#: share/meta-task/compssUsers.pl:77
#, c-format
msgid "Web Server"
msgstr "ওয়েব সার্ভার"
-#: share/meta-task/compssUsers.pl:73
+#: share/meta-task/compssUsers.pl:78
#, c-format
msgid "Apache"
msgstr "এ্যপাচি"
-#: share/meta-task/compssUsers.pl:76
+#: share/meta-task/compssUsers.pl:82
#, c-format
msgid "Groupware"
msgstr "গ্রুপওয়্যার"
-#: share/meta-task/compssUsers.pl:77
+#: share/meta-task/compssUsers.pl:83
#, c-format
msgid "Kolab Server"
msgstr "কোলাব সার্ভার"
-#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121
+#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl:136
#, c-format
msgid "Firewall/Router"
msgstr "ফায়ারওয়াল/রাউটার"
-#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
+#: share/meta-task/compssUsers.pl:87 share/meta-task/compssUsers.pl:137
#, c-format
msgid "Internet gateway"
msgstr "ইন্টারনেট গেটওয়ে"
-#: share/meta-task/compssUsers.pl:84
+#: share/meta-task/compssUsers.pl:90
#, c-format
msgid "Mail/News"
msgstr "মেইল/সংবাদ"
-#: share/meta-task/compssUsers.pl:85
+#: share/meta-task/compssUsers.pl:91
#, c-format
msgid "Postfix mail server, Inn news server"
msgstr "Postfix মেইল সার্ভার, Inn সংবাদ সার্ভার"
-#: share/meta-task/compssUsers.pl:88
+#: share/meta-task/compssUsers.pl:95
#, c-format
msgid "Directory Server"
msgstr "ডিরেক্টরি সার্ভার"
-#: share/meta-task/compssUsers.pl:92
+#: share/meta-task/compssUsers.pl:100
#, c-format
msgid "FTP Server"
msgstr "FTP সার্ভার"
-#: share/meta-task/compssUsers.pl:93
+#: share/meta-task/compssUsers.pl:101
#, c-format
msgid "ProFTPd"
msgstr "ProFTPd"
-#: share/meta-task/compssUsers.pl:96
+#: share/meta-task/compssUsers.pl:105
#, c-format
msgid "DNS/NIS"
msgstr "ডিএনএস/এনআইএস"
-#: share/meta-task/compssUsers.pl:97
+#: share/meta-task/compssUsers.pl:106
#, c-format
msgid "Domain Name and Network Information Server"
msgstr "ডোমেইন নেম এবং নেটওয়ার্ক ইনফরমেশন সার্ভার"
-#: share/meta-task/compssUsers.pl:100
+#: share/meta-task/compssUsers.pl:110
#, c-format
msgid "File and Printer Sharing Server"
msgstr "ফাইল এবং প্রিন্টার শেয়ারিং সার্ভার"
-#: share/meta-task/compssUsers.pl:101
+#: share/meta-task/compssUsers.pl:111
#, c-format
msgid "NFS Server, Samba server"
msgstr "NFS সার্ভার, Samba সার্ভার"
-#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117
+#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl:131
#, c-format
msgid "Database"
msgstr "ডেটাবেস"
-#: share/meta-task/compssUsers.pl:105
+#: share/meta-task/compssUsers.pl:116
#, c-format
msgid "PostgreSQL and MariaDB Database Server"
msgstr "PostgreSQL অথবা MariaDB ডেটাবেস সার্ভার"
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:121
#, c-format
msgid "Web/FTP"
msgstr "ওয়েব/FTP"
-#: share/meta-task/compssUsers.pl:110
+#: share/meta-task/compssUsers.pl:122
#, c-format
msgid "Apache, Pro-ftpd"
msgstr "এ্যপাচি, Pro-ftpd"
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:126
#, c-format
msgid "Mail"
msgstr "মেইল"
-#: share/meta-task/compssUsers.pl:114
+#: share/meta-task/compssUsers.pl:127
#, c-format
msgid "Postfix mail server"
msgstr "Postfix মেইল সার্ভার"
-#: share/meta-task/compssUsers.pl:118
+#: share/meta-task/compssUsers.pl:132
#, c-format
msgid "PostgreSQL or MariaDB database server"
msgstr "PostgreSQL অথবা MariaDB ডেটাবেস সার্ভার"
-#: share/meta-task/compssUsers.pl:125
+#: share/meta-task/compssUsers.pl:140
#, c-format
msgid "Network Computer server"
msgstr "নেটওয়ার্ক কম্পিউটার সার্ভার"
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:141
#, c-format
msgid "NFS server, SMB server, Proxy server, ssh server"
msgstr "NFS সার্ভার, SMB সার্ভার, Proxy সার্ভার, ssh সার্ভার"
-#: share/meta-task/compssUsers.pl:132
+#: share/meta-task/compssUsers.pl:148
#, c-format
msgid "Graphical Environment"
msgstr "গ্রাফিকাল পরিবেশ"
-#: share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:150
#, c-format
msgid "KDE Workstation"
msgstr "KDE ওয়ার্কষ্টেশন"
-#: share/meta-task/compssUsers.pl:135
+#: share/meta-task/compssUsers.pl:151
#, c-format
msgid ""
"The K Desktop Environment, the basic graphical environment with a collection "
"of accompanying tools"
msgstr "K ডেক্সটপ, কিছু সহযোগীমূলক টুলের সমন্বয়ে একটি সাধারণ গ্রাফিকাল পরিবেশ"
-#: share/meta-task/compssUsers.pl:139
+#: share/meta-task/compssUsers.pl:156
#, c-format
msgid "GNOME Workstation"
msgstr "গুহনোম ওয়ার্কষ্টেশন"
-#: share/meta-task/compssUsers.pl:140
+#: share/meta-task/compssUsers.pl:157 share/meta-task/compssUsers.pl:168
#, c-format
msgid ""
"A graphical environment with user-friendly set of applications and desktop "
@@ -726,12 +726,40 @@ msgid ""
msgstr ""
"ব্যবহারকারীর বন্ধুসূলভ কিছু এপ্লিকেশন এবং ডোক্সটপ টুলের সমন্বয়ে একটি গ্রাফিকাল পরিবেশ"
-#: share/meta-task/compssUsers.pl:144
+#: share/meta-task/compssUsers.pl:162
+#, fuzzy, c-format
+msgid "XFCE Workstation"
+msgstr "KDE ওয়ার্কষ্টেশন"
+
+#: share/meta-task/compssUsers.pl:163
+#, fuzzy, c-format
+msgid ""
+"A lighter graphical environment with user-friendly set of applications and "
+"desktop tools"
+msgstr ""
+"ব্যবহারকারীর বন্ধুসূলভ কিছু এপ্লিকেশন এবং ডোক্সটপ টুলের সমন্বয়ে একটি গ্রাফিকাল পরিবেশ"
+
+#: share/meta-task/compssUsers.pl:167
+#, fuzzy, c-format
+msgid "MATE Workstation"
+msgstr "গুহনোম ওয়ার্কষ্টেশন"
+
+#: share/meta-task/compssUsers.pl:172
+#, fuzzy, c-format
+msgid "Cinnamon Workstation"
+msgstr "ওয়ার্কষ্টেশন"
+
+#: share/meta-task/compssUsers.pl:173
+#, fuzzy, c-format
+msgid "A graphical environment based on GNOME"
+msgstr "গ্রাফিকাল পরিবেশ"
+
+#: share/meta-task/compssUsers.pl:177
#, fuzzy, c-format
msgid "LXDE Desktop"
msgstr "IceWm ডেস্কটপ"
-#: share/meta-task/compssUsers.pl:146
+#: share/meta-task/compssUsers.pl:179
#, fuzzy, c-format
msgid ""
"A lightweight & fast graphical environment with user-friendly set of "
@@ -739,52 +767,73 @@ msgid ""
msgstr ""
"ব্যবহারকারীর বন্ধুসূলভ কিছু এপ্লিকেশন এবং ডোক্সটপ টুলের সমন্বয়ে একটি গ্রাফিকাল পরিবেশ"
-#: share/meta-task/compssUsers.pl:149
+#: share/meta-task/compssUsers.pl:183
+#, fuzzy, c-format
+msgid "RazorQT Desktop"
+msgstr "IceWm ডেস্কটপ"
+
+#: share/meta-task/compssUsers.pl:185
+#, c-format
+msgid "A less developed lightweight fast graphical environment"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:188
+#, c-format
+msgid "Enlightenment e17 Desktop"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:190
+#, fuzzy, c-format
+msgid "A lightweight fast graphical environment with a dedicated following"
+msgstr ""
+"ব্যবহারকারীর বন্ধুসূলভ কিছু এপ্লিকেশন এবং ডোক্সটপ টুলের সমন্বয়ে একটি গ্রাফিকাল পরিবেশ"
+
+#: share/meta-task/compssUsers.pl:193
#, c-format
msgid "Other Graphical Desktops"
msgstr "অন্যান্য গ্রাফিকাল ডেক্সটপ"
-#: share/meta-task/compssUsers.pl:150
-#, c-format
-msgid "Window Maker, Enlightenment, Fvwm, etc"
+#: share/meta-task/compssUsers.pl:194
+#, fuzzy, c-format
+msgid "Window Maker, Fvwm, etc"
msgstr "Window Maker, Enlightenment, Fvwm, ইত্যাদি"
-#: share/meta-task/compssUsers.pl:173
+#: share/meta-task/compssUsers.pl:217
#, c-format
msgid "Utilities"
msgstr "ইউটিলিটিসমূহ"
-#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176
+#: share/meta-task/compssUsers.pl:219 share/meta-task/compssUsers.pl:220
#, c-format
msgid "SSH Server"
msgstr "SSH সার্ভিস"
-#: share/meta-task/compssUsers.pl:180
+#: share/meta-task/compssUsers.pl:224
#, c-format
msgid "Webmin"
msgstr "ওয়েবমিন"
-#: share/meta-task/compssUsers.pl:181
+#: share/meta-task/compssUsers.pl:225
#, c-format
msgid "Webmin Remote Configuration Server"
msgstr "ওয়েবমিন দূরবর্তী কনফিগারেশন সার্ভার"
-#: share/meta-task/compssUsers.pl:185
+#: share/meta-task/compssUsers.pl:229
#, c-format
msgid "Network Utilities/Monitoring"
msgstr "নেটওয়ার্ক ইউটিলিটিসমূহ/পর্যবেক্ষণ"
-#: share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:230
#, c-format
msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
msgstr "পর্যবেক্ষণ টুলসমূহ, হিসাবরক্ষণ প্রসেস করে, tcpdump, nmap, ..."
-#: share/meta-task/compssUsers.pl:190
+#: share/meta-task/compssUsers.pl:234
#, c-format
msgid "Mageia Wizards"
msgstr "Mageia উইজার্ডসমূহ"
-#: share/meta-task/compssUsers.pl:191
+#: share/meta-task/compssUsers.pl:235
#, c-format
msgid "Wizards to configure server"
msgstr "সার্ভার কনফিগার করার জন্য উইজার্ডসমূহ"
@@ -799,7 +848,7 @@ msgstr ""
"কিভাবে এটা সন্দরভাবে হ্যান্ডল করবো।\n"
"আপনি নিজের ঝুঁকিতে অগ্রসর হতে পারেন।"
-#: steps.pm:461
+#: steps.pm:458
#, c-format
msgid ""
"Some important packages did not get installed properly.\n"
@@ -855,107 +904,107 @@ msgstr "প্যাকেজ গ্রুপ নির্বাচন"
msgid "Install %s KDE Desktop"
msgstr ""
-#: steps_gtk.pm:244
+#: steps_gtk.pm:252
#, c-format
msgid "Install %s GNOME Desktop"
msgstr ""
-#: steps_gtk.pm:245
+#: steps_gtk.pm:253
#, fuzzy, c-format
msgid "Custom install"
msgstr "সর্বনিম্ন ইনস্টল"
-#: steps_gtk.pm:266
+#: steps_gtk.pm:274
#, fuzzy, c-format
msgid "KDE Desktop"
msgstr "IceWm ডেস্কটপ"
-#: steps_gtk.pm:267
+#: steps_gtk.pm:275
#, fuzzy, c-format
msgid "GNOME Desktop"
msgstr "IceWm ডেস্কটপ"
-#: steps_gtk.pm:268
+#: steps_gtk.pm:276
#, fuzzy, c-format
msgid "Custom Desktop"
msgstr "IceWm ডেস্কটপ"
-#: steps_gtk.pm:274
+#: steps_gtk.pm:282
#, c-format
msgid "Here's a preview of the '%s' desktop."
msgstr ""
-#: steps_gtk.pm:301
+#: steps_gtk.pm:309
#, c-format
msgid "Click on images in order to see a bigger preview"
msgstr ""
-#: steps_gtk.pm:319 steps_interactive.pm:633 steps_list.pm:30
+#: steps_gtk.pm:325 steps_interactive.pm:633 steps_list.pm:30
#, c-format
msgid "Package Group Selection"
msgstr "প্যাকেজ গ্রুপ নির্বাচন"
-#: steps_gtk.pm:344 steps_interactive.pm:650
+#: steps_gtk.pm:350 steps_interactive.pm:650
#, c-format
msgid "Individual package selection"
msgstr "আলাদাভাবে প্যাকেজ নির্বাচন"
-#: steps_gtk.pm:351
+#: steps_gtk.pm:357
#, c-format
msgid "Unselect All"
msgstr "সব কিছু অনির্বাচিতকরণ"
-#: steps_gtk.pm:370 steps_interactive.pm:562
+#: steps_gtk.pm:376 steps_interactive.pm:562
#, c-format
msgid "Total size: %d / %d MB"
msgstr "মোট সাইজ: %d / %d এমবি"
-#: steps_gtk.pm:415
+#: steps_gtk.pm:421
#, c-format
msgid "Version: "
msgstr "ভার্সন:"
-#: steps_gtk.pm:416
+#: steps_gtk.pm:422
#, c-format
msgid "Size: "
msgstr "সাইজ:"
-#: steps_gtk.pm:416
+#: steps_gtk.pm:422
#, c-format
msgid "%d KB\n"
msgstr "%d KB\n"
-#: steps_gtk.pm:417
+#: steps_gtk.pm:423
#, c-format
msgid "Importance: "
msgstr "প্রাধান্য:"
-#: steps_gtk.pm:452
+#: steps_gtk.pm:458
#, c-format
msgid "You cannot select/unselect this package"
msgstr "আপনি এই প্যাকেজটি নির্বাচন/অ-নির্বাচন করতে পারবেন না"
-#: steps_gtk.pm:456
+#: steps_gtk.pm:462
#, c-format
msgid "due to missing %s"
msgstr "%s না থাকার কারনে"
-#: steps_gtk.pm:457
+#: steps_gtk.pm:463
#, c-format
msgid "due to unsatisfied %s"
msgstr "%s যথেষ্ট না হবার কারনে"
-#: steps_gtk.pm:458
+#: steps_gtk.pm:464
#, c-format
msgid "trying to promote %s"
msgstr "%s প্রচারের চেষ্টা চলছে"
-#: steps_gtk.pm:459
+#: steps_gtk.pm:465
#, c-format
msgid "in order to keep %s"
msgstr "%s রাখার কারণে"
-#: steps_gtk.pm:464
+#: steps_gtk.pm:470
#, c-format
msgid ""
"You cannot select this package as there is not enough space left to install "
@@ -964,105 +1013,105 @@ msgstr ""
"আপনি এই প্যাকেজটি নির্বাচন করতে পারবেননা যেহেতু এটা ইনস্টল করার জন্য যথেষ্ট জায়গা "
"ফাঁকা নেই"
-#: steps_gtk.pm:467
+#: steps_gtk.pm:473
#, c-format
msgid "The following packages are going to be installed"
msgstr "এই প্যাকেজগুলি ইনস্টল হতে যাচ্ছে"
-#: steps_gtk.pm:468
+#: steps_gtk.pm:474
#, c-format
msgid "The following packages are going to be removed"
msgstr "এই প্যাকেজগুলি অপসরিত হতে যাচ্ছে"
-#: steps_gtk.pm:494
+#: steps_gtk.pm:500
#, c-format
msgid "This is a mandatory package, it cannot be unselected"
msgstr "এটি একটি বাধ্যতামূলাক প্যাকেজ, এটি কোনভাবেই বাদ দেয়া যাবেনা"
-#: steps_gtk.pm:496
+#: steps_gtk.pm:502
#, c-format
msgid "You cannot unselect this package. It is already installed"
msgstr ""
"আপনি এই প্যাকেজটির অ-নির্বাচন করতে পারবেন না, এটা আগে থেকেই ইনস্টল হয়ে আছে"
-#: steps_gtk.pm:498
+#: steps_gtk.pm:504
#, c-format
msgid "You cannot unselect this package. It must be upgraded"
msgstr "আপনি এই প্যাকেজটি অ-নির্বাচন করতে পারবেন না। এটা অবশ্যই আপগ্রেড হতে হবে"
-#: steps_gtk.pm:502
+#: steps_gtk.pm:508
#, c-format
msgid "Show automatically selected packages"
msgstr "সংয়-নির্বাচিত প্যাকেজগুলি দেখাও"
-#: steps_gtk.pm:509
+#: steps_gtk.pm:512
#, c-format
msgid "Install"
msgstr "ইনস্টল"
-#: steps_gtk.pm:512
+#: steps_gtk.pm:515
#, c-format
msgid "Load/Save selection"
msgstr "নির্বাচনসমূহ লোড/সংরক্ষণ করো"
-#: steps_gtk.pm:513
+#: steps_gtk.pm:516
#, c-format
msgid "Updating package selection"
msgstr "প্যাকেজের নির্বাচন আপগ্রেড করা হচ্ছে"
-#: steps_gtk.pm:518
+#: steps_gtk.pm:521
#, c-format
msgid "Minimal install"
msgstr "সর্বনিম্ন ইনস্টল"
-#: steps_gtk.pm:531
+#: steps_gtk.pm:534
#, c-format
msgid "Software Management"
msgstr "সফটওয়্যার ম্যানেজমেন্ট"
-#: steps_gtk.pm:531 steps_interactive.pm:443
+#: steps_gtk.pm:534 steps_interactive.pm:443
#, c-format
msgid "Choose the packages you want to install"
msgstr "আপনি যেই প্যাকেজগুলি ইনস্টল করতে চান তা পছন্দ করুন"
-#: steps_gtk.pm:548 steps_interactive.pm:670 steps_list.pm:32
+#: steps_gtk.pm:551 steps_interactive.pm:670 steps_list.pm:32
#, c-format
msgid "Installing"
msgstr "ইনস্টলেশন"
-#: steps_gtk.pm:578
+#: steps_gtk.pm:581
#, c-format
msgid "No details"
msgstr "কোন বিস্তারিত ছাড়া"
-#: steps_gtk.pm:597
+#: steps_gtk.pm:600
#, fuzzy, c-format
msgid "Time remaining:"
msgstr "সময় বাকী আছে"
-#: steps_gtk.pm:598
+#: steps_gtk.pm:601
#, fuzzy, c-format
msgid "(estimating...)"
msgstr "নির্ধারণ চলছে"
-#: steps_gtk.pm:628
+#: steps_gtk.pm:631
#, fuzzy, c-format
msgid "%d package"
msgid_plural "%d packages"
msgstr[0] "%d প্যাকেজ সমূহ"
msgstr[1] "%d প্যাকেজ সমূহ"
-#: steps_gtk.pm:683 steps_interactive.pm:834 steps_list.pm:43
+#: steps_gtk.pm:687 steps_interactive.pm:837 steps_list.pm:43
#, c-format
msgid "Summary"
msgstr "সারাংশ"
-#: steps_gtk.pm:702
+#: steps_gtk.pm:706
#, c-format
msgid "Configure"
msgstr "কনফিগার"
-#: steps_gtk.pm:719 steps_interactive.pm:830 steps_interactive.pm:983
+#: steps_gtk.pm:723 steps_interactive.pm:833 steps_interactive.pm:986
#, c-format
msgid "not configured"
msgstr "কনফিগার করা হয়নি"
@@ -1076,7 +1125,7 @@ msgstr ""
"নিম্নলিখিত ইনস্টলেশন মিডিয়া পাওয়া গেছে।\n"
"যদি আপনি এগুলোর মধ্যকার কিছু এড়িয়ে যেতে চান, তাহলে এখন সেগুলোকে অনির্বাচিত করুন।"
-#: steps_gtk.pm:778 steps_interactive.pm:349
+#: steps_gtk.pm:782 steps_interactive.pm:349
#, c-format
msgid ""
"You have the option to copy the contents of the CDs onto the hard disk drive "
@@ -1088,7 +1137,7 @@ msgstr ""
" এরপর হার্ডডিস্ক থেকে ইনস্টলেশন চলতে থাকবে এবং সিস্টেম সম্পূর্ন ইনস্টলেশনের পরও "
"প্যাকেজগুলো রয়ে যাবে।"
-#: steps_gtk.pm:780 steps_interactive.pm:351
+#: steps_gtk.pm:784 steps_interactive.pm:351
#, c-format
msgid "Copy whole CDs"
msgstr "CD গুলো সম্পুর্ন কপি করো "
@@ -1388,28 +1437,28 @@ msgstr ""
"আপনি কি ইনস্টল আপডেট করতে চান?"
#. -PO: example: lilo-graphic on /dev/hda1
-#: steps_interactive.pm:878
+#: steps_interactive.pm:881
#, c-format
msgid "%s on %s"
msgstr "%s -এ %s"
-#: steps_interactive.pm:910 steps_interactive.pm:917 steps_interactive.pm:930
-#: steps_interactive.pm:947 steps_interactive.pm:962
+#: steps_interactive.pm:913 steps_interactive.pm:920 steps_interactive.pm:933
+#: steps_interactive.pm:950 steps_interactive.pm:965
#, c-format
msgid "Hardware"
msgstr "হার্ডওয়্যার"
-#: steps_interactive.pm:931 steps_interactive.pm:948
+#: steps_interactive.pm:934 steps_interactive.pm:951
#, c-format
msgid "Sound card"
msgstr "সাউন্ডকার্ড"
-#: steps_interactive.pm:951
+#: steps_interactive.pm:954
#, c-format
msgid "Do you have an ISA sound card?"
msgstr "আপনার কি একটি ISA সাউন্ড কার্ড আছে?"
-#: steps_interactive.pm:953
+#: steps_interactive.pm:956
#, c-format
msgid ""
"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1418,73 +1467,73 @@ msgstr ""
"ইনস্টল শেষ হবার পরে সাউন্ড কার্ড কনফিগার করার জন্য \"alsaconf\" অথবা \"sndconfig"
"\" চালাও"
-#: steps_interactive.pm:955
+#: steps_interactive.pm:958
#, c-format
msgid "No sound card detected. Try \"harddrake\" after installation"
msgstr "কোন সাউন্ডকার্ড সনাক্ত হয়নি, ইনস্টলের পরে \"harddrake\" দিয়ে চেষ্টা করুন"
-#: steps_interactive.pm:963
+#: steps_interactive.pm:966
#, c-format
msgid "Graphical interface"
msgstr "গ্রাফিকাল ইন্টারফেস"
-#: steps_interactive.pm:969 steps_interactive.pm:981
+#: steps_interactive.pm:972 steps_interactive.pm:984
#, c-format
msgid "Network & Internet"
msgstr "নেটওয়ার্ট এবং ইন্টারনেট"
-#: steps_interactive.pm:982
+#: steps_interactive.pm:985
#, c-format
msgid "Proxies"
msgstr "প্রক্সিসমূহ"
-#: steps_interactive.pm:983
+#: steps_interactive.pm:986
#, c-format
msgid "configured"
msgstr "কনফিগার করা হয়েছে"
-#: steps_interactive.pm:993
+#: steps_interactive.pm:996
#, c-format
msgid "Security Level"
msgstr "সিকউরিটি লেভেল"
-#: steps_interactive.pm:1013
+#: steps_interactive.pm:1016
#, c-format
msgid "Firewall"
msgstr "ফায়ারওয়াল"
-#: steps_interactive.pm:1017
+#: steps_interactive.pm:1020
#, c-format
msgid "activated"
msgstr "সক্রিয় হয়েছে"
-#: steps_interactive.pm:1017
+#: steps_interactive.pm:1020
#, c-format
msgid "disabled"
msgstr "অকার্যকর করা হয়েছে"
-#: steps_interactive.pm:1031
+#: steps_interactive.pm:1034
#, c-format
msgid "You have not configured X. Are you sure you really want this?"
msgstr "আপনি X কনফিগার করেননি। আপনি কি নিশ্চিত এরকমটি চান?"
-#: steps_interactive.pm:1060
+#: steps_interactive.pm:1063
#, c-format
msgid "Preparing bootloader..."
msgstr "Bootloader প্রস্তুত করা হচ্ছে..."
#. -PO: This is NOT the boot loader!!!!
-#: steps_interactive.pm:1062
+#: steps_interactive.pm:1065
#, fuzzy, c-format
msgid "Preparing initial startup program..."
msgstr "ইনস্টলেশনের প্রস্তুতি চলছে"
-#: steps_interactive.pm:1063
+#: steps_interactive.pm:1066
#, c-format
msgid "Be patient, this may take a while..."
msgstr ""
-#: steps_interactive.pm:1074
+#: steps_interactive.pm:1077
#, c-format
msgid ""
"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1497,7 +1546,7 @@ msgstr ""
"BootX বা অন্য কোন কিছু ব্যবহার করতে হবে। root fs এর জন্য কার্নেল প্রেরিত মান হবে: "
"root=%s"
-#: steps_interactive.pm:1087
+#: steps_interactive.pm:1090
#, c-format
msgid ""
"In this security level, access to the files in the Windows partition is "
@@ -1505,17 +1554,17 @@ msgid ""
msgstr ""
"এই নিরাপত্তা লেভেলে, উইন্ডোজ পার্টিশনের ফাইলে প্রবেশ শুধুমাত্র অ্যাডমিনিস্ট্রেটরের আছে।"
-#: steps_interactive.pm:1119
+#: steps_interactive.pm:1122
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr "%s ড্রাইভে একটি ফাঁকা ফ্লপি ঢোকান"
-#: steps_interactive.pm:1121
+#: steps_interactive.pm:1124
#, c-format
msgid "Creating auto install floppy..."
msgstr "সয়ং ইনস্টল ফ্লপি তৈরী করা হচ্ছে..."
-#: steps_interactive.pm:1132
+#: steps_interactive.pm:1135
#, c-format
msgid ""
"Some steps are not completed.\n"
@@ -1526,12 +1575,12 @@ msgstr ""
"\n"
"আপনি কি এখন বের হতে চান?"
-#: steps_interactive.pm:1142
+#: steps_interactive.pm:1145
#, c-format
msgid "Congratulations"
msgstr "স্বাগতম"
-#: steps_interactive.pm:1145
+#: steps_interactive.pm:1148
#, c-format
msgid "Reboot"
msgstr "রিবুট"
diff --git a/perl-install/install/share/po/br.po b/perl-install/install/share/po/br.po
index 365e2d260..06f7cba7d 100644
--- a/perl-install/install/share/po/br.po
+++ b/perl-install/install/share/po/br.po
@@ -7,11 +7,11 @@ msgid ""
msgstr ""
"Project-Id-Version: DrakX 10.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-03 10:51+0200\n"
-"PO-Revision-Date: 2013-05-03 10:54+0200\n"
+"POT-Creation-Date: 2013-11-03 12:08+0200\n"
+"PO-Revision-Date: 2013-11-29 09:15+0100\n"
"Last-Translator: Thierry Vignaud <thierry.vignaud.com>\n"
"Language-Team: Brezhoneg <ofisk@wanadoo.fr>\n"
-"Language: \n"
+"Language: br\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -40,7 +40,7 @@ msgstr "Ostilhoù burevek"
#: ../../advertising/05_IM_mageia.pl:1
#, c-format
msgid "Home entertainment"
-msgstr ""
+msgstr "Evit ho plijadur"
#: ../../advertising/06_IM_mageia.pl:1
#, c-format
@@ -65,7 +65,7 @@ msgstr "Trugarez !"
#: ../../advertising/10_IM_mageia.pl:1
#, c-format
msgid "Be Free!"
-msgstr ""
+msgstr "Bezit dieub !"
#: any.pm:111
#, c-format
@@ -73,7 +73,7 @@ msgid "Do you have further supplementary media?"
msgstr "Hag ur media all hoc'h eus ?"
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:113
+#: any.pm:114
#, c-format
msgid ""
"The following media have been found and will be used during install: %s.\n"
@@ -82,88 +82,88 @@ msgid ""
"Do you have a supplementary installation medium to configure?"
msgstr ""
-#: any.pm:121
+#: any.pm:122
#, c-format
msgid "CD-ROM"
msgstr "CD-ROM"
-#: any.pm:122
+#: any.pm:123
#, c-format
msgid "Network (HTTP)"
msgstr "Rouedad (HTTP)"
-#: any.pm:123
+#: any.pm:124
#, c-format
msgid "Network (FTP)"
msgstr "Rouedad (FTP)"
-#: any.pm:124
+#: any.pm:125
#, c-format
msgid "Network (NFS)"
msgstr "Rouedad (NFS)"
-#: any.pm:171
+#: any.pm:173
#, c-format
msgid "URL of the mirror?"
msgstr "URL ar melezour ?"
-#: any.pm:177
+#: any.pm:179
#, c-format
msgid "URL must start with ftp:// or http://"
msgstr "Dao en deus an URL kregiñ gant ftp:// pe http://"
-#: any.pm:188
+#: any.pm:190
#, c-format
msgid "Contacting %s web site to get the list of available mirrors..."
msgstr "O taremprediñ lec'hienn %s evit kaout roll ar melezourioù hegerz ..."
-#: any.pm:193
+#: any.pm:195
#, c-format
msgid "Failed contacting %s web site to get the list of available mirrors"
msgstr ""
"Sac'het en ur zaremprediñ lec'hienn %s evit kaout roll ar melezourioù hegerz "
-#: any.pm:203
+#: any.pm:205
#, c-format
msgid "Choose a mirror from which to get the packages"
msgstr "Dibabit ur melezour da dapout ar pakadoù diwarnañ"
-#: any.pm:233
+#: any.pm:235
#, c-format
msgid "NFS setup"
msgstr "Kefluniadur NFS"
-#: any.pm:234
+#: any.pm:236
#, c-format
msgid "Please enter the hostname and directory of your NFS media"
msgstr "Roit anv ostiz ha renkell ho media NFS"
-#: any.pm:238
+#: any.pm:240
#, c-format
msgid "Hostname missing"
msgstr "Mank ar ra anv an ostiz"
-#: any.pm:239
+#: any.pm:241
#, c-format
msgid "Directory must begin with \"/\""
-msgstr ""
+msgstr "Dao en eus anv ur renkell kregiñ gant ur « / »"
-#: any.pm:243
+#: any.pm:245
#, c-format
msgid "Hostname of the NFS mount ?"
msgstr "Anv ostiz ar marc'hañ NFS ?"
-#: any.pm:244
+#: any.pm:246
#, c-format
msgid "Directory"
msgstr "Renkell"
-#: any.pm:266
+#: any.pm:268
#, c-format
msgid "Supplementary"
msgstr "A-gresk"
-#: any.pm:301
+#: any.pm:303
#, c-format
msgid ""
"Can't find a package list file on this mirror. Make sure the location is "
@@ -172,90 +172,90 @@ msgstr ""
"N’em eus ket kavout ur roll pakadoù e-barzh ar melezour-mañ. Kit da wiriañ "
"al lec'hiadur-mañ zo mad."
-#: any.pm:317
+#: any.pm:319
#, c-format
msgid "Core Release"
-msgstr ""
+msgstr "Core Release"
-#: any.pm:319
+#: any.pm:321
#, c-format
msgid "Tainted Release"
-msgstr ""
+msgstr "Tainted Release"
-#: any.pm:321
+#: any.pm:323
#, c-format
msgid "Nonfree Release"
-msgstr ""
+msgstr "Nonfree Release"
-#: any.pm:335
+#: any.pm:351
#, c-format
msgid ""
"Some hardware on your machine needs some non free firmwares in order for the "
"free software drivers to work."
msgstr ""
-#: any.pm:336
+#: any.pm:352
#, c-format
msgid "You should enable \"%s\""
-msgstr ""
+msgstr "Gwelloc'h e vefe deoc'h bevaat « %s »"
-#: any.pm:355
+#: any.pm:377
#, c-format
msgid "\"%s\" contains the various pieces of the systems and its applications"
msgstr ""
-#: any.pm:356
+#: any.pm:378
#, c-format
msgid "\"%s\" contains non free software.\n"
msgstr ""
-#: any.pm:357
+#: any.pm:379
#, c-format
msgid ""
"It also contains firmwares needed for certain devices to operate (eg: some "
"ATI/AMD graphic cards, some network cards, some RAID cards, ...)"
msgstr ""
-#: any.pm:358
+#: any.pm:380
#, c-format
msgid ""
"\"%s\" contains software that can not be distributed in every country due to "
"software patents."
msgstr ""
-#: any.pm:359
+#: any.pm:381
#, c-format
msgid ""
"It also contains software from \"%s\" rebuild with additional capabilities."
msgstr ""
-#: any.pm:363
+#: any.pm:387
#, c-format
msgid "Here you can enable more media if you want."
msgstr ""
-#: any.pm:378
+#: any.pm:404
#, fuzzy, c-format
msgid "This medium provides package updates for medium \"%s\""
msgstr "Tremen e-biou pep pakad eus ar vediom « %s »"
-#: any.pm:451
+#: any.pm:480
#, c-format
msgid "Looking at packages already installed..."
msgstr "O klask ar pakadoù staliet ..."
-#: any.pm:485
+#: any.pm:514
#, c-format
msgid "Finding packages to upgrade..."
msgstr "O klask ar pakadoù da vremanaat ..."
-#: any.pm:498
+#: any.pm:527
#, c-format
msgid "Removing packages prior to upgrade..."
msgstr "O tilemel ar pakadoù a-raok bremanaat ..."
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:713
+#: any.pm:743
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -269,72 +269,72 @@ msgstr ""
"\n"
"Ha fellout a ra deoc'h da vat lemel anezho ?\n"
-#: any.pm:932
+#: any.pm:962
#, c-format
msgid "Error reading file %s"
msgstr "Fazi en ur lenn ar restr %s"
-#: any.pm:1140
+#: any.pm:1170
#, c-format
msgid "The following disk(s) were renamed:"
msgstr "Adenvelet e oa ar bladenn/pladennoù-mañ :"
-#: any.pm:1142
+#: any.pm:1172
#, c-format
msgid "%s (previously named as %s)"
msgstr "%s (a vez graet %s dioutañ diaraok)"
-#: any.pm:1199
+#: any.pm:1229
#, c-format
msgid "HTTP"
msgstr "HTTP"
-#: any.pm:1199
+#: any.pm:1229
#, c-format
msgid "FTP"
msgstr "FTP"
-#: any.pm:1199
+#: any.pm:1229
#, c-format
msgid "NFS"
msgstr "NFS"
-#: any.pm:1218 steps_interactive.pm:970
+#: any.pm:1248 steps_interactive.pm:973
#, c-format
msgid "Network"
msgstr "Rouedad"
-#: any.pm:1222
+#: any.pm:1252
#, c-format
msgid "Please choose a media"
msgstr "Dibabit ur media, mar plij"
-#: any.pm:1238
+#: any.pm:1268
#, c-format
msgid "File already exists. Overwrite it?"
msgstr "Ar restr zo endeo. Rasklañ anezhañ ?"
-#: any.pm:1242
+#: any.pm:1272
#, c-format
msgid "Permission denied"
msgstr "Aotre nac'het"
-#: any.pm:1290
+#: any.pm:1320
#, c-format
msgid "Bad NFS name"
msgstr "N'eo ket un anv NFS mat"
-#: any.pm:1311
+#: any.pm:1341
#, c-format
msgid "Bad media %s"
msgstr "N'eo ket mat ar media %s"
-#: any.pm:1355
+#: any.pm:1385
#, c-format
msgid "Cannot make screenshots before partitioning"
msgstr "N'hellan ket sevel skrammpakeroù a-raok parzhañ"
-#: any.pm:1363
+#: any.pm:1393
#, c-format
msgid "Screenshots will be available after install in %s"
msgstr "Skrammpakeroù a vo bet kavet goude staliañ e %s"
@@ -344,7 +344,7 @@ msgstr "Skrammpakeroù a vo bet kavet goude staliañ e %s"
msgid "Installation"
msgstr "O staliañ"
-#: gtk.pm:132 share/meta-task/compssUsers.pl:43
+#: gtk.pm:132 share/meta-task/compssUsers.pl:46
#, c-format
msgid "Configuration"
msgstr "Kefluniadur"
@@ -419,7 +419,7 @@ msgstr "marteze"
#: pkgs.pm:102
#, c-format
msgid "Getting package information from XML meta-data..."
-msgstr ""
+msgstr "O tegas titouroù ar pakadoù eus an titouroù XML ..."
#: pkgs.pm:111
#, c-format
@@ -440,42 +440,42 @@ msgstr ""
"N’em eus ket gallet staliañ un darn pakad goulennet gant %s :\n"
"%s"
-#: pkgs.pm:382 pkgs.pm:409
+#: pkgs.pm:383 pkgs.pm:410
#, c-format
msgid "An error occurred:"
msgstr "Ur fazi zo bet :"
-#: pkgs.pm:401
+#: pkgs.pm:402
#, c-format
msgid "A fatal error occurred: %s."
msgstr "Degouezhet ez eus ur fazi sac'hus : %s."
-#: pkgs.pm:891 pkgs.pm:928
+#: pkgs.pm:896 pkgs.pm:938
#, c-format
msgid "Do not ask again"
msgstr "Na c'houlenn ket adarre"
-#: pkgs.pm:907
+#: pkgs.pm:912
#, c-format
msgid "%d installation transactions failed"
msgstr "%d gra zo bet sac'het"
-#: pkgs.pm:908
+#: pkgs.pm:913
#, c-format
msgid "Installation of packages failed:"
msgstr "Sac'het eo bet staliañ ar pakadoù :"
-#: share/meta-task/compssUsers.pl:13
+#: share/meta-task/compssUsers.pl:14
#, c-format
msgid "Workstation"
msgstr "Post labour"
-#: share/meta-task/compssUsers.pl:15
+#: share/meta-task/compssUsers.pl:16
#, c-format
msgid "Office Workstation"
msgstr "Post labour burevek"
-#: share/meta-task/compssUsers.pl:17
+#: share/meta-task/compssUsers.pl:18
#, c-format
msgid ""
"Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets "
@@ -484,301 +484,348 @@ msgstr ""
"Programmoù burev : skridtreterezhioù (LibreOffice Writer, Kword), logerioù "
"(LibreOffice Calc, Kspread), gwelerien PDF, ..."
-#: share/meta-task/compssUsers.pl:22
+#: share/meta-task/compssUsers.pl:24
#, c-format
msgid "Game station"
msgstr "Arsav c'hoarioù"
-#: share/meta-task/compssUsers.pl:23
+#: share/meta-task/compssUsers.pl:25
#, c-format
msgid "Amusement programs: arcade, boards, strategy, etc"
msgstr ""
-#: share/meta-task/compssUsers.pl:26
+#: share/meta-task/compssUsers.pl:28
#, c-format
msgid "Multimedia station"
msgstr "Arsav liesvedia"
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:29
#, c-format
msgid "Sound and video playing/editing programs"
msgstr "Programmoù evit seniñ/aozañ tonioù ha videoù"
-#: share/meta-task/compssUsers.pl:32
+#: share/meta-task/compssUsers.pl:34
#, c-format
msgid "Internet station"
msgstr "Arsav internet"
-#: share/meta-task/compssUsers.pl:33
+#: share/meta-task/compssUsers.pl:35
#, c-format
msgid ""
"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
"Web"
msgstr ""
-#: share/meta-task/compssUsers.pl:38
+#: share/meta-task/compssUsers.pl:40
#, c-format
msgid "Network Computer (client)"
msgstr "Urzhiataer rouedad (kliant)"
-#: share/meta-task/compssUsers.pl:39
+#: share/meta-task/compssUsers.pl:41
#, c-format
msgid "Clients for different protocols including ssh"
msgstr "Pratikoù evit meur a gomenad (da skouer ssh)"
-#: share/meta-task/compssUsers.pl:44
+#: share/meta-task/compssUsers.pl:47
#, c-format
msgid "Tools to ease the configuration of your computer"
msgstr "Ostilhoù evit kefluniañ hoc'h urzhiataer dre aes"
-#: share/meta-task/compssUsers.pl:48
+#: share/meta-task/compssUsers.pl:51
#, c-format
msgid "Console Tools"
msgstr "Ostilhoù letrin"
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:52
#, c-format
msgid "Editors, shells, file tools, terminals"
msgstr "Aozerien, shelloù, ostilhoù restr, termenelloù"
-#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156
-#: share/meta-task/compssUsers.pl:158
+#: share/meta-task/compssUsers.pl:56 share/meta-task/compssUsers.pl:200
+#: share/meta-task/compssUsers.pl:202
#, c-format
msgid "Development"
msgstr "Diorren"
-#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:203
#, c-format
msgid "C and C++ development libraries, programs and include files"
msgstr ""
-#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163
+#: share/meta-task/compssUsers.pl:61 share/meta-task/compssUsers.pl:207
#, c-format
msgid "Documentation"
msgstr "Teuliadur"
-#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
+#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:208
#, c-format
msgid "Books and Howto's on Linux and Free Software"
msgstr ""
-#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167
+#: share/meta-task/compssUsers.pl:66 share/meta-task/compssUsers.pl:211
#, c-format
msgid "LSB"
msgstr "LSB"
-#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:67 share/meta-task/compssUsers.pl:212
#, c-format
msgid "Linux Standard Base. Third party applications support"
msgstr ""
-#: share/meta-task/compssUsers.pl:72
+#: share/meta-task/compssUsers.pl:77
#, c-format
msgid "Web Server"
msgstr "Servijer Web"
-#: share/meta-task/compssUsers.pl:73
+#: share/meta-task/compssUsers.pl:78
#, c-format
msgid "Apache"
msgstr "Apache"
-#: share/meta-task/compssUsers.pl:76
+#: share/meta-task/compssUsers.pl:82
#, c-format
msgid "Groupware"
msgstr "Strollant"
-#: share/meta-task/compssUsers.pl:77
+#: share/meta-task/compssUsers.pl:83
#, c-format
msgid "Kolab Server"
msgstr "Servijer Kolab"
-#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121
+#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl:136
#, c-format
msgid "Firewall/Router"
msgstr "Moger tan/Henter"
-#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
+#: share/meta-task/compssUsers.pl:87 share/meta-task/compssUsers.pl:137
#, c-format
msgid "Internet gateway"
msgstr "Dreuzell an Internet"
-#: share/meta-task/compssUsers.pl:84
+#: share/meta-task/compssUsers.pl:90
#, c-format
msgid "Mail/News"
msgstr "Posteloù/keleier"
-#: share/meta-task/compssUsers.pl:85
+#: share/meta-task/compssUsers.pl:91
#, c-format
msgid "Postfix mail server, Inn news server"
msgstr "Servijer posteloù Postfix, servijer keleier Inn"
-#: share/meta-task/compssUsers.pl:88
+#: share/meta-task/compssUsers.pl:95
#, c-format
msgid "Directory Server"
msgstr "Levr-bloaz"
-#: share/meta-task/compssUsers.pl:92
+#: share/meta-task/compssUsers.pl:100
#, c-format
msgid "FTP Server"
msgstr "Servijer FTP"
-#: share/meta-task/compssUsers.pl:93
+#: share/meta-task/compssUsers.pl:101
#, c-format
msgid "ProFTPd"
msgstr "ProFTPd"
-#: share/meta-task/compssUsers.pl:96
+#: share/meta-task/compssUsers.pl:105
#, c-format
msgid "DNS/NIS"
msgstr "DNS/NIS"
-#: share/meta-task/compssUsers.pl:97
+#: share/meta-task/compssUsers.pl:106
#, c-format
msgid "Domain Name and Network Information Server"
msgstr "Servijer DNS ha NIS"
-#: share/meta-task/compssUsers.pl:100
+#: share/meta-task/compssUsers.pl:110
#, c-format
msgid "File and Printer Sharing Server"
msgstr "Servijer rannañ restroù ha moullerez"
-#: share/meta-task/compssUsers.pl:101
+#: share/meta-task/compssUsers.pl:111
#, c-format
msgid "NFS Server, Samba server"
msgstr "Servijer NFS, servijer Samba"
-#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117
+#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl:131
#, c-format
msgid "Database"
msgstr "Stlennvon"
-#: share/meta-task/compssUsers.pl:105
+#: share/meta-task/compssUsers.pl:116
#, c-format
msgid "PostgreSQL and MariaDB Database Server"
msgstr "Servijer stlennvon PostgreSQL ha MariaDB"
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:121
#, c-format
msgid "Web/FTP"
msgstr "Web/FTP"
-#: share/meta-task/compssUsers.pl:110
+#: share/meta-task/compssUsers.pl:122
#, c-format
msgid "Apache, Pro-ftpd"
msgstr "Apache, Pro-ftpd"
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:126
#, c-format
msgid "Mail"
msgstr "Post"
-#: share/meta-task/compssUsers.pl:114
+#: share/meta-task/compssUsers.pl:127
#, c-format
msgid "Postfix mail server"
msgstr "Servijer postel Postfix"
-#: share/meta-task/compssUsers.pl:118
+#: share/meta-task/compssUsers.pl:132
#, c-format
msgid "PostgreSQL or MariaDB database server"
msgstr "Servijer stlennvon PostgreSQL pe MariaDB"
-#: share/meta-task/compssUsers.pl:125
+#: share/meta-task/compssUsers.pl:140
#, c-format
msgid "Network Computer server"
msgstr "Servijer rouedad"
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:141
#, 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:132
+#: share/meta-task/compssUsers.pl:148
#, c-format
msgid "Graphical Environment"
msgstr "Endeo grafikel"
-#: share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:150
#, c-format
msgid "KDE Workstation"
msgstr "Post burevek KDE"
-#: share/meta-task/compssUsers.pl:135
+#: share/meta-task/compssUsers.pl:151
#, c-format
msgid ""
"The K Desktop Environment, the basic graphical environment with a collection "
"of accompanying tools"
msgstr "An Endro Burev K gant hec’h ostilhoù"
-#: share/meta-task/compssUsers.pl:139
+#: share/meta-task/compssUsers.pl:156
#, c-format
msgid "GNOME Workstation"
msgstr "Post burevek GNOME"
-#: share/meta-task/compssUsers.pl:140
+#: share/meta-task/compssUsers.pl:157 share/meta-task/compssUsers.pl:168
#, c-format
msgid ""
"A graphical environment with user-friendly set of applications and desktop "
"tools"
msgstr ""
-#: share/meta-task/compssUsers.pl:144
+#: share/meta-task/compssUsers.pl:162
+#, c-format
+msgid "XFCE Workstation"
+msgstr "Post burevek XFCE"
+
+#: share/meta-task/compssUsers.pl:163
+#, c-format
+msgid ""
+"A lighter graphical environment with user-friendly set of applications and "
+"desktop tools"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:167
+#, c-format
+msgid "MATE Workstation"
+msgstr "Post burevek MATE"
+
+#: share/meta-task/compssUsers.pl:172
+#, c-format
+msgid "Cinnamon Workstation"
+msgstr "Post labour Cinnamon"
+
+#: share/meta-task/compssUsers.pl:173
+#, fuzzy, c-format
+msgid "A graphical environment based on GNOME"
+msgstr "Endeo grafikel"
+
+#: share/meta-task/compssUsers.pl:177
#, c-format
msgid "LXDE Desktop"
msgstr "Burev LXDE"
-#: share/meta-task/compssUsers.pl:146
+#: share/meta-task/compssUsers.pl:179
#, c-format
msgid ""
"A lightweight & fast graphical environment with user-friendly set of "
"applications and desktop tools"
msgstr ""
-#: share/meta-task/compssUsers.pl:149
+#: share/meta-task/compssUsers.pl:183
+#, c-format
+msgid "RazorQT Desktop"
+msgstr "Burev RazorQT"
+
+#: share/meta-task/compssUsers.pl:185
+#, c-format
+msgid "A less developed lightweight fast graphical environment"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:188
+#, c-format
+msgid "Enlightenment e17 Desktop"
+msgstr "Burev Enlightenment e17"
+
+#: share/meta-task/compssUsers.pl:190
+#, c-format
+msgid "A lightweight fast graphical environment with a dedicated following"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:193
#, c-format
msgid "Other Graphical Desktops"
msgstr "Burevioù c'hrafek all"
-#: share/meta-task/compssUsers.pl:150
+#: share/meta-task/compssUsers.pl:194
#, c-format
-msgid "Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Window Maker, Enlightenment, Fvwm, etc"
+msgid "Window Maker, Fvwm, etc"
+msgstr "Window Maker, Fvwm, hag all"
-#: share/meta-task/compssUsers.pl:173
+#: share/meta-task/compssUsers.pl:217
#, c-format
msgid "Utilities"
msgstr "Mavegoù"
-#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176
+#: share/meta-task/compssUsers.pl:219 share/meta-task/compssUsers.pl:220
#, c-format
msgid "SSH Server"
msgstr "Servijer SSH"
-#: share/meta-task/compssUsers.pl:180
+#: share/meta-task/compssUsers.pl:224
#, c-format
msgid "Webmin"
msgstr "Webmin"
-#: share/meta-task/compssUsers.pl:181
+#: share/meta-task/compssUsers.pl:225
#, c-format
msgid "Webmin Remote Configuration Server"
msgstr "Servijer Webmin ar gefluniadur a-bell"
-#: share/meta-task/compssUsers.pl:185
+#: share/meta-task/compssUsers.pl:229
#, c-format
msgid "Network Utilities/Monitoring"
msgstr "Ostilhoù ar rouedad/diwall"
-#: share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:230
#, c-format
msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
msgstr ""
-#: share/meta-task/compssUsers.pl:190
+#: share/meta-task/compssUsers.pl:234
#, c-format
msgid "Mageia Wizards"
msgstr "Skoazellerien Mageia"
-#: share/meta-task/compssUsers.pl:191
+#: share/meta-task/compssUsers.pl:235
#, c-format
msgid "Wizards to configure server"
msgstr "Skoazellerien evit kefluniañ ar servijer"
@@ -792,7 +839,7 @@ msgstr ""
"Degouezhet ez eus ur fazi, hogen n'ouzon ket e verañ naet.\n"
"Kendalc'hit war ho mar."
-#: steps.pm:461
+#: steps.pm:458
#, c-format
msgid ""
"Some important packages did not get installed properly.\n"
@@ -839,107 +886,107 @@ msgstr "Diuzadenn ar media"
msgid "Install %s KDE Desktop"
msgstr "Staliañ burev KDE %s"
-#: steps_gtk.pm:244
+#: steps_gtk.pm:252
#, c-format
msgid "Install %s GNOME Desktop"
msgstr "Staliañ burev GNOME %s"
-#: steps_gtk.pm:245
+#: steps_gtk.pm:253
#, c-format
msgid "Custom install"
msgstr "Staliadur diouzhoc'h"
-#: steps_gtk.pm:266
+#: steps_gtk.pm:274
#, c-format
msgid "KDE Desktop"
msgstr "Burev KDE"
-#: steps_gtk.pm:267
+#: steps_gtk.pm:275
#, c-format
msgid "GNOME Desktop"
msgstr "Burev GNOME"
-#: steps_gtk.pm:268
+#: steps_gtk.pm:276
#, c-format
msgid "Custom Desktop"
msgstr "Burev diouzhoc'h"
-#: steps_gtk.pm:274
+#: steps_gtk.pm:282
#, c-format
msgid "Here's a preview of the '%s' desktop."
msgstr "Setu ur rakwel eus burev « %s »."
-#: steps_gtk.pm:301
+#: steps_gtk.pm:309
#, c-format
msgid "Click on images in order to see a bigger preview"
msgstr ""
-#: steps_gtk.pm:319 steps_interactive.pm:633 steps_list.pm:30
+#: steps_gtk.pm:325 steps_interactive.pm:633 steps_list.pm:30
#, c-format
msgid "Package Group Selection"
msgstr "Diuzadenn strollad pakadoù"
-#: steps_gtk.pm:344 steps_interactive.pm:650
+#: steps_gtk.pm:350 steps_interactive.pm:650
#, c-format
msgid "Individual package selection"
msgstr "Diuz pakadoù unan hag unan"
-#: steps_gtk.pm:351
+#: steps_gtk.pm:357
#, c-format
msgid "Unselect All"
msgstr "Andiuz an holl re"
-#: steps_gtk.pm:370 steps_interactive.pm:562
+#: steps_gtk.pm:376 steps_interactive.pm:562
#, c-format
msgid "Total size: %d / %d MB"
msgstr "Ment hollek : %d / %d Mo"
-#: steps_gtk.pm:415
+#: steps_gtk.pm:421
#, c-format
msgid "Version: "
msgstr "Stumm : "
-#: steps_gtk.pm:416
+#: steps_gtk.pm:422
#, c-format
msgid "Size: "
msgstr "Ment : "
-#: steps_gtk.pm:416
+#: steps_gtk.pm:422
#, c-format
msgid "%d KB\n"
msgstr "%d Ko\n"
-#: steps_gtk.pm:417
+#: steps_gtk.pm:423
#, c-format
msgid "Importance: "
msgstr "Talvoudegezh : "
-#: steps_gtk.pm:452
+#: steps_gtk.pm:458
#, c-format
msgid "You cannot select/unselect this package"
msgstr "N'hellit ket diuz/andiuz ar pakad-mañ"
-#: steps_gtk.pm:456
+#: steps_gtk.pm:462
#, c-format
msgid "due to missing %s"
msgstr "peogwir e vank %s"
-#: steps_gtk.pm:457
+#: steps_gtk.pm:463
#, c-format
msgid "due to unsatisfied %s"
msgstr "peogwir e vank %s"
-#: steps_gtk.pm:458
+#: steps_gtk.pm:464
#, c-format
msgid "trying to promote %s"
msgstr ""
-#: steps_gtk.pm:459
+#: steps_gtk.pm:465
#, c-format
msgid "in order to keep %s"
msgstr "evit mirout %s"
-#: steps_gtk.pm:464
+#: steps_gtk.pm:470
#, c-format
msgid ""
"You cannot select this package as there is not enough space left to install "
@@ -948,103 +995,103 @@ msgstr ""
"N'hellit ket dibab ar pakad-mañ peogwir n'eus ket a-walc'h a egor evit "
"staliañ anezhañ"
-#: steps_gtk.pm:467
+#: steps_gtk.pm:473
#, c-format
msgid "The following packages are going to be installed"
msgstr "Ar pakadoù a-heul zo war-nes bezañ staliet"
-#: steps_gtk.pm:468
+#: steps_gtk.pm:474
#, c-format
msgid "The following packages are going to be removed"
msgstr "Ar pakadoù a-heul zo war-nes bezañ lamet"
-#: steps_gtk.pm:494
+#: steps_gtk.pm:500
#, c-format
msgid "This is a mandatory package, it cannot be unselected"
msgstr "Hemañ zo ur pakad ret, n'hell ket bezañ andiuzet"
-#: steps_gtk.pm:496
+#: steps_gtk.pm:502
#, c-format
msgid "You cannot unselect this package. It is already installed"
msgstr "N'hellit ket andiuz ar pakad-mañ. Staliet eo endeo"
-#: steps_gtk.pm:498
+#: steps_gtk.pm:504
#, c-format
msgid "You cannot unselect this package. It must be upgraded"
msgstr "N'hellit ket andiuz ar pakad-mañ. Ret eo dezhañ bezañ bremanaet"
-#: steps_gtk.pm:502
+#: steps_gtk.pm:508
#, c-format
msgid "Show automatically selected packages"
msgstr "Diskouez ar pakadoù a zo dibabet emgefreek"
-#: steps_gtk.pm:509
+#: steps_gtk.pm:512
#, c-format
msgid "Install"
msgstr "Staliañ"
-#: steps_gtk.pm:512
+#: steps_gtk.pm:515
#, c-format
msgid "Load/Save selection"
msgstr "Kargañ/Enrollañ an dibab"
-#: steps_gtk.pm:513
+#: steps_gtk.pm:516
#, c-format
msgid "Updating package selection"
msgstr "O bremanaat diuzadenn ar pakadoù"
-#: steps_gtk.pm:518
+#: steps_gtk.pm:521
#, c-format
msgid "Minimal install"
msgstr "Staliadur bihan"
-#: steps_gtk.pm:531
+#: steps_gtk.pm:534
#, c-format
msgid "Software Management"
msgstr "Merañ ar pakadoù"
-#: steps_gtk.pm:531 steps_interactive.pm:443
+#: steps_gtk.pm:534 steps_interactive.pm:443
#, c-format
msgid "Choose the packages you want to install"
msgstr "Dibabit ar pakadoù a vennit staliañ"
-#: steps_gtk.pm:548 steps_interactive.pm:670 steps_list.pm:32
+#: steps_gtk.pm:551 steps_interactive.pm:670 steps_list.pm:32
#, c-format
msgid "Installing"
msgstr "O staliañ"
-#: steps_gtk.pm:578
+#: steps_gtk.pm:581
#, c-format
msgid "No details"
msgstr "Munud ebet"
-#: steps_gtk.pm:597
+#: steps_gtk.pm:600
#, c-format
msgid "Time remaining:"
msgstr "Amzer a chom :"
-#: steps_gtk.pm:598
+#: steps_gtk.pm:601
#, c-format
msgid "(estimating...)"
msgstr "(o vrasjediñ ...)"
-#: steps_gtk.pm:628
+#: steps_gtk.pm:631
#, c-format
msgid "%d package"
msgid_plural "%d packages"
msgstr[0] "%d pakad"
-#: steps_gtk.pm:683 steps_interactive.pm:834 steps_list.pm:43
+#: steps_gtk.pm:687 steps_interactive.pm:837 steps_list.pm:43
#, c-format
msgid "Summary"
msgstr "Diverradenn"
-#: steps_gtk.pm:702
+#: steps_gtk.pm:706
#, c-format
msgid "Configure"
msgstr "Kefluniañ"
-#: steps_gtk.pm:719 steps_interactive.pm:830 steps_interactive.pm:983
+#: steps_gtk.pm:723 steps_interactive.pm:833 steps_interactive.pm:986
#, c-format
msgid "not configured"
msgstr "n'eo ket kefluniet"
@@ -1056,7 +1103,7 @@ msgid ""
"If you want to skip some of them, you can unselect them now."
msgstr ""
-#: steps_gtk.pm:778 steps_interactive.pm:349
+#: steps_gtk.pm:782 steps_interactive.pm:349
#, c-format
msgid ""
"You have the option to copy the contents of the CDs onto the hard disk drive "
@@ -1065,7 +1112,7 @@ msgid ""
"available once the system is fully installed."
msgstr ""
-#: steps_gtk.pm:780 steps_interactive.pm:351
+#: steps_gtk.pm:784 steps_interactive.pm:351
#, c-format
msgid "Copy whole CDs"
msgstr "Eilañ tout ar CDoù"
@@ -1359,28 +1406,28 @@ msgstr ""
"Mennout a rit staliañ anezho ?"
#. -PO: example: lilo-graphic on /dev/hda1
-#: steps_interactive.pm:878
+#: steps_interactive.pm:881
#, c-format
msgid "%s on %s"
msgstr "%s war %s"
-#: steps_interactive.pm:910 steps_interactive.pm:917 steps_interactive.pm:930
-#: steps_interactive.pm:947 steps_interactive.pm:962
+#: steps_interactive.pm:913 steps_interactive.pm:920 steps_interactive.pm:933
+#: steps_interactive.pm:950 steps_interactive.pm:965
#, c-format
msgid "Hardware"
msgstr "Periantel"
-#: steps_interactive.pm:931 steps_interactive.pm:948
+#: steps_interactive.pm:934 steps_interactive.pm:951
#, c-format
msgid "Sound card"
msgstr "Kartenn gwelet"
-#: steps_interactive.pm:951
+#: steps_interactive.pm:954
#, c-format
msgid "Do you have an ISA sound card?"
msgstr "Hag ur gartenn gwelet ISA hoc'h eus ?"
-#: steps_interactive.pm:953
+#: steps_interactive.pm:956
#, c-format
msgid ""
"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1389,74 +1436,74 @@ msgstr ""
"Seveniñ « alsaconf » pe « sndconfig » goude staliañ evit kefluniañ ho "
"kartenn klevet"
-#: steps_interactive.pm:955
+#: steps_interactive.pm:958
#, 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:963
+#: steps_interactive.pm:966
#, c-format
msgid "Graphical interface"
msgstr "Ketal kevregañ"
-#: steps_interactive.pm:969 steps_interactive.pm:981
+#: steps_interactive.pm:972 steps_interactive.pm:984
#, c-format
msgid "Network & Internet"
msgstr "Rouedad hag Internet"
-#: steps_interactive.pm:982
+#: steps_interactive.pm:985
#, c-format
msgid "Proxies"
msgstr "Proksioù"
-#: steps_interactive.pm:983
+#: steps_interactive.pm:986
#, c-format
msgid "configured"
msgstr "kefluniet"
-#: steps_interactive.pm:993
+#: steps_interactive.pm:996
#, c-format
msgid "Security Level"
msgstr "Live an surentez"
-#: steps_interactive.pm:1013
+#: steps_interactive.pm:1016
#, c-format
msgid "Firewall"
msgstr "Moger tan"
-#: steps_interactive.pm:1017
+#: steps_interactive.pm:1020
#, c-format
msgid "activated"
msgstr "bevaatet"
-#: steps_interactive.pm:1017
+#: steps_interactive.pm:1020
#, c-format
msgid "disabled"
msgstr "diweredekaet"
-#: steps_interactive.pm:1031
+#: steps_interactive.pm:1034
#, 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:1060
+#: steps_interactive.pm:1063
#, c-format
msgid "Preparing bootloader..."
msgstr "O prientiñ ar c'harger loc'hañ ..."
#. -PO: This is NOT the boot loader!!!!
-#: steps_interactive.pm:1062
+#: steps_interactive.pm:1065
#, c-format
msgid "Preparing initial startup program..."
msgstr "O prientiñ ar programm loc'hañ ..."
-#: steps_interactive.pm:1063
+#: steps_interactive.pm:1066
#, c-format
msgid "Be patient, this may take a while..."
msgstr "Gortozit mar plij ; gellout a rafe bezañ hir ..."
-#: steps_interactive.pm:1074
+#: steps_interactive.pm:1077
#, c-format
msgid ""
"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1465,24 +1512,24 @@ msgid ""
"root fs is: root=%s"
msgstr ""
-#: steps_interactive.pm:1087
+#: steps_interactive.pm:1090
#, c-format
msgid ""
"In this security level, access to the files in the Windows partition is "
"restricted to the administrator."
msgstr ""
-#: steps_interactive.pm:1119
+#: steps_interactive.pm:1122
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr "Lakait ur bladennig gwerc'h el lenner %s"
-#: steps_interactive.pm:1121
+#: steps_interactive.pm:1124
#, c-format
msgid "Creating auto install floppy..."
msgstr "O krouiñ ur bladennig staliañ emgefreek ..."
-#: steps_interactive.pm:1132
+#: steps_interactive.pm:1135
#, c-format
msgid ""
"Some steps are not completed.\n"
@@ -1493,12 +1540,12 @@ msgstr ""
"\n"
"Mennout a rit kuitaat da vat bremañ ?"
-#: steps_interactive.pm:1142
+#: steps_interactive.pm:1145
#, c-format
msgid "Congratulations"
msgstr "Brav"
-#: steps_interactive.pm:1145
+#: steps_interactive.pm:1148
#, c-format
msgid "Reboot"
msgstr "Adlañsañ"
diff --git a/perl-install/install/share/po/bs.po b/perl-install/install/share/po/bs.po
index 89e822a85..07003955a 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: 2013-05-03 10:51+0200\n"
+"POT-Creation-Date: 2013-11-03 12:08+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"
@@ -78,7 +78,7 @@ msgid "Do you have further supplementary media?"
msgstr "Imate li neke dodatne medije?"
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:113
+#: any.pm:114
#, c-format
msgid ""
"The following media have been found and will be used during install: %s.\n"
@@ -91,87 +91,87 @@ msgstr ""
"\n"
"Imate li još neke dodatne medije koje želite podesiti?"
-#: any.pm:121
+#: any.pm:122
#, c-format
msgid "CD-ROM"
msgstr "sa CDROMa"
-#: any.pm:122
+#: any.pm:123
#, c-format
msgid "Network (HTTP)"
msgstr "Mreža (HTTP)"
-#: any.pm:123
+#: any.pm:124
#, c-format
msgid "Network (FTP)"
msgstr "Mreža (FTP)"
-#: any.pm:124
+#: any.pm:125
#, c-format
msgid "Network (NFS)"
msgstr "Mreža (NFS)"
-#: any.pm:171
+#: any.pm:173
#, c-format
msgid "URL of the mirror?"
msgstr "URL mirrora?"
-#: any.pm:177
+#: any.pm:179
#, c-format
msgid "URL must start with ftp:// or http://"
msgstr "URL mora počinjati sa ftp:// ili http://"
-#: any.pm:188
+#: any.pm:190
#, c-format
msgid "Contacting %s web site to get the list of available mirrors..."
msgstr "Kontaktiram %s web stranicu da bih saznao listu dostupnih mirrora..."
-#: any.pm:193
+#: any.pm:195
#, c-format
msgid "Failed contacting %s web site to get the list of available mirrors"
msgstr "Nisam uspio kontaktirati %s web stranicu radi liste dostupnih mirrora"
-#: any.pm:203
+#: any.pm:205
#, c-format
msgid "Choose a mirror from which to get the packages"
msgstr "Izaberite mirror sa kojeg će biti dobavljeni paketi"
-#: any.pm:233
+#: any.pm:235
#, c-format
msgid "NFS setup"
msgstr "Podešavanje NFS-a"
-#: any.pm:234
+#: any.pm:236
#, 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:238
+#: any.pm:240
#, c-format
msgid "Hostname missing"
msgstr ""
-#: any.pm:239
+#: any.pm:241
#, c-format
msgid "Directory must begin with \"/\""
msgstr ""
-#: any.pm:243
+#: any.pm:245
#, c-format
msgid "Hostname of the NFS mount ?"
msgstr "Ime računara sa NFS serverom?"
-#: any.pm:244
+#: any.pm:246
#, c-format
msgid "Directory"
msgstr "Direktorij"
-#: any.pm:266
+#: any.pm:268
#, c-format
msgid "Supplementary"
msgstr ""
-#: any.pm:301
+#: any.pm:303
#, c-format
msgid ""
"Can't find a package list file on this mirror. Make sure the location is "
@@ -180,90 +180,90 @@ msgstr ""
"Ne mogu pronaći hdlist datoteku na ovom mirroru. Provjerite da li je "
"lokacija ispravna."
-#: any.pm:317
+#: any.pm:319
#, c-format
msgid "Core Release"
msgstr ""
-#: any.pm:319
+#: any.pm:321
#, c-format
msgid "Tainted Release"
msgstr ""
-#: any.pm:321
+#: any.pm:323
#, c-format
msgid "Nonfree Release"
msgstr ""
-#: any.pm:335
+#: any.pm:351
#, c-format
msgid ""
"Some hardware on your machine needs some non free firmwares in order for the "
"free software drivers to work."
msgstr ""
-#: any.pm:336
+#: any.pm:352
#, c-format
msgid "You should enable \"%s\""
msgstr ""
-#: any.pm:355
+#: any.pm:377
#, c-format
msgid "\"%s\" contains the various pieces of the systems and its applications"
msgstr ""
-#: any.pm:356
+#: any.pm:378
#, c-format
msgid "\"%s\" contains non free software.\n"
msgstr ""
-#: any.pm:357
+#: any.pm:379
#, c-format
msgid ""
"It also contains firmwares needed for certain devices to operate (eg: some "
"ATI/AMD graphic cards, some network cards, some RAID cards, ...)"
msgstr ""
-#: any.pm:358
+#: any.pm:380
#, c-format
msgid ""
"\"%s\" contains software that can not be distributed in every country due to "
"software patents."
msgstr ""
-#: any.pm:359
+#: any.pm:381
#, c-format
msgid ""
"It also contains software from \"%s\" rebuild with additional capabilities."
msgstr ""
-#: any.pm:363
+#: any.pm:387
#, c-format
msgid "Here you can enable more media if you want."
msgstr ""
-#: any.pm:378
+#: any.pm:404
#, c-format
msgid "This medium provides package updates for medium \"%s\""
msgstr ""
-#: any.pm:451
+#: any.pm:480
#, c-format
msgid "Looking at packages already installed..."
msgstr "Tražim već instalirane pakete..."
-#: any.pm:485
+#: any.pm:514
#, c-format
msgid "Finding packages to upgrade..."
msgstr "Pronalazim pakete za unaprjeđenje..."
-#: any.pm:498
+#: any.pm:527
#, c-format
msgid "Removing packages prior to upgrade..."
msgstr "Uklanjam pakete prije unaprjeđenja..."
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:713
+#: any.pm:743
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -277,72 +277,72 @@ msgstr ""
"\n"
"Želite li zaista deinstalirati ove pakete?\n"
-#: any.pm:932
+#: any.pm:962
#, c-format
msgid "Error reading file %s"
msgstr "Greška u čitanju datoteke %s"
-#: any.pm:1140
+#: any.pm:1170
#, c-format
msgid "The following disk(s) were renamed:"
msgstr "Sljedeći diskovi su preimenovani:"
-#: any.pm:1142
+#: any.pm:1172
#, c-format
msgid "%s (previously named as %s)"
msgstr "%s (ranije pod imenom %s)"
-#: any.pm:1199
+#: any.pm:1229
#, c-format
msgid "HTTP"
msgstr "HTTP"
-#: any.pm:1199
+#: any.pm:1229
#, c-format
msgid "FTP"
msgstr "FTP"
-#: any.pm:1199
+#: any.pm:1229
#, c-format
msgid "NFS"
msgstr "NFS"
-#: any.pm:1218 steps_interactive.pm:970
+#: any.pm:1248 steps_interactive.pm:973
#, c-format
msgid "Network"
msgstr "Mreža"
-#: any.pm:1222
+#: any.pm:1252
#, c-format
msgid "Please choose a media"
msgstr "Molim izaberite medij"
-#: any.pm:1238
+#: any.pm:1268
#, c-format
msgid "File already exists. Overwrite it?"
msgstr "Datoteka već postoji. Želite li pisati preko nje?"
-#: any.pm:1242
+#: any.pm:1272
#, c-format
msgid "Permission denied"
msgstr "Nemate dozvolu"
-#: any.pm:1290
+#: any.pm:1320
#, c-format
msgid "Bad NFS name"
msgstr "Neispravan NFS naziv"
-#: any.pm:1311
+#: any.pm:1341
#, c-format
msgid "Bad media %s"
msgstr "Neispravan medij %s"
-#: any.pm:1355
+#: any.pm:1385
#, c-format
msgid "Cannot make screenshots before partitioning"
msgstr "Ne mogu napraviti snimak ekrana prije particioniranja"
-#: any.pm:1363
+#: any.pm:1393
#, c-format
msgid "Screenshots will be available after install in %s"
msgstr "Snimanje ekrana će biti dostupno nakon što instalirate u %s"
@@ -352,7 +352,7 @@ msgstr "Snimanje ekrana će biti dostupno nakon što instalirate u %s"
msgid "Installation"
msgstr "Instalacija"
-#: gtk.pm:132 share/meta-task/compssUsers.pl:43
+#: gtk.pm:132 share/meta-task/compssUsers.pl:46
#, c-format
msgid "Configuration"
msgstr "Podešavanje"
@@ -449,42 +449,42 @@ msgid ""
"%s"
msgstr ""
-#: pkgs.pm:382 pkgs.pm:409
+#: pkgs.pm:383 pkgs.pm:410
#, fuzzy, c-format
msgid "An error occurred:"
msgstr "Došlo je do greške"
-#: pkgs.pm:401
+#: pkgs.pm:402
#, c-format
msgid "A fatal error occurred: %s."
msgstr "Došlo je do fatalne greške: %s"
-#: pkgs.pm:891 pkgs.pm:928
+#: pkgs.pm:896 pkgs.pm:938
#, c-format
msgid "Do not ask again"
msgstr ""
-#: pkgs.pm:907
+#: pkgs.pm:912
#, fuzzy, c-format
msgid "%d installation transactions failed"
msgstr "Instalacija nije uspjela"
-#: pkgs.pm:908
+#: pkgs.pm:913
#, fuzzy, c-format
msgid "Installation of packages failed:"
msgstr "Instaliram paket %s"
-#: share/meta-task/compssUsers.pl:13
+#: share/meta-task/compssUsers.pl:14
#, c-format
msgid "Workstation"
msgstr "Radna stanica"
-#: share/meta-task/compssUsers.pl:15
+#: share/meta-task/compssUsers.pl:16
#, c-format
msgid "Office Workstation"
msgstr "Uredska radna stanica"
-#: share/meta-task/compssUsers.pl:17
+#: share/meta-task/compssUsers.pl:18
#, c-format
msgid ""
"Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets "
@@ -493,32 +493,32 @@ msgstr ""
"Uredski programi: obrada teksta (LibreOffice Write, KWord), tablični "
"proračun (LibreOffice Calc, KSpread), PDF preglednici itd."
-#: share/meta-task/compssUsers.pl:22
+#: share/meta-task/compssUsers.pl:24
#, c-format
msgid "Game station"
msgstr "Stanica za igru"
-#: share/meta-task/compssUsers.pl:23
+#: share/meta-task/compssUsers.pl:25
#, c-format
msgid "Amusement programs: arcade, boards, strategy, etc"
msgstr "Zabavni programi: arkadne igre, stolne igre, strategije itd."
-#: share/meta-task/compssUsers.pl:26
+#: share/meta-task/compssUsers.pl:28
#, c-format
msgid "Multimedia station"
msgstr "Multimedijalna stanica"
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:29
#, c-format
msgid "Sound and video playing/editing programs"
msgstr "Programi za pregled i editovanje zvuka i videa"
-#: share/meta-task/compssUsers.pl:32
+#: share/meta-task/compssUsers.pl:34
#, c-format
msgid "Internet station"
msgstr "Internet stanica"
-#: share/meta-task/compssUsers.pl:33
+#: share/meta-task/compssUsers.pl:35
#, c-format
msgid ""
"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -527,193 +527,193 @@ msgstr ""
"Skup alata za čitanje i slanje pošte i news-a (mutt, tin...) i pregledanje "
"Weba"
-#: share/meta-task/compssUsers.pl:38
+#: share/meta-task/compssUsers.pl:40
#, c-format
msgid "Network Computer (client)"
msgstr "Mrežni računar (klijent)"
-#: share/meta-task/compssUsers.pl:39
+#: share/meta-task/compssUsers.pl:41
#, c-format
msgid "Clients for different protocols including ssh"
msgstr "Klijenti za razne protokole uključujući ssh"
-#: share/meta-task/compssUsers.pl:44
+#: share/meta-task/compssUsers.pl:47
#, c-format
msgid "Tools to ease the configuration of your computer"
msgstr "Alati za lakše podešavanje računara"
-#: share/meta-task/compssUsers.pl:48
+#: share/meta-task/compssUsers.pl:51
#, c-format
msgid "Console Tools"
msgstr "Alati za konzolu"
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:52
#, c-format
msgid "Editors, shells, file tools, terminals"
msgstr "Editori, shellovi, alati za datoteke, terminali"
-#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156
-#: share/meta-task/compssUsers.pl:158
+#: share/meta-task/compssUsers.pl:56 share/meta-task/compssUsers.pl:200
+#: share/meta-task/compssUsers.pl:202
#, c-format
msgid "Development"
msgstr "Programiranje"
-#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:159
+#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:203
#, c-format
msgid "C and C++ development libraries, programs and include files"
msgstr "C i C++ biblioteke, programi i include datoteke"
-#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:163
+#: share/meta-task/compssUsers.pl:61 share/meta-task/compssUsers.pl:207
#, c-format
msgid "Documentation"
msgstr "Dokumentacija"
-#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
+#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:208
#, c-format
msgid "Books and Howto's on Linux and Free Software"
msgstr "Knjige i howto-i na temu Linuxa i slobodnog softvera"
-#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:167
+#: share/meta-task/compssUsers.pl:66 share/meta-task/compssUsers.pl:211
#, c-format
msgid "LSB"
msgstr "LSB"
-#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
+#: share/meta-task/compssUsers.pl:67 share/meta-task/compssUsers.pl:212
#, c-format
msgid "Linux Standard Base. Third party applications support"
msgstr "Linux Standard Base. Podrška za programe trećih lica"
-#: share/meta-task/compssUsers.pl:72
+#: share/meta-task/compssUsers.pl:77
#, c-format
msgid "Web Server"
msgstr "Web server"
-#: share/meta-task/compssUsers.pl:73
+#: share/meta-task/compssUsers.pl:78
#, c-format
msgid "Apache"
msgstr "Apache"
-#: share/meta-task/compssUsers.pl:76
+#: share/meta-task/compssUsers.pl:82
#, c-format
msgid "Groupware"
msgstr "Groupware"
-#: share/meta-task/compssUsers.pl:77
+#: share/meta-task/compssUsers.pl:83
#, c-format
msgid "Kolab Server"
msgstr "Kolab server"
-#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121
+#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl:136
#, c-format
msgid "Firewall/Router"
msgstr "Firewall/Router"
-#: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
+#: share/meta-task/compssUsers.pl:87 share/meta-task/compssUsers.pl:137
#, c-format
msgid "Internet gateway"
msgstr "Internet gateway"
-#: share/meta-task/compssUsers.pl:84
+#: share/meta-task/compssUsers.pl:90
#, c-format
msgid "Mail/News"
msgstr "Mail/News"
-#: share/meta-task/compssUsers.pl:85
+#: share/meta-task/compssUsers.pl:91
#, c-format
msgid "Postfix mail server, Inn news server"
msgstr "Postfix mail server, Inn news server"
-#: share/meta-task/compssUsers.pl:88
+#: share/meta-task/compssUsers.pl:95
#, c-format
msgid "Directory Server"
msgstr "Imenički server"
-#: share/meta-task/compssUsers.pl:92
+#: share/meta-task/compssUsers.pl:100
#, c-format
msgid "FTP Server"
msgstr "FTP server"
-#: share/meta-task/compssUsers.pl:93
+#: share/meta-task/compssUsers.pl:101
#, c-format
msgid "ProFTPd"
msgstr "ProFTPd"
-#: share/meta-task/compssUsers.pl:96
+#: share/meta-task/compssUsers.pl:105
#, c-format
msgid "DNS/NIS"
msgstr "DNS/NIS"
-#: share/meta-task/compssUsers.pl:97
+#: share/meta-task/compssUsers.pl:106
#, c-format
msgid "Domain Name and Network Information Server"
msgstr "Serveri domenskih imena i mrežnih informacija"
-#: share/meta-task/compssUsers.pl:100
+#: share/meta-task/compssUsers.pl:110
#, c-format
msgid "File and Printer Sharing Server"
msgstr "Server za dijeljenje datoteka i štampača"
-#: share/meta-task/compssUsers.pl:101
+#: share/meta-task/compssUsers.pl:111
#, c-format
msgid "NFS Server, Samba server"
msgstr "NFS server, Samba server"
-#: share/meta-task/compssUsers.pl:104 share/meta-task/compssUsers.pl:117
+#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl:131
#, c-format
msgid "Database"
msgstr "Baze podataka"
-#: share/meta-task/compssUsers.pl:105
+#: share/meta-task/compssUsers.pl:116
#, c-format
msgid "PostgreSQL and MariaDB Database Server"
msgstr "Server PostgreSQL ili MariaDB baze podataka"
-#: share/meta-task/compssUsers.pl:109
+#: share/meta-task/compssUsers.pl:121
#, c-format
msgid "Web/FTP"
msgstr "Web/FTP"
-#: share/meta-task/compssUsers.pl:110
+#: share/meta-task/compssUsers.pl:122
#, c-format
msgid "Apache, Pro-ftpd"
msgstr "Apache, Pro-ftpd"
-#: share/meta-task/compssUsers.pl:113
+#: share/meta-task/compssUsers.pl:126
#, c-format
msgid "Mail"
msgstr "Mail"
-#: share/meta-task/compssUsers.pl:114
+#: share/meta-task/compssUsers.pl:127
#, c-format
msgid "Postfix mail server"
msgstr "Postfix mail server"
-#: share/meta-task/compssUsers.pl:118
+#: share/meta-task/compssUsers.pl:132
#, c-format
msgid "PostgreSQL or MariaDB database server"
msgstr "PostgreSQL ili MariaDB baza podataka"
-#: share/meta-task/compssUsers.pl:125
+#: share/meta-task/compssUsers.pl:140
#, c-format
msgid "Network Computer server"
msgstr "Mrežni server"
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:141
#, c-format
msgid "NFS server, SMB server, Proxy server, ssh server"
msgstr "NFS server, SMB server, Proxy server, ssh server"
-#: share/meta-task/compssUsers.pl:132
+#: share/meta-task/compssUsers.pl:148
#, c-format
msgid "Graphical Environment"
msgstr "Grafičko okruženje"
-#: share/meta-task/compssUsers.pl:134
+#: share/meta-task/compssUsers.pl:150
#, c-format
msgid "KDE Workstation"
msgstr "KDE radna stanica"
-#: share/meta-task/compssUsers.pl:135
+#: share/meta-task/compssUsers.pl:151
#, c-format
msgid ""
"The K Desktop Environment, the basic graphical environment with a collection "
@@ -721,12 +721,12 @@ msgid ""
msgstr ""
"K Desktop Environment, osnovno grafičko okruženje sa izborom pratećih alata"
-#: share/meta-task/compssUsers.pl:139
+#: share/meta-task/compssUsers.pl:156
#, c-format
msgid "GNOME Workstation"
msgstr "GNOME radna stanica"
-#: share/meta-task/compssUsers.pl:140
+#: share/meta-task/compssUsers.pl:157 share/meta-task/compssUsers.pl:168
#, c-format
msgid ""
"A graphical environment with user-friendly set of applications and desktop "
@@ -735,12 +735,41 @@ msgstr ""
"Grafička okolina sa skupom korisnički orjentisanih programa i alata za radnu "
"površinu"
-#: share/meta-task/compssUsers.pl:144
+#: share/meta-task/compssUsers.pl:162
+#, fuzzy, c-format
+msgid "XFCE Workstation"
+msgstr "KDE radna stanica"
+
+#: share/meta-task/compssUsers.pl:163
+#, fuzzy, c-format
+msgid ""
+"A lighter graphical environment with user-friendly set of applications and "
+"desktop tools"
+msgstr ""
+"Grafička okolina sa skupom korisnički orjentisanih programa i alata za radnu "
+"površinu"
+
+#: share/meta-task/compssUsers.pl:167
+#, fuzzy, c-format
+msgid "MATE Workstation"
+msgstr "GNOME radna stanica"
+
+#: share/meta-task/compssUsers.pl:172
+#, fuzzy, c-format
+msgid "Cinnamon Workstation"
+msgstr "Radna stanica"
+
+#: share/meta-task/compssUsers.pl:173
+#, fuzzy, c-format
+msgid "A graphical environment based on GNOME"
+msgstr "Grafičko okruženje"
+
+#: share/meta-task/compssUsers.pl:177
#, fuzzy, c-format
msgid "LXDE Desktop"
msgstr "IceWm okruženje"
-#: share/meta-task/compssUsers.pl:146
+#: share/meta-task/compssUsers.pl:179
#, fuzzy, c-format
msgid ""
"A lightweight & fast graphical environment with user-friendly set of "
@@ -749,52 +778,74 @@ msgstr ""
"Grafička okolina sa skupom korisnički orjentisanih programa i alata za radnu "
"površinu"
-#: share/meta-task/compssUsers.pl:149
+#: share/meta-task/compssUsers.pl:183
+#, fuzzy, c-format
+msgid "RazorQT Desktop"
+msgstr "IceWm okruženje"
+
+#: share/meta-task/compssUsers.pl:185
+#, c-format
+msgid "A less developed lightweight fast graphical environment"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:188
+#, c-format
+msgid "Enlightenment e17 Desktop"
+msgstr ""
+
+#: share/meta-task/compssUsers.pl:190
+#, fuzzy, c-format
+msgid "A lightweight fast graphical environment with a dedicated following"
+msgstr ""
+"Grafička okolina sa skupom korisnički orjentisanih programa i alata za radnu "
+"površinu"
+
+#: share/meta-task/compssUsers.pl:193
#, c-format
msgid "Other Graphical Desktops"
msgstr "Ostale grafičke okoline"
-#: share/meta-task/compssUsers.pl:150
-#, c-format
-msgid "Window Maker, Enlightenment, Fvwm, etc"
+#: share/meta-task/compssUsers.pl:194
+#, fuzzy, c-format
+msgid "Window Maker, Fvwm, etc"
msgstr "Window Maker, Enlightenment, Fvwm itd."
-#: share/meta-task/compssUsers.pl:173
+#: share/meta-task/compssUsers.pl:217
#, c-format
msgid "Utilities"
msgstr "Alati"
-#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176
+#: share/meta-task/compssUsers.pl:219 share/meta-task/compssUsers.pl:220
#, c-format
msgid "SSH Server"
msgstr "SSH server"
-#: share/meta-task/compssUsers.pl:180
+#: share/meta-task/compssUsers.pl:224
#, c-format
msgid "Webmin"
msgstr "Webmin"
-#: share/meta-task/compssUsers.pl:181
+#: share/meta-task/compssUsers.pl:225
#, c-format
msgid "Webmin Remote Configuration Server"
msgstr "Webmin server za podešavanje sistema"
-#: share/meta-task/compssUsers.pl:185
+#: share/meta-task/compssUsers.pl:229
#, c-format
msgid "Network Utilities/Monitoring"
msgstr "Mrežni alati i nadzor"
-#: share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:230
#, c-format
msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
msgstr "Alati za nadzor, praćenje procesa, tcpdump, nmap..."
-#: share/meta-task/compssUsers.pl:190
+#: share/meta-task/compssUsers.pl:234
#, c-format
msgid "Mageia Wizards"
msgstr "Mageia čarobnjaci"
-#: share/meta-task/compssUsers.pl:191
+#: share/meta-task/compssUsers.pl:235
#, c-format
msgid "Wizards to configure server"
msgstr "Čarobnjaci (wizardi) za podešavanje serverâ"
@@ -808,7 +859,7 @@ msgstr ""
"Došlo je do greške, ali ne znam kako da postupim u vezi toga.\n"
"Nastavite na vlastiti rizik."
-#: steps.pm:461
+#: steps.pm:458
#, c-format
msgid ""
"Some important packages did not get installed properly.\n"
@@ -862,194 +913,194 @@ msgstr "Izbor grupe paketa"
msgid "Install %s KDE Desktop"
msgstr ""
-#: steps_gtk.pm:244
+#: steps_gtk.pm:252
#, c-format
msgid "Install %s GNOME Desktop"
msgstr ""
-#: steps_gtk.pm:245
+#: steps_gtk.pm:253
#, fuzzy, c-format
msgid "Custom install"
msgstr "Minimalna instalacija"
-#: steps_gtk.pm:266
+#: steps_gtk.pm:274
#, fuzzy, c-format
msgid "KDE Desktop"
msgstr "IceWm okruženje"
-#: steps_gtk.pm:267
+#: steps_gtk.pm:275
#, fuzzy, c-format
msgid "GNOME Desktop"
msgstr "IceWm okruženje"
-#: steps_gtk.pm:268
+#: steps_gtk.pm:276
#, fuzzy, c-format
msgid "Custom Desktop"
msgstr "IceWm okruženje"
-#: steps_gtk.pm:274
+#: steps_gtk.pm:282
#, c-format
msgid "Here's a preview of the '%s' desktop."
msgstr ""
-#: steps_gtk.pm:301
+#: steps_gtk.pm:309
#, c-format
msgid "Click on images in order to see a bigger preview"
msgstr ""
-#: steps_gtk.pm:319 steps_interactive.pm:633 steps_list.pm:30
+#: steps_gtk.pm:325 steps_interactive.pm:633 steps_list.pm:30
#, c-format
msgid "Package Group Selection"
msgstr "Izbor grupe paketa"
-#: steps_gtk.pm:344 steps_interactive.pm:650
+#: steps_gtk.pm:350 steps_interactive.pm:650
#, c-format
msgid "Individual package selection"
msgstr "Izbor pojedinačnih paketa"
-#: steps_gtk.pm:351
+#: steps_gtk.pm:357
#, c-format
msgid "Unselect All"
msgstr "Ništa izabrano"